update after @celene review

DataDog · May 17, 2022 · 19477c1 · 19477c1
1 parent f1b216a
commit 19477c1
Show file tree

Hide file tree

Showing 15 changed files with 89 additions and 43 deletions.
diff --git a/controllers/datadogagent/common/const.go b/controllers/datadogagent/common/const.go
@@ -1,3 +1,8 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
 package common
 
 // Resource names

diff --git a/controllers/datadogagent/component/agent/default.go b/controllers/datadogagent/component/agent/default.go
@@ -1,3 +1,8 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
 package agent
 
 import (

diff --git a/controllers/datadogagent/component/clusteragent/default.go b/controllers/datadogagent/component/clusteragent/default.go
@@ -1,3 +1,8 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
 package clusteragent
 
 import (

diff --git a/controllers/datadogagent/component/clustercheckrunner/default.go b/controllers/datadogagent/component/clustercheckrunner/default.go
@@ -1,3 +1,8 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
 package clustercheckrunner
 
 import (

diff --git a/controllers/datadogagent/component/const.go b/controllers/datadogagent/component/const.go
@@ -1 +1,6 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
 package component
diff --git a/controllers/datadogagent/component/new.go b/controllers/datadogagent/component/new.go
@@ -1,3 +1,8 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
 package component
 
 import (

diff --git a/controllers/datadogagent/component/utils.go b/controllers/datadogagent/component/utils.go
@@ -1,3 +1,8 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
 package component
 
 import (

diff --git a/controllers/datadogagent/controller_reconcile_agent.go b/controllers/datadogagent/controller_reconcile_agent.go
@@ -1,3 +1,8 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
 package datadogagent
 
 import (

diff --git a/controllers/datadogagent/controller_reconcile_clc.go b/controllers/datadogagent/controller_reconcile_clc.go
@@ -1,3 +1,8 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
 package datadogagent
 
 import (

diff --git a/controllers/datadogagent/controller_reconcile_dca.go b/controllers/datadogagent/controller_reconcile_dca.go
@@ -1,3 +1,8 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
 package datadogagent
 
 import (

diff --git a/controllers/datadogagent/controller_reconcile_v2.go b/controllers/datadogagent/controller_reconcile_v2.go
@@ -1,3 +1,8 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
 package datadogagent
 
 import (

diff --git a/controllers/datadogagent/controller_reconcile_v2_common.go b/controllers/datadogagent/controller_reconcile_v2_common.go
@@ -1,3 +1,8 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
 package datadogagent
 
 import (

diff --git a/controllers/datadogagent/feature/kubernetesstatecore/feature.go b/controllers/datadogagent/feature/kubernetesstatecore/feature.go
@@ -59,31 +59,28 @@ type ksmFeature struct {
 // Configure use to configure the feature from a v2alpha1.DatadogAgent instance.
 func (f *ksmFeature) Configure(dda *v2alpha1.DatadogAgent) feature.RequiredComponents {
 	f.owner = dda
+	var output feature.RequiredComponents
+
 	if dda.Spec.Features.KubeStateMetricsCore != nil && apiutils.BoolValue(dda.Spec.Features.KubeStateMetricsCore.Enabled) {
 		f.enable = true
+		output.ClusterAgent.IsRequired = &f.enable
 
 		if dda.Spec.Features.KubeStateMetricsCore.Conf != nil {
 			f.customConfig = v2alpha1.ConvertCustomConfig(dda.Spec.Features.KubeStateMetricsCore.Conf)
 		}
 
 		f.configConfigMapName = apicommonv1.GetConfName(dda, f.customConfig, apicommon.DefaultKubeStateMetricsCoreConf)
-	}
 
-	if dda.Spec.Features.ClusterChecks != nil && apiutils.BoolValue(dda.Spec.Features.ClusterChecks.Enabled) {
-		f.clusterChecksEnabled = true
-		if apiutils.BoolValue(dda.Spec.Features.ClusterChecks.UseClusterChecksRunners) {
-			f.rbacSuffix = common.CheckRunnersSuffix
-			f.serviceAccountName = v2alpha1.GetClusterChecksRunnerServiceAccount(dda)
-		} else {
-			f.serviceAccountName = v2alpha1.GetClusterAgentServiceAccount(dda)
-		}
-	}
+		if dda.Spec.Features.ClusterChecks != nil && apiutils.BoolValue(dda.Spec.Features.ClusterChecks.Enabled) {
+			f.clusterChecksEnabled = true
+			output.ClusterCheckRunner.IsRequired = &f.clusterChecksEnabled
 
-	output := feature.RequiredComponents{}
-	if f.enable {
-		output.ClusterAgent = feature.RequiredComponent{IsRequired: &f.enable}
-		if f.clusterChecksEnabled {
-			output.ClusterCheckRunner = feature.RequiredComponent{IsRequired: &f.clusterChecksEnabled}
+			if apiutils.BoolValue(dda.Spec.Features.ClusterChecks.UseClusterChecksRunners) {
+				f.rbacSuffix = common.CheckRunnersSuffix
+				f.serviceAccountName = v2alpha1.GetClusterChecksRunnerServiceAccount(dda)
+			} else {
+				f.serviceAccountName = v2alpha1.GetClusterAgentServiceAccount(dda)
+			}
 		}
 	}
 
@@ -93,18 +90,18 @@ func (f *ksmFeature) Configure(dda *v2alpha1.DatadogAgent) feature.RequiredCompo
 // ConfigureV1 use to configure the feature from a v1alpha1.DatadogAgent instance.
 func (f *ksmFeature) ConfigureV1(dda *v1alpha1.DatadogAgent) feature.RequiredComponents {
 	f.owner = dda
+	var output feature.RequiredComponents
 
-	if dda.Spec.Features.KubeStateMetricsCore != nil {
-		if apiutils.BoolValue(dda.Spec.Features.KubeStateMetricsCore.Enabled) {
-			f.enable = true
-		}
+	if dda.Spec.Features.KubeStateMetricsCore != nil && apiutils.BoolValue(dda.Spec.Features.KubeStateMetricsCore.Enabled) {
+		f.enable = true
+		output.ClusterAgent.IsRequired = &f.enable
 
 		if dda.Spec.ClusterAgent.Config != nil && apiutils.BoolValue(dda.Spec.ClusterAgent.Config.ClusterChecksEnabled) {
-			if apiutils.BoolValue(dda.Spec.Features.KubeStateMetricsCore.ClusterCheck) {
-				f.clusterChecksEnabled = true
-				f.rbacSuffix = common.CheckRunnersSuffix
-				f.serviceAccountName = v1alpha1.GetClusterChecksRunnerServiceAccount(dda)
-			}
+			f.clusterChecksEnabled = true
+			f.rbacSuffix = common.CheckRunnersSuffix
+			f.serviceAccountName = v1alpha1.GetClusterChecksRunnerServiceAccount(dda)
+
+			output.ClusterCheckRunner.IsRequired = &f.clusterChecksEnabled
 		} else {
 			f.serviceAccountName = v1alpha1.GetClusterAgentServiceAccount(dda)
 		}
@@ -116,14 +113,6 @@ func (f *ksmFeature) ConfigureV1(dda *v1alpha1.DatadogAgent) feature.RequiredCom
 		f.configConfigMapName = apicommonv1.GetConfName(dda, f.customConfig, apicommon.DefaultKubeStateMetricsCoreConf)
 	}
 
-	output := feature.RequiredComponents{}
-	if f.enable {
-		output.ClusterAgent = feature.RequiredComponent{IsRequired: &f.enable}
-		if f.clusterChecksEnabled {
-			output.ClusterCheckRunner = feature.RequiredComponent{IsRequired: &f.clusterChecksEnabled}
-		}
-	}
-
 	return output
 }
 

diff --git a/controllers/datadogagent/feature/types.go b/controllers/datadogagent/feature/types.go
@@ -9,6 +9,7 @@ import (
 	apicommonv1 "github.com/DataDog/datadog-operator/apis/datadoghq/common/v1"
 	"github.com/DataDog/datadog-operator/apis/datadoghq/v1alpha1"
 	"github.com/DataDog/datadog-operator/apis/datadoghq/v2alpha1"
+	"github.com/DataDog/datadog-operator/apis/utils"
 	apiutils "github.com/DataDog/datadog-operator/apis/utils"
 	"github.com/DataDog/datadog-operator/controllers/datadogagent/dependencies"
 	"github.com/DataDog/datadog-operator/controllers/datadogagent/merger"
@@ -64,11 +65,6 @@ func (rc *RequiredComponent) Merge(in *RequiredComponent) *RequiredComponent {
 	return rc
 }
 
-const (
-	trueValue  bool = true
-	falseValue bool = false
-)
-
 func merge(a, b *bool) *bool {
 	if a == nil && b == nil {
 		return nil
@@ -78,13 +74,9 @@ func merge(a, b *bool) *bool {
 		return a
 	}
 	if !apiutils.BoolValue(a) || !apiutils.BoolValue(b) {
-		return newBoolPointer(falseValue)
+		return utils.NewBoolPointer(false)
 	}
-	return newBoolPointer(trueValue)
-}
-
-func newBoolPointer(v bool) *bool {
-	return &v
+	return utils.NewBoolPointer(true)
 }
 
 func mergeSlices(a, b []apicommonv1.AgentContainerName) []apicommonv1.AgentContainerName {

diff --git a/controllers/datadogagent/override/global.go b/controllers/datadogagent/override/global.go
@@ -1,3 +1,8 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+
 package override
 
 import (