Merge pull request #1432 from anurag-rajawat/fix-containerd-volmnts

fix(operator): Fix containerd socket and storage volumemounts
kubearmor · Sep 22, 2023 · b5524fb · b5524fb
2 parents 9b61da7 + b3560c6
commit b5524fb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/pkg/KubeArmorOperator/common/defaults.go b/pkg/KubeArmorOperator/common/defaults.go
@@ -181,6 +181,12 @@ var RuntimeStorageLocation = map[string]string{
 	"cri-o":      "/var/lib/containers/storage",
 }
 
+var RuntimeSocketLocation = map[string]string{
+	"docker":     "/var/run/docker.sock",
+	"containerd": "/var/run/containerd/containerd.sock",
+	"cri-o":      "/var/run/crio/crio.sock",
+}
+
 func ShortSHA(s string) string {
 	sBytes := []byte(s)
 

diff --git a/pkg/KubeArmorOperator/internal/controller/resources.go b/pkg/KubeArmorOperator/internal/controller/resources.go
@@ -70,7 +70,6 @@ func generateDaemonset(name, enforcer, runtime, socket, runtimeStorage, btfPrese
 	daemonset.Spec.Template.Spec.Volumes = vols
 	daemonset.Spec.Template.Spec.InitContainers[0].VolumeMounts = commonVolMnts
 	daemonset.Spec.Template.Spec.Containers[0].VolumeMounts = volMnts
-	daemonset.Spec.Template.Spec.Containers[0].Args = append(daemonset.Spec.Template.Spec.Containers[0].Args, "-criSocket=unix:///"+strings.ReplaceAll(socket, "_", "/"))
 	// update images
 	daemonset.Spec.Template.Spec.Containers[0].Image = common.GetApplicationImage(common.KubeArmorName)
 	daemonset.Spec.Template.Spec.Containers[0].ImagePullPolicy = corev1.PullPolicy(common.KubeArmorImagePullPolicy)
@@ -106,6 +105,8 @@ func genRuntimeVolumes(runtime, runtimeSocket, runtimeStorage string) (vol []cor
 					},
 				},
 			})
+
+			socket = common.RuntimeSocketLocation[runtime]
 			volMnt = append(volMnt, corev1.VolumeMount{
 				Name:      runtime + "-socket",
 				MountPath: socket,