cleanup slightly

Author: olegbbtr

Makefile

@@ -641,7 +641,7 @@ status-fluent-bit: kubectl
 
 .PHONY: deploy-container-image-csi-driver
 deploy-container-image-csi-driver: kubectl
-	$(KUBECTL) apply -f k3s-containerd-v2.0.1.yaml
+	$(KUBECTL) apply -f container-image-csi-driver.yaml
 	$(KUBECTL) -n kube-system rollout status daemonset container-image-csi-driver
 
 ##@ Build Dependencies

k3s-containerd-v2.0.1.yaml renamed to container-image-csi-driver.yaml

@@ -146,4 +146,4 @@ status:
   currentNumberScheduled: 0
   desiredNumberScheduled: 0
   numberMisscheduled: 0
-  numberReady: 0 
+  numberReady: 0

pkg/neonvm/controllers/vm_controller.go

@@ -1280,27 +1280,19 @@ func podSpec(
 			ServiceAccountName:            vm.Spec.ServiceAccountName,
 			SchedulerName:                 vm.Spec.SchedulerName,
 			Affinity:                      affinity,
-			// InitContainers: []corev1.Container{
-			// 	{
-			// 		Image:           vm.Spec.Guest.RootDisk.Image,
-			// 		Name:            "init",
-			// 		ImagePullPolicy: vm.Spec.Guest.RootDisk.ImagePullPolicy,
-			// 		VolumeMounts: []corev1.VolumeMount{{
-			// 			Name:      "virtualmachineimages",
-			// 			MountPath: "/vm/images",
-			// 		}},
-			// 		Command: []string{
-			// 			"sh", "-c",
-			// 			"mv /disk.qcow2 /vm/images/rootdisk.qcow2 && " +
-			// 				/* uid=36(qemu) gid=34(kvm) groups=34(kvm) */
-			// 				"chown 36:34 /vm/images/rootdisk.qcow2 && " +
-			// 				"sysctl -w net.ipv4.ip_forward=1",
-			// 		},
-			// 		SecurityContext: &corev1.SecurityContext{
-			// 			Privileged: lo.ToPtr(true),
-			// 		},
-			// 	},
-			// },
+			InitContainers: []corev1.Container{
+				{
+					Image:           vm.Spec.Guest.RootDisk.Image,
+					Name:            "init",
+					ImagePullPolicy: vm.Spec.Guest.RootDisk.ImagePullPolicy,
+					Command: []string{
+						"sh", "-c", "sysctl -w net.ipv4.ip_forward=1",
+					},
+					SecurityContext: &corev1.SecurityContext{
+						Privileged: lo.ToPtr(true),
+					},
+				},
+			},
 			// generate containers as an inline function so the context isn't isolated
 			Containers: func() []corev1.Container {
 				runner := corev1.Container{