virt-controller, template: export sidecar resource generation to a func

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

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/pkg/virt-controller/services/renderresources.go b/pkg/virt-controller/services/renderresources.go
@@ -452,3 +452,15 @@ func validatePermittedHostDevices(spec *v1.VirtualMachineInstanceSpec, config *v
 
 	return nil
 }
+
+func sidecarResources(vmi *v1.VirtualMachineInstance) k8sv1.ResourceRequirements {
+	resources := k8sv1.ResourceRequirements{}
+	// add default cpu and memory limits to enable cpu pinning if requested
+	// TODO(vladikr): make the hookSidecar express resources
+	if vmi.IsCPUDedicated() || vmi.WantsToHaveQOSGuaranteed() {
+		resources.Limits = make(k8sv1.ResourceList)
+		resources.Limits[k8sv1.ResourceCPU] = resource.MustParse("200m")
+		resources.Limits[k8sv1.ResourceMemory] = resource.MustParse("64M")
+	}
+	return resources
+}
diff --git a/pkg/virt-controller/services/template.go b/pkg/virt-controller/services/template.go
@@ -585,19 +585,10 @@ func (t *templateService) renderLaunchManifest(vmi *v1.VirtualMachineInstance, i
 	podLabels[v1.VirtualMachineNameLabel] = hostName
 
 	for i, requestedHookSidecar := range requestedHookSidecarList {
-		resources := k8sv1.ResourceRequirements{}
-		// add default cpu and memory limits to enable cpu pinning if requested
-		// TODO(vladikr): make the hookSidecar express resources
-		if vmi.IsCPUDedicated() || vmi.WantsToHaveQOSGuaranteed() {
-			resources.Limits = make(k8sv1.ResourceList)
-			resources.Limits[k8sv1.ResourceCPU] = resource.MustParse("200m")
-			resources.Limits[k8sv1.ResourceMemory] = resource.MustParse("64M")
-		}
-
 		containers = append(
 			containers,
 			newSidecarContainerRenderer(
-				sidecarContainerName(i), vmi, resources, requestedHookSidecar, userId).Render(requestedHookSidecar.Command))
+				sidecarContainerName(i), vmi, sidecarResources(vmi), requestedHookSidecar, userId).Render(requestedHookSidecar.Command))
 	}
 
 	podAnnotations, err := generatePodAnnotations(vmi)