From ed073f2f2ee110d2deb6656c3551b22d7065a977 Mon Sep 17 00:00:00 2001
From: Matthieu Antoine <matthieu.antoine@jumo.world>
Date: Wed, 20 May 2020 14:55:31 +0200
Subject: [PATCH] Make DD_SITE a common env var so it is passed to
 process-agent, system-probe, trace-agent

---
 pkg/controller/datadogagent/agent_test.go | 8 ++++----
 pkg/controller/datadogagent/utils.go      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/controller/datadogagent/agent_test.go b/pkg/controller/datadogagent/agent_test.go
index 72d79f897..9f58cb84c 100644
--- a/pkg/controller/datadogagent/agent_test.go
+++ b/pkg/controller/datadogagent/agent_test.go
@@ -164,10 +164,6 @@ func defaultEnvVars() []corev1.EnvVar {
 			Name:  "DD_CLUSTER_NAME",
 			Value: "",
 		},
-		{
-			Name:  "DD_SITE",
-			Value: "",
-		},
 		{
 			Name:  "DD_HEALTH_PORT",
 			Value: "5555",
@@ -208,6 +204,10 @@ func defaultEnvVars() []corev1.EnvVar {
 			Name:  "DD_LOG_LEVEL",
 			Value: "INFO",
 		},
+		{
+			Name:  "DD_SITE",
+			Value: "",
+		},
 		{
 			Name: "DD_KUBERNETES_KUBELET_HOST",
 			ValueFrom: &corev1.EnvVarSource{
diff --git a/pkg/controller/datadogagent/utils.go b/pkg/controller/datadogagent/utils.go
index e8cabcb6c..8402c721a 100644
--- a/pkg/controller/datadogagent/utils.go
+++ b/pkg/controller/datadogagent/utils.go
@@ -403,6 +403,10 @@ func getEnvVarsCommon(dda *datadoghqv1alpha1.DatadogAgent, needAPIKey bool) ([]c
 			Name:  datadoghqv1alpha1.DDLogLevel,
 			Value: getLogLevel(dda),
 		},
+		{
+			Name:  datadoghqv1alpha1.DDSite,
+			Value: dda.Spec.Site,
+		},
 		{
 			Name: datadoghqv1alpha1.DDKubeletHost,
 			ValueFrom: &corev1.EnvVarSource{
@@ -472,10 +476,6 @@ func getEnvVarsForAgent(dda *datadoghqv1alpha1.DatadogAgent) ([]corev1.EnvVar, e
 			Name:  datadoghqv1alpha1.DDClusterName,
 			Value: spec.ClusterName,
 		},
-		{
-			Name:  datadoghqv1alpha1.DDSite,
-			Value: spec.Site,
-		},
 		{
 			Name:  datadoghqv1alpha1.DDHealthPort,
 			Value: strconv.Itoa(int(datadoghqv1alpha1.DefaultAgentHealthPort)),