Do not add DD_URL by default, but only add it if specified

DataDog · May 20, 2020 · e856641 · e856641
1 parent 64d5a8f
commit e856641
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 31 deletions.
diff --git a/pkg/apis/datadoghq/v1alpha1/datadogagent_default.go b/pkg/apis/datadoghq/v1alpha1/datadogagent_default.go
@@ -19,7 +19,6 @@ import (
 // default values
 const (
 	DefaultLogLevel                               string = "INFO"
-	defaultDatadogURL                             string = "https://app.datadoghq.com"
 	defaultAgentImage                             string = "datadog/agent:latest"
 	defaultCollectEvents                          bool   = false
 	defaultLeaderElection                         bool   = false
@@ -155,10 +154,6 @@ func IsDefaultedDatadogAgentSpecAgentConfig(config *NodeAgentConfig) bool {
 		return false
 	}
 
-	if config.DDUrl == nil {
-		return false
-	}
-
 	if config.LogLevel == nil {
 		return false
 	}
@@ -402,10 +397,6 @@ func DefaultDatadogAgentSpecAgentConfig(config *NodeAgentConfig) *NodeAgentConfi
 		config = &NodeAgentConfig{}
 	}
 
-	if config.DDUrl == nil {
-		config.DDUrl = NewStringPointer(defaultDatadogURL)
-	}
-
 	if config.LogLevel == nil {
 		config.LogLevel = NewStringPointer(DefaultLogLevel)
 	}

diff --git a/pkg/controller/datadogagent/agent_rbac.go b/pkg/controller/datadogagent/agent_rbac.go
@@ -52,7 +52,7 @@ func (r *ReconcileDatadogAgent) manageAgentRBACs(logger logr.Logger, dda *datado
 		return reconcile.Result{}, err
 	}
 
-	// Create ClusterRoleBindig
+	// Create ClusterRoleBinding
 	clusterRoleBinding := &rbacv1.ClusterRoleBinding{}
 	if err := r.client.Get(context.TODO(), types.NamespacedName{Name: rbacResourcesName}, clusterRoleBinding); err != nil {
 		if errors.IsNotFound(err) {

diff --git a/pkg/controller/datadogagent/agent_test.go b/pkg/controller/datadogagent/agent_test.go
@@ -168,10 +168,6 @@ func defaultEnvVars() []corev1.EnvVar {
 			Name:  "DD_SITE",
 			Value: "",
 		},
-		{
-			Name:  "DD_DD_URL",
-			Value: "https://app.datadoghq.com",
-		},
 		{
 			Name:  "DD_HEALTH_PORT",
 			Value: "5555",

diff --git a/pkg/controller/datadogagent/clusteragent.go b/pkg/controller/datadogagent/clusteragent.go
@@ -436,7 +436,7 @@ func getEnvVarsForClusterAgent(dda *datadoghqv1alpha1.DatadogAgent) []corev1.Env
 		},
 	}
 
-	if spec.Agent != nil {
+	if spec.Agent != nil && spec.Agent.Config.DDUrl != nil {
 		envVars = append(envVars, corev1.EnvVar{
 			Name:  datadoghqv1alpha1.DDddURL,
 			Value: *spec.Agent.Config.DDUrl,

diff --git a/pkg/controller/datadogagent/clusteragent_test.go b/pkg/controller/datadogagent/clusteragent_test.go
@@ -88,10 +88,6 @@ func clusterAgentDefaultEnvVars() []corev1.EnvVar {
 			Name:  "DD_LEADER_ELECTION",
 			Value: "true",
 		},
-		{
-			Name:  "DD_DD_URL",
-			Value: "https://app.datadoghq.com",
-		},
 		{
 			Name:      "DD_API_KEY",
 			ValueFrom: apiKeyValue(),

diff --git a/pkg/controller/datadogagent/clusterchecksrunner.go b/pkg/controller/datadogagent/clusterchecksrunner.go
@@ -309,10 +309,6 @@ func getEnvVarsForClusterChecksRunner(dda *datadoghqv1alpha1.DatadogAgent) []cor
 			Name:  datadoghqv1alpha1.DDSite,
 			Value: spec.Site,
 		},
-		{
-			Name:  datadoghqv1alpha1.DDddURL,
-			Value: *spec.Agent.Config.DDUrl,
-		},
 		{
 			Name:  datadoghqv1alpha1.DDClusterChecksEnabled,
 			Value: "true",
@@ -374,6 +370,13 @@ func getEnvVarsForClusterChecksRunner(dda *datadoghqv1alpha1.DatadogAgent) []cor
 		})
 	}
 
+	if spec.Agent.Config.DDUrl != nil {
+		envVars = append(envVars, corev1.EnvVar{
+			Name:  datadoghqv1alpha1.DDddURL,
+			Value: *spec.Agent.Config.DDUrl,
+		})
+	}
+
 	return append(envVars, spec.ClusterChecksRunner.Config.Env...)
 }
 

diff --git a/pkg/controller/datadogagent/clusterchecksrunner_test.go b/pkg/controller/datadogagent/clusterchecksrunner_test.go
@@ -82,10 +82,6 @@ func clusterChecksRunnerDefaultEnvVars() []corev1.EnvVar {
 			Name:  "DD_SITE",
 			Value: "",
 		},
-		{
-			Name:  "DD_DD_URL",
-			Value: "https://app.datadoghq.com",
-		},
 		{
 			Name:  "DD_CLUSTER_CHECKS_ENABLED",
 			Value: "true",

diff --git a/pkg/controller/datadogagent/utils.go b/pkg/controller/datadogagent/utils.go
@@ -444,6 +444,13 @@ func getEnvVarsCommon(dda *datadoghqv1alpha1.DatadogAgent, needAPIKey bool) ([]c
 		})
 	}
 
+	if dda.Spec.Agent.Config.DDUrl != nil {
+		envVars = append(envVars, corev1.EnvVar{
+			Name:  datadoghqv1alpha1.DDddURL,
+			Value: *dda.Spec.Agent.Config.DDUrl,
+		})
+	}
+
 	return envVars, nil
 }
 
@@ -469,10 +476,6 @@ func getEnvVarsForAgent(dda *datadoghqv1alpha1.DatadogAgent) ([]corev1.EnvVar, e
 			Name:  datadoghqv1alpha1.DDSite,
 			Value: spec.Site,
 		},
-		{
-			Name:  datadoghqv1alpha1.DDddURL,
-			Value: *spec.Agent.Config.DDUrl,
-		},
 		{
 			Name:  datadoghqv1alpha1.DDHealthPort,
 			Value: strconv.Itoa(int(datadoghqv1alpha1.DefaultAgentHealthPort)),