hooks: add requested hook sidecars as containers to VM Pod

pkg/virt-controller/services/template.go

@@ -207,14 +207,13 @@ func (t *templateService) RenderLaunchManifest(vmi *v1.VirtualMachineInstance) (
 	}
 
 	// Read requested hookSidecars from VM annotation
-	// TODO: Add requested sidecars as Containers to Pod
-	numberOfRequestedHookSidecars := 0
+	var err error
+	requestedHookSidecarList := make(hooks.HookSidecarList, 0)
 	if rawRequestedHookSidecarList, requestedHookSidecarListDefined := vm.GetObjectMeta().GetAnnotations()[hooks.HookSidecarListAnnotationName]; requestedHookSidecarListDefined {
-		requestedHookSidecarList, err := hooks.UnmarshalHookSidecarList(rawRequestedHookSidecarList)
+		requestedHookSidecarList, err = hooks.UnmarshalHookSidecarList(rawRequestedHookSidecarList)
 		if err != nil {
 			return nil, err
 		}
-		numberOfRequestedHookSidecars = len(requestedHookSidecarList)
 	}
 
 	command := []string{"/usr/share/kubevirt/virt-launcher/entrypoint.sh",
@@ -224,7 +223,7 @@ func (t *templateService) RenderLaunchManifest(vmi *v1.VirtualMachineInstance) (
 		"--kubevirt-share-dir", t.virtShareDir,
 		"--readiness-file", "/tmp/healthy",
 		"--grace-period-seconds", strconv.Itoa(int(gracePeriodSeconds)),
-		"--requested-hooks", strconv.Itoa(numberOfRequestedHookSidecars),
+		"--requested-hooks", strconv.Itoa(len(requestedHookSidecarList)),
 	}
 
 	useEmulation, err := IsEmulationAllowed(t.store)
@@ -317,6 +316,14 @@ func (t *templateService) RenderLaunchManifest(vmi *v1.VirtualMachineInstance) (
 
 	containers = append(containers, container)
 
+	for _, requestedHookSidecar := range requestedHookSidecarList {
+		containers = append(containers, k8sv1.Container{
+			Name:            "hook-sidecar-" + requestedHookSidecar.Image,
+			Image:           requestedHookSidecar.Image,
+			ImagePullPolicy: requestedHookSidecar.ImagePullPolicy,
+		})
+	}
+
 	hostName := dns.SanitizeHostname(vmi)
 
 	// TODO use constants for podLabels

pkg/virt-controller/services/template_test.go

@@ -76,6 +76,9 @@ var _ = Describe("Template", func() {
 					"--readiness-file", "/tmp/healthy",
 					"--grace-period-seconds", "45",
 					"--requested-hooks", "1"}))
+				Expect(pod.Spec.Containers[1].Name).To(Equal("hook-sidecar-some-image:v1"))
+				Expect(pod.Spec.Containers[1].Image).To(Equal("some-image:v1"))
+				Expect(pod.Spec.Containers[1].ImagePullPolicy).To(Equal(kubev1.PullPolicy("IfNotPresent")))
 				Expect(*pod.Spec.TerminationGracePeriodSeconds).To(Equal(int64(60)))
 				By("setting the right hostname")
 				Expect(pod.Spec.Hostname).To(Equal("testvmi"))
@@ -115,6 +118,9 @@ var _ = Describe("Template", func() {
 					"--readiness-file", "/tmp/healthy",
 					"--grace-period-seconds", "45",
 					"--requested-hooks", "1"}))
+				Expect(pod.Spec.Containers[1].Name).To(Equal("hook-sidecar-some-image:v1"))
+				Expect(pod.Spec.Containers[1].Image).To(Equal("some-image:v1"))
+				Expect(pod.Spec.Containers[1].ImagePullPolicy).To(Equal(kubev1.PullPolicy("IfNotPresent")))
 				Expect(pod.Spec.Volumes[0].HostPath.Path).To(Equal("/var/run/kubevirt"))
 				Expect(pod.Spec.Containers[0].VolumeMounts[0].MountPath).To(Equal("/var/run/kubevirt"))
 				Expect(*pod.Spec.TerminationGracePeriodSeconds).To(Equal(int64(60)))