Merge pull request kubevirt#8716 from rhrazdil/passt_overhead

network,passt: consider overhead when binding all ports
kubevirt-bot · Nov 11, 2022 · f50ae91 · f50ae91
2 parents 373ba7a + 8c427ec
commit f50ae91
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/pkg/virt-controller/services/renderresources.go b/pkg/virt-controller/services/renderresources.go
@@ -357,6 +357,14 @@ func GetMemoryOverhead(vmi *v1.VirtualMachineInstance, cpuArch string) *resource
 		overhead.Add(resource.MustParse("53Mi"))
 	}
 
+	// Additional overhead for each interface with Passt binding, that forwards all ports.
+	// More information can be found here: https://bugs.passt.top/show_bug.cgi?id=20
+	for _, net := range vmi.Spec.Domain.Devices.Interfaces {
+		if net.Passt != nil && len(net.Ports) == 0 {
+			overhead.Add(resource.MustParse("800Mi"))
+		}
+	}
+
 	return overhead
 }
 

diff --git a/tests/network/vmi_istio.go b/tests/network/vmi_istio.go
@@ -511,7 +511,6 @@ func createPasstVm(ports []v1.Port) *v1.VirtualMachineInstance {
 		libvmi.WithInterface(libvmi.InterfaceDeviceWithPasstBinding(ports...)),
 		libvmi.WithLabel(vmiAppSelectorKey, vmiAppSelectorValue),
 		libvmi.WithAnnotation(istio.ISTIO_INJECT_ANNOTATION, "true"),
-		withPasstExtendedResourceMemory(ports...),
 	)
 	return vmi
 }

diff --git a/tests/network/vmi_passt.go b/tests/network/vmi_passt.go
@@ -80,7 +80,6 @@ var _ = SIGDescribe("[Serial] Passt", func() {
 					serverVMI = libvmi.NewAlpineWithTestTooling(
 						libvmi.WithInterface(libvmi.InterfaceDeviceWithPasstBinding(ports...)),
 						libvmi.WithNetwork(v1.DefaultPodNetwork()),
-						withPasstExtendedResourceMemory(ports...),
 					)
 
 					serverVMI, err = virtClient.VirtualMachineInstance(util.NamespaceTestDefault).Create(serverVMI)
@@ -214,7 +213,6 @@ EOL`, inetSuffix, serverIP, serverPort)
 						clientVMI = libvmi.NewAlpineWithTestTooling(
 							libvmi.WithInterface(libvmi.InterfaceDeviceWithPasstBinding()),
 							libvmi.WithNetwork(v1.DefaultPodNetwork()),
-							withPasstExtendedResourceMemory(),
 						)
 						clientVMI, err = virtClient.VirtualMachineInstance(util.NamespaceTestDefault).Create(clientVMI)
 						Expect(err).ToNot(HaveOccurred())
@@ -288,11 +286,3 @@ EOL`, inetSuffix, serverIP, serverPort)
 		})
 	})
 })
-
-func withPasstExtendedResourceMemory(ports ...v1.Port) libvmi.Option {
-	if len(ports) == 0 {
-		return libvmi.WithResourceMemory("2048M")
-	}
-	return func(vmi *v1.VirtualMachineInstance) {
-	}
-}