[stable/datadog] Revert "Mount the directory containing the CRI socket instead of the socket itself" (#21268)

This reverts commit 24b4881ecb9ae7c4368359d59df4fcc968493356.

Fixes #21223

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>

stable/datadog/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 2.0
 
+## 2.0.2
+
+* Revert the docker socket path inside the agent container to its standard location to fix #21223
+
 ## 2.0.1
 
 * Add parameters `datadog.logs.enabled` and `datadog.logs.containerCollectAll` to replace `datadog.logsEnabled` and `datadog.logsConfigContainerCollectAll`.

stable/datadog/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 2.0.1
+version: 2.0.2
 appVersion: "7"
 description: DataDog Agent
 keywords:

stable/datadog/templates/container-agent.yaml

@@ -87,7 +87,7 @@
       value: {{  (default false (or .Values.datadog.logs.containerCollectAll .Values.datadog.logsConfigContainerCollectAll)) | quote}}
     {{- if .Values.datadog.criSocketPath }}
     - name: DD_CRI_SOCKET_PATH
-      value: {{ print "/host/" .Values.datadog.criSocketPath | clean }}
+      value: {{ .Values.datadog.criSocketPath }}
     {{- end }}
     {{- if not .Values.datadog.livenessProbe }}
     - name: DD_HEALTH_PORT
@@ -113,8 +113,8 @@
       subPath: datadog.yaml
     {{- end }}
     {{- if .Values.datadog.criSocketPath }}
-    - name: runtimesocketdir
-      mountPath: {{ print "/host/" (dir .Values.datadog.criSocketPath) | clean }}
+    - name: runtimesocket
+      mountPath: {{ .Values.datadog.criSocketPath }}
       readOnly: true
     {{- end }}
     {{- if .Values.datadog.dogstatsd.useSocketVolume }}

stable/datadog/templates/container-process-agent.yaml

@@ -37,8 +37,8 @@
       mountPath: /host/proc
       readOnly: true
     {{- if .Values.datadog.criSocketPath }}
-    - name: runtimesocketdir
-      mountPath: {{ print "/host/" (dir .Values.datadog.criSocketPath) | clean }}
+    - name: runtimesocket
+      mountPath: {{ .Values.datadog.criSocketPath }}
       readOnly: true
     {{- end }}
     {{- if .Values.datadog.systemProbe.enabled }}

stable/datadog/templates/containers-init.yaml

@@ -31,8 +31,8 @@
       mountPath: /host/proc
       readOnly: true
     {{- if .Values.datadog.criSocketPath }}
-    - name: runtimesocketdir
-      mountPath: {{ print "/host/" (dir .Values.datadog.criSocketPath) | clean }}
+    - name: runtimesocket
+      mountPath: {{ .Values.datadog.criSocketPath }}
       readOnly: true
     {{- end }}
   env:

stable/datadog/templates/daemonset.yaml

@@ -79,8 +79,8 @@ spec:
           emptyDir: {}
         {{- if .Values.datadog.criSocketPath }}
         - hostPath:
-            path: {{ dir .Values.datadog.criSocketPath }}
-          name: runtimesocketdir
+            path: {{ .Values.datadog.criSocketPath }}
+          name: runtimesocket
         {{- end }}
         {{- if .Values.datadog.dogstatsd.useSocketVolume }}
         - hostPath: