[stable/datalog] Do not enable the cri check when running on a `doc…

…ker` setup (helm#21476) Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
vboulineau · Mar 17, 2020 · b181353 · b181353
1 parent 9025b6c
commit b181353
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 20 deletions.
diff --git a/stable/datadog/CHANGELOG.md b/stable/datadog/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 2.0
 
+## 2.0.10
+
+* Do not enable the `cri` check when running on a `docker` setup.
+
 ## 2.0.7
 
 * Pass expected `DD_DOGSTATSD_PORT` to datadog-agent rather than invalid `DD_DOGSTATD_PORT`
@@ -22,7 +26,7 @@
 ## 2.0.3
 
 * Fix templating error when `agents.useConfigMap` is set to true.
-* Add DD_APM_ENABLED environment variable to trace agent container.
+* Add DD\_APM\_ENABLED environment variable to trace agent container.
 
 
 ## 2.0.2

diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 2.0.9
+version: 2.0.10
 appVersion: "7"
 description: Datadog Agent
 keywords:

diff --git a/stable/datadog/README.md b/stable/datadog/README.md
@@ -275,7 +275,8 @@ helm install --name <RELEASE_NAME> \
 | `datadog.processAgent.processCollection`                     | Enable live process collection. Possible values: `true` enable process collection, `false` disable process collection                                     | `false`                                         |
 | `datadog.checksd`                                            | Additional custom checks as python code                                                                                                                   | `nil`                                           |
 | `datadog.confd`                                              | Additional check configurations (static and Autodiscovery)                                                                                                | `nil`                                           |
-| `datadog.criSocketPath`                                      | Path to the container runtime socket (default is Docker runtime)                                                                                          | `/var/run/docker.sock`                          |
+| `datadog.dockerSocketPath`                                   | Path to the docker socket                                                                                                                                 | `/var/run/docker.sock`                          |
+| `datadog.criSocketPath`                                      | Path to the container runtime socket (default is Docker runtime)                                                                                          | `nil`                          |
 | `datadog.tags`                                               | Set host tags                                                                                                                                             | `nil`                                           |
 | `datadog.useCriSocketVolume`                                 | Enable mounting the container runtime socket in Agent containers                                                                                          | `True`                                          |
 | `datadog.dogstatsd.originDetection`                          | Enable origin detection for container tagging                                                                                                             | `False`                                         |

diff --git a/stable/datadog/templates/_helpers.tpl b/stable/datadog/templates/_helpers.tpl
@@ -69,3 +69,16 @@ Return the appropriate apiVersion for RBAC APIs.
 "rbac.authorization.k8s.io/v1beta1"
 {{- end -}}
 {{- end -}}
+
+{{/*
+Return the container runtime socket
+*/}}
+{{- define "datadog.dockerOrCriSocketPath" -}}
+{{- if .Values.datadog.dockerSocketPath -}}
+{{- .Values.dockerSocketPath -}}
+{{- else if .Values.datadog.criSocketPath -}}
+{{- .Values.datadog.criSocketPath -}}
+{{- else -}}
+/var/run/docker.sock
+{{- end -}}
+{{- end -}}
diff --git a/stable/datadog/templates/container-agent.yaml b/stable/datadog/templates/container-agent.yaml
@@ -24,7 +24,7 @@
     {{- if .Values.datadog.logLevel }}
     - name: DD_LOG_LEVEL
       value: {{ .Values.agents.containers.agent.logLevel | default .Values.datadog.logLevel | quote }}
-    {{- end }}  
+    {{- end }}
     {{- if .Values.datadog.dogstatsd.port }}
     - name: DD_DOGSTATSD_PORT
       value: {{ .Values.datadog.dogstatsd.port | quote }}
@@ -85,6 +85,10 @@
       value: {{  (default false (or .Values.datadog.logs.enabled .Values.datadog.logsEnabled)) | quote}}
     - name: DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL
       value: {{  (default false (or .Values.datadog.logs.containerCollectAll .Values.datadog.logsConfigContainerCollectAll)) | quote}}
+    {{- if .Values.datadog.dockerSocketPath }}
+    - name: DOCKER_HOST
+      value: unix://{{ .Values.datadog.dockerSocketPath }}
+    {{- end }}
     {{- if .Values.datadog.criSocketPath }}
     - name: DD_CRI_SOCKET_PATH
       value: {{ .Values.datadog.criSocketPath }}
@@ -112,11 +116,9 @@
       mountPath: /etc/datadog-agent/datadog.yaml
       subPath: datadog.yaml
     {{- end }}
-    {{- if .Values.datadog.criSocketPath }}
     - name: runtimesocket
-      mountPath: {{ .Values.datadog.criSocketPath }}
+      mountPath: {{ template "datadog.dockerOrCriSocketPath" . }}
       readOnly: true
-    {{- end }}
     {{- if .Values.datadog.dogstatsd.useSocketVolume }}
     - name: dsdsocket
       mountPath: "/var/run/datadog"
@@ -133,7 +135,7 @@
     - name: logpodpath
       mountPath: /var/log/pods
       readOnly: true
-    {{- if regexFind "^.*docker.*$" $.Values.datadog.criSocketPath }}
+    {{- if not .Values.datadog.criSocketPath }}
     - name: logdockercontainerpath
       mountPath: /var/lib/docker/containers
       readOnly: true

diff --git a/stable/datadog/templates/container-process-agent.yaml b/stable/datadog/templates/container-process-agent.yaml
@@ -38,11 +38,9 @@
     - name: procdir
       mountPath: /host/proc
       readOnly: true
-    {{- if .Values.datadog.criSocketPath }}
     - name: runtimesocket
-      mountPath: {{ .Values.datadog.criSocketPath }}
+      mountPath: {{ template "datadog.dockerOrCriSocketPath" . }}
       readOnly: true
-    {{- end }}
     {{- if .Values.datadog.systemProbe.enabled }}
     - name: sysprobe-socket-dir
       mountPath: /opt/datadog-agent/run

diff --git a/stable/datadog/templates/containers-init.yaml b/stable/datadog/templates/containers-init.yaml
@@ -32,16 +32,18 @@
     - name: procdir
       mountPath: /host/proc
       readOnly: true
-    {{- if .Values.datadog.criSocketPath }}
     - name: runtimesocket
-      mountPath: {{ .Values.datadog.criSocketPath }}
+      mountPath: {{ template "datadog.dockerOrCriSocketPath" . }}
       readOnly: true
-    {{- end }}
   env:
     {{- include "containers-common-env" . | nindent 4 }}
     {{- if .Values.datadog.env }}
       {{ toYaml .Values.datadog.env | nindent 4 }}
     {{- end }}
+    {{- if .Values.datadog.dockerSocketPath }}
+    - name: DOCKER_HOST
+      value: unix://{{ .Values.datadog.dockerSocketPath }}
+    {{- end }}
     {{- if .Values.datadog.criSocketPath }}
     - name: DD_CRI_SOCKET_PATH
       value: {{ .Values.datadog.criSocketPath }}

diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml
@@ -77,11 +77,9 @@ spec:
       volumes:
         - name: config
           emptyDir: {}
-        {{- if .Values.datadog.criSocketPath }}
         - hostPath:
-            path: {{ .Values.datadog.criSocketPath }}
+            path: {{ template "datadog.dockerOrCriSocketPath" . }}
           name: runtimesocket
-        {{- end }}
         {{- if .Values.datadog.dogstatsd.useSocketVolume }}
         - hostPath:
             path: "/var/run/datadog/"
@@ -112,7 +110,7 @@ spec:
         - hostPath:
             path: /var/log/pods
           name: logpodpath
-        {{- if regexFind "^.*docker.*$" $.Values.datadog.criSocketPath }}
+        {{- if not .Values.datadog.criSocketPath }}
         - hostPath:
             path: /var/lib/docker/containers
           name: logdockercontainerpath

diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml
@@ -268,11 +268,16 @@ datadog:
   # checksd:
   #   service.py: |-
 
-  ## @param criSocketPath - string - required
+  ## @param dockerSocketPath - string - optional
+  ## Path to the docker socket
+  #
+  # dockerSocketPath: /var/run/docker.sock
+
+  ## @param criSocketPath - string - optional
   ## Path to the container runtime socket (if different from Docker)
   ## This is supported starting from agent 6.6.0
   #
-  criSocketPath: /var/run/docker.sock
+  # criSocketPath: /var/run/containerd/containerd.sock
 
 
   ## @param processAgent - object - required