Do not enable the cri check when running on a docker setup (#51)

* Do not enable the `cri` check when running on a `docker` setup Co-authored-by: Cedric Lamoriniere <cedric.lamoriniere@datadoghq.com>
DataDog · Jul 1, 2020 · fe7eb70 · fe7eb70
1 parent 1b1d6ae
commit fe7eb70
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 60 deletions.
diff --git a/deploy/crds/datadoghq.com_datadogagents_crd.yaml b/deploy/crds/datadoghq.com_datadogagents_crd.yaml
@@ -259,9 +259,9 @@ spec:
                           description: Path to the container runtime socket (if different
                             from Docker) This is supported starting from agent 6.6.0
                           type: string
-                        useCriSocketVolume:
-                          description: Enable container runtime socket volume mounting
-                          type: boolean
+                        dockerSocketPath:
+                          description: Path to the docker runtime socket
+                          type: string
                       type: object
                     ddUrl:
                       description: The host of the Datadog intake server to send Agent

diff --git a/pkg/apis/datadoghq/v1alpha1/datadogagent_default.go b/pkg/apis/datadoghq/v1alpha1/datadogagent_default.go
@@ -22,8 +22,7 @@ const (
 	defaultAgentImage                             string = "datadog/agent:latest"
 	defaultCollectEvents                          bool   = false
 	defaultLeaderElection                         bool   = false
-	defaultUseCriSocketVolume                     bool   = true
-	defaultCriSocketPath                          string = "/var/run/docker.sock"
+	defaultDockerSocketPath                       string = "/var/run/docker.sock"
 	defaultDogstatsdOriginDetection               bool   = false
 	defaultUseDogStatsDSocketVolume               bool   = false
 	defaultApmEnabled                             bool   = false
@@ -175,14 +174,6 @@ func IsDefaultedDatadogAgentSpecAgentConfig(config *NodeAgentConfig) bool {
 		return false
 	}
 
-	if config.CriSocket.UseCriSocketVolume == nil {
-		return false
-	}
-
-	if config.CriSocket.CriSocketPath == nil {
-		return false
-	}
-
 	if config.Dogstatsd == nil {
 		return false
 	}
@@ -420,11 +411,14 @@ func DefaultDatadogAgentSpecAgentConfig(config *NodeAgentConfig) *NodeAgentConfi
 
 	if config.CriSocket == nil {
 		config.CriSocket = &CRISocketConfig{
-			UseCriSocketVolume: NewBoolPointer(defaultUseCriSocketVolume),
-			CriSocketPath:      NewStringPointer(defaultCriSocketPath),
+			DockerSocketPath: NewStringPointer(defaultDockerSocketPath),
 		}
 	}
 
+	if config.CriSocket.DockerSocketPath == nil {
+		config.CriSocket.DockerSocketPath = NewStringPointer(defaultDockerSocketPath)
+	}
+
 	if config.Dogstatsd == nil {
 		config.Dogstatsd = &DogstatsdConfig{
 			DogstatsdOriginDetection: NewBoolPointer(defaultDogstatsdOriginDetection),

diff --git a/pkg/apis/datadoghq/v1alpha1/datadogagent_types.go b/pkg/apis/datadoghq/v1alpha1/datadogagent_types.go
@@ -524,8 +524,9 @@ type NodeAgentConfig struct {
 // CRISocketConfig contains the CRI socket configuration parameters
 // +k8s:openapi-gen=true
 type CRISocketConfig struct {
-	// Enable container runtime socket volume mounting
-	UseCriSocketVolume *bool `json:"useCriSocketVolume,omitempty"`
+	// Path to the docker runtime socket
+	// +optional
+	DockerSocketPath *string `json:"dockerSocketPath,omitempty"`
 
 	// Path to the container runtime socket (if different from Docker)
 	// This is supported starting from agent 6.6.0

diff --git a/pkg/apis/datadoghq/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/datadoghq/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/datadoghq/v1alpha1/zz_generated.openapi.go b/pkg/apis/datadoghq/v1alpha1/zz_generated.openapi.go
diff --git a/pkg/controller/datadogagent/agent_test.go b/pkg/controller/datadogagent/agent_test.go
@@ -232,10 +232,6 @@ func defaultEnvVars() []corev1.EnvVar {
 			Name:      "DD_API_KEY",
 			ValueFrom: apiKeyValue(),
 		},
-		{
-			Name:  "DD_CRI_SOCKET_PATH",
-			Value: "/host/var/run/docker.sock",
-		},
 		{
 			Name:  "DOCKER_HOST",
 			Value: "unix:///host/var/run/docker.sock",

diff --git a/pkg/controller/datadogagent/utils.go b/pkg/controller/datadogagent/utils.go
@@ -11,7 +11,6 @@ import (
 	"math/rand"
 	"path/filepath"
 	"strconv"
-	"strings"
 	"time"
 
 	datadoghqv1alpha1 "github.com/DataDog/datadog-operator/pkg/apis/datadoghq/v1alpha1"
@@ -473,16 +472,16 @@ func getEnvVarsCommon(dda *datadoghqv1alpha1.DatadogAgent, needAPIKey bool) ([]c
 		})
 	}
 
-	if dda.Spec.Agent.Config.CriSocket != nil && dda.Spec.Agent.Config.CriSocket.CriSocketPath != nil {
-		envVars = append(envVars, corev1.EnvVar{
-			Name:  datadoghqv1alpha1.DDCriSocketPath,
-			Value: filepath.Join(datadoghqv1alpha1.HostCriSocketPathPrefix, *dda.Spec.Agent.Config.CriSocket.CriSocketPath),
-		})
-
-		if strings.HasSuffix(*dda.Spec.Agent.Config.CriSocket.CriSocketPath, "docker.sock") {
+	if dda.Spec.Agent.Config.CriSocket != nil {
+		if dda.Spec.Agent.Config.CriSocket.CriSocketPath != nil {
+			envVars = append(envVars, corev1.EnvVar{
+				Name:  datadoghqv1alpha1.DDCriSocketPath,
+				Value: filepath.Join(datadoghqv1alpha1.HostCriSocketPathPrefix, *dda.Spec.Agent.Config.CriSocket.CriSocketPath),
+			})
+		} else if dda.Spec.Agent.Config.CriSocket.DockerSocketPath != nil {
 			envVars = append(envVars, corev1.EnvVar{
 				Name:  datadoghqv1alpha1.DockerHost,
-				Value: "unix://" + filepath.Join(datadoghqv1alpha1.HostCriSocketPathPrefix, *dda.Spec.Agent.Config.CriSocket.CriSocketPath),
+				Value: "unix://" + filepath.Join(datadoghqv1alpha1.HostCriSocketPathPrefix, *dda.Spec.Agent.Config.CriSocket.DockerSocketPath),
 			})
 		}
 	}
@@ -652,20 +651,24 @@ func getVolumesForAgent(dda *datadoghqv1alpha1.DatadogAgent) []corev1.Volume {
 		volumes = append(volumes, volume)
 	}
 
-	if dda.Spec.Agent.Config.CriSocket != nil && dda.Spec.Agent.Config.CriSocket.UseCriSocketVolume != nil && *dda.Spec.Agent.Config.CriSocket.UseCriSocketVolume {
-		path := "/var/run/docker.sock"
-		if dda.Spec.Agent.Config.CriSocket.CriSocketPath != nil {
+	if dda.Spec.Agent.Config.CriSocket != nil {
+		path := ""
+		if dda.Spec.Agent.Config.CriSocket.DockerSocketPath != nil {
+			path = *dda.Spec.Agent.Config.CriSocket.DockerSocketPath
+		} else if dda.Spec.Agent.Config.CriSocket.CriSocketPath != nil {
 			path = *dda.Spec.Agent.Config.CriSocket.CriSocketPath
 		}
-		criVolume := corev1.Volume{
-			Name: datadoghqv1alpha1.CriSocketVolumeName,
-			VolumeSource: corev1.VolumeSource{
-				HostPath: &corev1.HostPathVolumeSource{
-					Path: filepath.Dir(path),
+		if path != "" {
+			criVolume := corev1.Volume{
+				Name: datadoghqv1alpha1.CriSocketVolumeName,
+				VolumeSource: corev1.VolumeSource{
+					HostPath: &corev1.HostPathVolumeSource{
+						Path: filepath.Dir(path),
+					},
 				},
-			},
+			}
+			volumes = append(volumes, criVolume)
 		}
-		volumes = append(volumes, criVolume)
 	}
 	if datadoghqv1alpha1.BoolValue(dda.Spec.Agent.Process.Enabled) {
 		passwdVolume := corev1.Volume{
@@ -854,12 +857,20 @@ func getVolumeMountsForAgent(spec *datadoghqv1alpha1.DatadogAgentSpec) []corev1.
 	}
 
 	// Cri socket volume
-	if *spec.Agent.Config.CriSocket.UseCriSocketVolume {
-		volumeMounts = append(volumeMounts, corev1.VolumeMount{
-			Name:      datadoghqv1alpha1.CriSocketVolumeName,
-			MountPath: filepath.Join(datadoghqv1alpha1.HostCriSocketPathPrefix, filepath.Dir(*spec.Agent.Config.CriSocket.CriSocketPath)),
-			ReadOnly:  true,
-		})
+	if spec.Agent.Config.CriSocket != nil {
+		path := ""
+		if spec.Agent.Config.CriSocket.DockerSocketPath != nil {
+			path = *spec.Agent.Config.CriSocket.DockerSocketPath
+		} else if spec.Agent.Config.CriSocket.CriSocketPath != nil {
+			path = *spec.Agent.Config.CriSocket.CriSocketPath
+		}
+		if path != "" {
+			volumeMounts = append(volumeMounts, corev1.VolumeMount{
+				Name:      datadoghqv1alpha1.CriSocketVolumeName,
+				MountPath: filepath.Join(datadoghqv1alpha1.HostCriSocketPathPrefix, filepath.Dir(path)),
+				ReadOnly:  true,
+			})
+		}
 	}
 
 	// Dogstatsd volume
@@ -918,12 +929,20 @@ func getVolumeMountsForProcessAgent(spec *datadoghqv1alpha1.DatadogAgentSpec) []
 	}
 
 	// Cri socket volume
-	if *spec.Agent.Config.CriSocket.UseCriSocketVolume {
-		volumeMounts = append(volumeMounts, corev1.VolumeMount{
-			Name:      datadoghqv1alpha1.CriSocketVolumeName,
-			MountPath: filepath.Join(datadoghqv1alpha1.HostCriSocketPathPrefix, filepath.Dir(*spec.Agent.Config.CriSocket.CriSocketPath)),
-			ReadOnly:  true,
-		})
+	if spec.Agent.Config.CriSocket != nil {
+		path := ""
+		if spec.Agent.Config.CriSocket.DockerSocketPath != nil {
+			path = *spec.Agent.Config.CriSocket.DockerSocketPath
+		} else if spec.Agent.Config.CriSocket.CriSocketPath != nil {
+			path = *spec.Agent.Config.CriSocket.CriSocketPath
+		}
+		if path != "" {
+			volumeMounts = append(volumeMounts, corev1.VolumeMount{
+				Name:      datadoghqv1alpha1.CriSocketVolumeName,
+				MountPath: filepath.Join(datadoghqv1alpha1.HostCriSocketPathPrefix, filepath.Dir(path)),
+				ReadOnly:  true,
+			})
+		}
 	}
 
 	if datadoghqv1alpha1.BoolValue(spec.Agent.SystemProbe.Enabled) {

diff --git a/test/e2e/utils/new.go b/test/e2e/utils/new.go
@@ -49,8 +49,7 @@ func NewDatadogAgent(ns, name, image string, options *NewDatadogAgentOptions) *d
 					},
 				},
 				CriSocket: &datadoghqv1alpha1.CRISocketConfig{
-					CriSocketPath:      datadoghqv1alpha1.NewStringPointer("/var/run/containerd/containerd.sock"),
-					UseCriSocketVolume: datadoghqv1alpha1.NewBoolPointer(true),
+					CriSocketPath: datadoghqv1alpha1.NewStringPointer("/var/run/containerd/containerd.sock"),
 				},
 				Env: []v1.EnvVar{
 					{