Fix CLC manifest when custom RuntimeDir is used (#318)

DataDog · Jun 8, 2021 · 8072ba9 · 8072ba9
1 parent 1640884
commit 8072ba9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/controllers/datadogagent/clusterchecksrunner.go b/controllers/datadogagent/clusterchecksrunner.go
@@ -259,7 +259,6 @@ func newClusterChecksRunnerPodTemplate(dda *datadoghqv1alpha1.DatadogAgent, labe
 	volumeMounts := getVolumeMountsForClusterChecksRunner(dda)
 	envVars := getEnvVarsForClusterChecksRunner(dda)
 	image := getImage(&clusterChecksRunnerSpec.Image, spec.Registry, true)
-	initContainers := getConfigInitContainers(spec, volumeMounts, envVars, image)
 
 	newPodTemplate := corev1.PodTemplateSpec{
 		ObjectMeta: metav1.ObjectMeta{
@@ -268,7 +267,14 @@ func newClusterChecksRunnerPodTemplate(dda *datadoghqv1alpha1.DatadogAgent, labe
 		},
 		Spec: corev1.PodSpec{
 			ServiceAccountName: getClusterChecksRunnerServiceAccount(dda),
-			InitContainers:     initContainers,
+			InitContainers: []corev1.Container{
+				getInitContainer(
+					spec, "init-config",
+					[]string{"for script in $(find /etc/cont-init.d/ -type f -name '*.sh' | sort) ; do bash $script ; done"},
+					volumeMounts, envVars,
+					image,
+				),
+			},
 			Containers: []corev1.Container{
 				{
 					Name:            "cluster-checks-runner",

diff --git a/controllers/datadogagent/clusterchecksrunner_test.go b/controllers/datadogagent/clusterchecksrunner_test.go
@@ -25,20 +25,6 @@ func clusterChecksRunnerDefaultPodSpec() corev1.PodSpec {
 		Affinity:           getPodAffinity(nil),
 		ServiceAccountName: "foo-cluster-checks-runner",
 		InitContainers: []corev1.Container{
-			{
-				Name:            "init-volume",
-				Image:           "gcr.io/datadoghq/agent:7.28.0",
-				ImagePullPolicy: corev1.PullIfNotPresent,
-				Resources:       corev1.ResourceRequirements{},
-				Command:         []string{"bash", "-c"},
-				Args:            []string{"cp -vnr /etc/datadog-agent /opt;cp -v /etc/datadog-agent-runtime-policies/* /opt/datadog-agent/runtime-security.d/"},
-				VolumeMounts: []corev1.VolumeMount{
-					{
-						Name:      datadoghqv1alpha1.ConfigVolumeName,
-						MountPath: "/opt/datadog-agent",
-					},
-				},
-			},
 			{
 				Name:            "init-config",
 				Image:           "gcr.io/datadoghq/agent:7.28.0",
@@ -240,7 +226,7 @@ func Test_newClusterChecksRunnerDeploymentFromInstance_UserVolumes(t *testing.T)
 	}
 	userMountsPodSpec := clusterChecksRunnerDefaultPodSpec()
 	userMountsPodSpec.Volumes = append(userMountsPodSpec.Volumes, userVolumes...)
-	userMountsPodSpec.InitContainers[1].VolumeMounts = append(userMountsPodSpec.InitContainers[1].VolumeMounts, userVolumeMounts...)
+	userMountsPodSpec.InitContainers[0].VolumeMounts = append(userMountsPodSpec.InitContainers[0].VolumeMounts, userVolumeMounts...)
 	userMountsPodSpec.Containers[0].VolumeMounts = append(userMountsPodSpec.Containers[0].VolumeMounts, userVolumeMounts...)
 
 	envVarsAgentDeployment := test.NewDefaultedDatadogAgent(
@@ -320,7 +306,7 @@ func Test_newClusterChecksRunnerDeploymentFromInstance_EnvVars(t *testing.T) {
 		},
 	}
 	podSpec := clusterChecksRunnerDefaultPodSpec()
-	podSpec.InitContainers[1].Env = append(podSpec.InitContainers[1].Env, envVars...)
+	podSpec.InitContainers[0].Env = append(podSpec.InitContainers[0].Env, envVars...)
 	podSpec.Containers[0].Env = append(podSpec.Containers[0].Env, envVars...)
 
 	envVarsAgentDeployment := test.NewDefaultedDatadogAgent(