From 3b8bf721a819475d3454601f123a776a954a2a21 Mon Sep 17 00:00:00 2001
From: Carlos Castro <62995433+carloscastrojumo@users.noreply.github.com>
Date: Thu, 27 Aug 2020 18:19:01 +0100
Subject: [PATCH] Remove DD_HOSTNAME from agent and move it back to check
 runner (#139)

---
 Makefile                                                | 4 ++--
 pkg/controller/datadogagent/agent_test.go               | 8 --------
 pkg/controller/datadogagent/clusterchecksrunner.go      | 8 ++++++++
 pkg/controller/datadogagent/clusterchecksrunner_test.go | 8 ++++++++
 pkg/controller/datadogagent/utils.go                    | 8 --------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 4cf0b8cda..02dcf91f6 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ build-plugin: ${ARTIFACT_PLUGIN}
 ${ARTIFACT_PLUGIN}: ${SOURCES}
 	CGO_ENABLED=0 go build -i -installsuffix cgo ${LDFLAGS} -o ${ARTIFACT_PLUGIN} ./cmd/${ARTIFACT_PLUGIN}/main.go
 
-container:
+container: bin/operator-sdk
 	./bin/operator-sdk build $(PREFIX):$(TAG)
     ifeq ($(KINDPUSH), true)
 	 kind load docker-image --name $(KIND_CLUSTER_NAME) $(PREFIX):$(TAG)
@@ -54,7 +54,7 @@ container-ci:
 test:
 	./go.test.sh
 
-e2e:
+e2e: bin/operator-sdk
 	kubectl apply -f deploy/datadoghq_v1alpha1_extendeddaemonset_crd.yaml
 	./bin/operator-sdk test local ./test/e2e --go-test-flags '-v' --image $(PREFIX):$(TAG)
 
diff --git a/pkg/controller/datadogagent/agent_test.go b/pkg/controller/datadogagent/agent_test.go
index c89b683cd..2e454759f 100644
--- a/pkg/controller/datadogagent/agent_test.go
+++ b/pkg/controller/datadogagent/agent_test.go
@@ -236,14 +236,6 @@ func defaultEnvVars() []corev1.EnvVar {
 				},
 			},
 		},
-		{
-			Name: datadoghqv1alpha1.DDHostname,
-			ValueFrom: &corev1.EnvVarSource{
-				FieldRef: &corev1.ObjectFieldSelector{
-					FieldPath: FieldPathSpecNodeName,
-				},
-			},
-		},
 		{
 			Name:  "KUBERNETES",
 			Value: "yes",
diff --git a/pkg/controller/datadogagent/clusterchecksrunner.go b/pkg/controller/datadogagent/clusterchecksrunner.go
index aae0a63b5..89461fe8d 100644
--- a/pkg/controller/datadogagent/clusterchecksrunner.go
+++ b/pkg/controller/datadogagent/clusterchecksrunner.go
@@ -373,6 +373,14 @@ func getEnvVarsForClusterChecksRunner(dda *datadoghqv1alpha1.DatadogAgent) []cor
 				},
 			},
 		},
+		{
+			Name: datadoghqv1alpha1.DDHostname,
+			ValueFrom: &corev1.EnvVarSource{
+				FieldRef: &corev1.ObjectFieldSelector{
+					FieldPath: FieldPathSpecNodeName,
+				},
+			},
+		},
 	}
 
 	if spec.ClusterChecksRunner.Config.LogLevel != nil {
diff --git a/pkg/controller/datadogagent/clusterchecksrunner_test.go b/pkg/controller/datadogagent/clusterchecksrunner_test.go
index 3df4a520a..8bcd36da8 100644
--- a/pkg/controller/datadogagent/clusterchecksrunner_test.go
+++ b/pkg/controller/datadogagent/clusterchecksrunner_test.go
@@ -197,6 +197,14 @@ func clusterChecksRunnerDefaultEnvVars() []corev1.EnvVar {
 				},
 			},
 		},
+		{
+			Name: datadoghqv1alpha1.DDHostname,
+			ValueFrom: &corev1.EnvVarSource{
+				FieldRef: &corev1.ObjectFieldSelector{
+					FieldPath: FieldPathSpecNodeName,
+				},
+			},
+		},
 	}
 }
 
diff --git a/pkg/controller/datadogagent/utils.go b/pkg/controller/datadogagent/utils.go
index 267ee0577..395c1a991 100644
--- a/pkg/controller/datadogagent/utils.go
+++ b/pkg/controller/datadogagent/utils.go
@@ -443,14 +443,6 @@ func getEnvVarsCommon(dda *datadoghqv1alpha1.DatadogAgent, needAPIKey bool) ([]c
 				},
 			},
 		},
-		{
-			Name: datadoghqv1alpha1.DDHostname,
-			ValueFrom: &corev1.EnvVarSource{
-				FieldRef: &corev1.ObjectFieldSelector{
-					FieldPath: FieldPathSpecNodeName,
-				},
-			},
-		},
 		{
 			Name:  datadoghqv1alpha1.KubernetesEnvvarName,
 			Value: "yes",