From 6de689e7e495198629f192eadd9cfef6cc4eef93 Mon Sep 17 00:00:00 2001 From: Kubernetes Prow Robot Date: Thu, 5 Mar 2020 06:46:38 -0800 Subject: [PATCH] [stable/datadog] Revert "Mount the directory containing the CRI socket instead of the socket itself" (#21268) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 24b4881ecb9ae7c4368359d59df4fcc968493356. Fixes #21223 Signed-off-by: Lénaïc Huard --- stable/datadog/CHANGELOG.md | 4 ++++ stable/datadog/Chart.yaml | 2 +- stable/datadog/templates/container-agent.yaml | 6 +++--- stable/datadog/templates/container-process-agent.yaml | 4 ++-- stable/datadog/templates/containers-init.yaml | 4 ++-- stable/datadog/templates/daemonset.yaml | 4 ++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/stable/datadog/CHANGELOG.md b/stable/datadog/CHANGELOG.md index 67818f2496..87f9761346 100644 --- a/stable/datadog/CHANGELOG.md +++ b/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`. diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index f30ce112e9..9326cbaf42 100644 --- a/stable/datadog/Chart.yaml +++ b/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: diff --git a/stable/datadog/templates/container-agent.yaml b/stable/datadog/templates/container-agent.yaml index 4bf88dc8ff..6f5b81e1e0 100644 --- a/stable/datadog/templates/container-agent.yaml +++ b/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 }} diff --git a/stable/datadog/templates/container-process-agent.yaml b/stable/datadog/templates/container-process-agent.yaml index d4856b0ce1..ea89e2d7a4 100644 --- a/stable/datadog/templates/container-process-agent.yaml +++ b/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 }} diff --git a/stable/datadog/templates/containers-init.yaml b/stable/datadog/templates/containers-init.yaml index 219ce0ce18..b6eb267cee 100644 --- a/stable/datadog/templates/containers-init.yaml +++ b/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: diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml index 9e2ad75a99..d280a3b075 100644 --- a/stable/datadog/templates/daemonset.yaml +++ b/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: