virt-controller, template: export init container resource generation …

…to a func Signed-off-by: Miguel Duarte Barroso <[email protected]>
attlee-wang · Jul 19, 2022 · 235955e · 235955e
1 parent b20703f
commit 235955e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 17 deletions.
diff --git a/pkg/virt-controller/services/renderresources.go b/pkg/virt-controller/services/renderresources.go
@@ -464,3 +464,38 @@ func sidecarResources(vmi *v1.VirtualMachineInstance) k8sv1.ResourceRequirements
 	}
 	return resources
 }
+
+func initContainerResourceRequirementsForVMI(vmi *v1.VirtualMachineInstance) k8sv1.ResourceRequirements {
+	if vmi.IsCPUDedicated() || vmi.WantsToHaveQOSGuaranteed() {
+		return k8sv1.ResourceRequirements{
+			Limits:   initContainerDedicatedCPURequiredResources(),
+			Requests: initContainerDedicatedCPURequiredResources(),
+		}
+	} else {
+		return k8sv1.ResourceRequirements{
+			Limits:   initContainerMinimalLimits(),
+			Requests: initContainerMinimalRequests(),
+		}
+	}
+}
+
+func initContainerDedicatedCPURequiredResources() k8sv1.ResourceList {
+	return k8sv1.ResourceList{
+		k8sv1.ResourceCPU:    resource.MustParse("10m"),
+		k8sv1.ResourceMemory: resource.MustParse("40M"),
+	}
+}
+
+func initContainerMinimalLimits() k8sv1.ResourceList {
+	return k8sv1.ResourceList{
+		k8sv1.ResourceCPU:    resource.MustParse("100m"),
+		k8sv1.ResourceMemory: resource.MustParse("40M"),
+	}
+}
+
+func initContainerMinimalRequests() k8sv1.ResourceList {
+	return k8sv1.ResourceList{
+		k8sv1.ResourceCPU:    resource.MustParse("10m"),
+		k8sv1.ResourceMemory: resource.MustParse("1M"),
+	}
+}
diff --git a/pkg/virt-controller/services/template.go b/pkg/virt-controller/services/template.go
@@ -603,22 +603,6 @@ func (t *templateService) renderLaunchManifest(vmi *v1.VirtualMachineInstance, i
 	var initContainers []k8sv1.Container
 
 	if HaveContainerDiskVolume(vmi.Spec.Volumes) || util.HasKernelBootContainerImage(vmi) {
-		initContainerResources := k8sv1.ResourceRequirements{}
-		if vmi.IsCPUDedicated() || vmi.WantsToHaveQOSGuaranteed() {
-			initContainerResources.Limits = make(k8sv1.ResourceList)
-			initContainerResources.Limits[k8sv1.ResourceCPU] = resource.MustParse("10m")
-			initContainerResources.Limits[k8sv1.ResourceMemory] = resource.MustParse("40M")
-			initContainerResources.Requests = make(k8sv1.ResourceList)
-			initContainerResources.Requests[k8sv1.ResourceCPU] = resource.MustParse("10m")
-			initContainerResources.Requests[k8sv1.ResourceMemory] = resource.MustParse("40M")
-		} else {
-			initContainerResources.Limits = make(k8sv1.ResourceList)
-			initContainerResources.Limits[k8sv1.ResourceCPU] = resource.MustParse("100m")
-			initContainerResources.Limits[k8sv1.ResourceMemory] = resource.MustParse("40M")
-			initContainerResources.Requests = make(k8sv1.ResourceList)
-			initContainerResources.Requests[k8sv1.ResourceCPU] = resource.MustParse("10m")
-			initContainerResources.Requests[k8sv1.ResourceMemory] = resource.MustParse("1M")
-		}
 		initContainerCommand := []string{"/usr/bin/cp",
 			"/usr/bin/container-disk",
 			"/init/usr/bin/container-disk",
@@ -628,7 +612,7 @@ func (t *templateService) renderLaunchManifest(vmi *v1.VirtualMachineInstance, i
 			initContainers,
 			t.newInitContainerRenderer(vmi,
 				initContainerVolumeMount(),
-				initContainerResources,
+				initContainerResourceRequirementsForVMI(vmi),
 				userId).Render(initContainerCommand))
 
 		// this causes containerDisks to be pre-pulled before virt-launcher starts.