From 12eb363290223f7ea001064a7ea2b42a61121b89 Mon Sep 17 00:00:00 2001 From: Xavier Vello Date: Tue, 6 Feb 2018 21:49:12 +0100 Subject: [PATCH] [datadog] mount auto_conf in the right folder for alpine images (#3575) * datadog: mount auto_conf in the right folder for alpine images * update chart version --- stable/datadog/Chart.yaml | 2 +- stable/datadog/templates/daemonset.yaml | 4 ++++ stable/datadog/templates/deployment.yaml | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index b1a007c39a..6051145bf8 100755 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,5 +1,5 @@ name: datadog -version: 0.10.5 +version: 0.10.6 description: DataDog Agent keywords: - monitoring diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml index 7d20f3ce95..f4f659ea98 100644 --- a/stable/datadog/templates/daemonset.yaml +++ b/stable/datadog/templates/daemonset.yaml @@ -104,7 +104,11 @@ spec: {{- end }} {{- if .Values.datadog.autoconf }} - name: autoconf + {{- if hasSuffix "-alpine" .Values.image.tag }} + mountPath: /opt/datadog-agent/agent/conf.d/auto_conf + {{- else }} mountPath: /etc/dd-agent/conf.d/auto_conf + {{- end }} readOnly: true {{- end }} {{- if .Values.datadog.volumeMounts }} diff --git a/stable/datadog/templates/deployment.yaml b/stable/datadog/templates/deployment.yaml index d10c116da1..2d25e8e490 100644 --- a/stable/datadog/templates/deployment.yaml +++ b/stable/datadog/templates/deployment.yaml @@ -89,7 +89,11 @@ spec: {{- end }} {{- if .Values.datadog.autoconf }} - name: autoconf + {{- if hasSuffix "-alpine" .Values.image.tag }} + mountPath: /opt/datadog-agent/agent/conf.d/auto_conf + {{- else }} mountPath: /etc/dd-agent/conf.d/auto_conf + {{- end }} readOnly: true {{- end }} {{- if .Values.datadog.volumeMounts }}