Split function to create container and init container to 2 functions

Signed-off-by: Itamar Holder <iholder@redhat.com>
kubevirt · Oct 13, 2021 · 27f1583 · 27f1583
1 parent b5df147
commit 27f1583
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/pkg/container-disk/container-disk.go b/pkg/container-disk/container-disk.go
@@ -212,9 +212,17 @@ func GenerateContainers(vmi *v1.VirtualMachineInstance, podVolumeName string, bi
 	return generateContainersHelper(vmi, podVolumeName, binVolumeName, false)
 }
 
-func GenerateKernelBootContainers(vmi *v1.VirtualMachineInstance, podVolumeName string, binVolumeName string) (container, initContainer *kubev1.Container) {
+func GenerateKernelBootContainer(vmi *v1.VirtualMachineInstance, podVolumeName string, binVolumeName string) *kubev1.Container {
+	return generateKernelBootContainerHelper(vmi, podVolumeName, binVolumeName, false)
+}
+
+func GenerateKernelBootInitContainer(vmi *v1.VirtualMachineInstance, podVolumeName string, binVolumeName string) *kubev1.Container {
+	return generateKernelBootContainerHelper(vmi, podVolumeName, binVolumeName, true)
+}
+
+func generateKernelBootContainerHelper(vmi *v1.VirtualMachineInstance, podVolumeName string, binVolumeName string, isInit bool) *kubev1.Container {
 	if !util.HasKernelBootContainerImage(vmi) {
-		return nil, nil
+		return nil
 	}
 
 	kernelBootContainer := vmi.Spec.Domain.Firmware.KernelBoot.Container
@@ -232,10 +240,7 @@ func GenerateKernelBootContainers(vmi *v1.VirtualMachineInstance, podVolumeName
 	}
 
 	const fakeVolumeIdx = 0 // volume index makes no difference for kernel-boot container
-	createContainer := func(isInit bool) *kubev1.Container {
-		return generateContainerFromVolume(vmi, podVolumeName, binVolumeName, isInit, true, &kernelBootVolume, fakeVolumeIdx)
-	}
-	return createContainer(false), createContainer(true)
+	return generateContainerFromVolume(vmi, podVolumeName, binVolumeName, isInit, true, &kernelBootVolume, fakeVolumeIdx)
 }
 
 // The controller uses this function to generate the container

diff --git a/pkg/virt-controller/services/template.go b/pkg/virt-controller/services/template.go
@@ -1195,7 +1195,7 @@ func (t *templateService) renderLaunchManifest(vmi *v1.VirtualMachineInstance, t
 	containersDisks := containerdisk.GenerateContainers(vmi, "container-disks", "virt-bin-share-dir")
 	containers = append(containers, containersDisks...)
 
-	kernelBootContainer, kernelBootInitContainer := containerdisk.GenerateKernelBootContainers(vmi, "container-disks", "virt-bin-share-dir")
+	kernelBootContainer := containerdisk.GenerateKernelBootContainer(vmi, "container-disks", "virt-bin-share-dir")
 	if kernelBootContainer != nil {
 		log.Log.Object(vmi).Infof("kernel boot container generated")
 		containers = append(containers, *kernelBootContainer)
@@ -1375,6 +1375,7 @@ func (t *templateService) renderLaunchManifest(vmi *v1.VirtualMachineInstance, t
 		// this causes containerDisks to be pre-pulled before virt-launcher starts.
 		initContainers = append(initContainers, containerdisk.GenerateInitContainers(vmi, "container-disks", "virt-bin-share-dir")...)
 
+		kernelBootInitContainer := containerdisk.GenerateKernelBootInitContainer(vmi, "container-disks", "virt-bin-share-dir")
 		if kernelBootInitContainer != nil {
 			initContainers = append(initContainers, *kernelBootInitContainer)
 		}