Merge pull request kubevirt#2607 from alonSadan/change_pod+bridge_exa…

…mples change pod+bridge examples to pod+masquerade
th3w4y · Aug 27, 2019 · d472c41 · d472c41
2 parents d0d5254 + 6c15327
commit d472c41
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/examples/vm-template-windows2012r2.yaml b/examples/vm-template-windows2012r2.yaml
@@ -50,7 +50,7 @@ objects:
                 bus: virtio
               name: disk0
             interfaces:
-            - bridge: {}
+            - masquerade: {}
               model: e1000
               name: default
           features:

diff --git a/examples/vmi-multus-multiple-net.yaml b/examples/vmi-multus-multiple-net.yaml
@@ -16,7 +16,7 @@ spec:
           bus: virtio
         name: cloudinitdisk
       interfaces:
-      - bridge: {}
+      - masquerade: {}
         name: default
       - bridge: {}
         name: ptp

diff --git a/examples/vmi-sriov.yaml b/examples/vmi-sriov.yaml
@@ -16,7 +16,7 @@ spec:
           bus: virtio
         name: cloudinitdisk
       interfaces:
-      - bridge: {}
+      - masquerade: {}
         name: default
       - name: sriov-net
         sriov: {}

diff --git a/examples/vmi-windows.yaml b/examples/vmi-windows.yaml
@@ -25,7 +25,7 @@ spec:
           bus: sata
         name: pvcdisk
       interfaces:
-      - bridge: {}
+      - masquerade: {}
         model: e1000
         name: default
     features:

diff --git a/tools/vms-generator/utils/utils.go b/tools/vms-generator/utils/utils.go
@@ -369,7 +369,7 @@ func GetVMISRIOV() *v1.VirtualMachineInstance {
 	initFedora(&vm.Spec)
 	addNoCloudDiskWitUserData(&vm.Spec, "#!/bin/bash\necho \"fedora\" |passwd fedora --stdin\ndhclient eth1\n")
 
-	vm.Spec.Domain.Devices.Interfaces = []v1.Interface{{Name: "default", InterfaceBindingMethod: v1.InterfaceBindingMethod{Bridge: &v1.InterfaceBridge{}}},
+	vm.Spec.Domain.Devices.Interfaces = []v1.Interface{{Name: "default", InterfaceBindingMethod: v1.InterfaceBindingMethod{Masquerade: &v1.InterfaceMasquerade{}}},
 		{Name: "sriov-net", InterfaceBindingMethod: v1.InterfaceBindingMethod{SRIOV: &v1.InterfaceSRIOV{}}}}
 
 	return vm
@@ -394,7 +394,7 @@ func GetVMIMultusMultipleNet() *v1.VirtualMachineInstance {
 	initFedora(&vm.Spec)
 	addNoCloudDiskWitUserData(&vm.Spec, "#!/bin/bash\necho \"fedora\" |passwd fedora --stdin\ndhclient eth1\n")
 
-	vm.Spec.Domain.Devices.Interfaces = []v1.Interface{{Name: "default", InterfaceBindingMethod: v1.InterfaceBindingMethod{Bridge: &v1.InterfaceBridge{}}},
+	vm.Spec.Domain.Devices.Interfaces = []v1.Interface{{Name: "default", InterfaceBindingMethod: v1.InterfaceBindingMethod{Masquerade: &v1.InterfaceMasquerade{}}},
 		{Name: "ptp", InterfaceBindingMethod: v1.InterfaceBindingMethod{Bridge: &v1.InterfaceBridge{}}}}
 
 	return vm
@@ -509,7 +509,7 @@ func GetVMIWindows() *v1.VirtualMachineInstance {
 				},
 			},
 			Devices: v1.Devices{
-				Interfaces: []v1.Interface{*v1.DefaultBridgeNetworkInterface()},
+				Interfaces: []v1.Interface{*v1.DefaultMasqueradeNetworkInterface()},
 			},
 		},
 		Networks: []v1.Network{*v1.DefaultPodNetwork()},