From f5b866c8cd28fd7a56fca925b6cb1b303188d0f4 Mon Sep 17 00:00:00 2001
From: Cedric Lamoriniere <cedric.lamoriniere@datadoghq.com>
Date: Thu, 9 Jan 2020 13:53:45 +0100
Subject: [PATCH] [stable/datadog] fix dd_site and dd_dd_url env var (#19913)

Fix the usage of the `.Values.datadog.site` and `.Values.datadog.dd_url`
parameters when `.Values.daemonset.useDedicatedContainers` is activated.

Signed-off-by: cedric lamoriniere <cedric.lamoriniere@datadoghq.com>
---
 stable/datadog/Chart.yaml                           | 2 +-
 stable/datadog/templates/container-agent.yaml       | 8 --------
 stable/datadog/templates/containers-common-env.yaml | 8 ++++++++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
index 8802314ff3..3d6405ad5f 100644
--- a/stable/datadog/Chart.yaml
+++ b/stable/datadog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 1.39.1
+version: 1.39.2
 appVersion: "7"
 description: DataDog Agent
 keywords:
diff --git a/stable/datadog/templates/container-agent.yaml b/stable/datadog/templates/container-agent.yaml
index 330ba318c1..6828781ccd 100644
--- a/stable/datadog/templates/container-agent.yaml
+++ b/stable/datadog/templates/container-agent.yaml
@@ -21,14 +21,6 @@
     - name: DD_CLUSTER_NAME
       value: {{ .Values.datadog.clusterName | quote }}
     {{- end }}
-    {{- if .Values.datadog.site }}
-    - name: DD_SITE
-      value: {{ .Values.datadog.site | quote }}
-    {{- end }}
-    {{- if .Values.datadog.dd_url }}
-    - name: DD_DD_URL
-      value: {{ .Values.datadog.dd_url | quote }}
-    {{- end }}
     {{- if .Values.datadog.logLevel }}
     - name: DD_LOG_LEVEL
       value: {{ .Values.daemonset.containers.agent.logLevel | default .Values.datadog.logLevel | quote }}
diff --git a/stable/datadog/templates/containers-common-env.yaml b/stable/datadog/templates/containers-common-env.yaml
index 5eb400985e..2750e35d98 100644
--- a/stable/datadog/templates/containers-common-env.yaml
+++ b/stable/datadog/templates/containers-common-env.yaml
@@ -22,4 +22,12 @@
 {{- end }}
 - name: KUBERNETES
   value: "yes"
+{{- if .Values.datadog.site }}
+- name: DD_SITE
+  value: {{ .Values.datadog.site | quote }}
+{{- end }}
+{{- if .Values.datadog.dd_url }}
+- name: DD_DD_URL
+  value: {{ .Values.datadog.dd_url | quote }}
+{{- end }}
 {{- end -}}