diff --git a/api/datadoghq/common/const.go b/api/datadoghq/common/const.go index 1dcc55738..8b98fe244 100644 --- a/api/datadoghq/common/const.go +++ b/api/datadoghq/common/const.go @@ -5,12 +5,6 @@ package common -import ( - "time" - - appsv1 "k8s.io/api/apps/v1" -) - // TODO move most of these constants out of common // This file tracks constants related to setting up the Datadog Agents @@ -26,82 +20,6 @@ const ( MD5AgentDeploymentAnnotationKey = "agent.datadoghq.com/agentspechash" // MD5ChecksumAnnotationKey annotation key is used to identify customConfig configurations MD5ChecksumAnnotationKey = "checksum/%s-custom-config" - - // DefaultAgentResourceSuffix use as suffix for agent resource naming - DefaultAgentResourceSuffix = "agent" - // DefaultClusterAgentResourceSuffix use as suffix for cluster-agent resource naming - DefaultClusterAgentResourceSuffix = "cluster-agent" - // DefaultClusterChecksRunnerResourceSuffix use as suffix for cluster-checks-runner resource naming - DefaultClusterChecksRunnerResourceSuffix = "cluster-checks-runner" - // DefaultMetricsServerResourceSuffix use as suffix for cluster-agent metrics-server resource naming - DefaultMetricsServerResourceSuffix = "cluster-agent-metrics-server" - // DefaultAPPKeyKey default app-key key (use in secret for instance). - DefaultAPPKeyKey = "app_key" - // DefaultAPIKeyKey default api-key key (use in secret for instance). - DefaultAPIKeyKey = "api_key" - // DefaultTokenKey default token key (use in secret for instance). - DefaultTokenKey = "token" - // DefaultClusterAgentReplicas default cluster-agent deployment replicas - DefaultClusterAgentReplicas = 1 - // DefaultClusterAgentServicePort default cluster-agent service port - DefaultClusterAgentServicePort = 5005 - // DefaultClusterChecksRunnerReplicas default cluster checks runner deployment replicas - DefaultClusterChecksRunnerReplicas = 1 - // DefaultMetricsServerServicePort default metrics-server port - DefaultMetricsServerServicePort = 443 - // DefaultMetricsServerTargetPort default metrics-server pod port - DefaultMetricsServerTargetPort = int(DefaultMetricsProviderPort) - // DefaultAdmissionControllerServicePort default admission controller service port - DefaultAdmissionControllerServicePort = 443 - // DefaultAdmissionControllerTargetPort default admission controller pod port - DefaultAdmissionControllerTargetPort = 8000 - // DefaultAdmissionControllerWebhookName default admission controller webhook name - DefaultAdmissionControllerWebhookName string = "datadog-webhook" - // DefaultDogstatsdOriginDetection default Origin Detection - DefaultDogstatsdOriginDetection = "false" - // DefaultDogstatsdPort default dogstatsd port - DefaultDogstatsdPort = 8125 - // DefaultDogstatsdPortName default dogstatsd port name - DefaultDogstatsdPortName = "dogstatsdport" - // DefaultMetricsProviderPort default metrics provider port - DefaultMetricsProviderPort int32 = 8443 - // DefaultKubeStateMetricsCoreConf default ksm core ConfigMap name - DefaultKubeStateMetricsCoreConf string = "kube-state-metrics-core-config" - // DefaultOrchestratorExplorerConf default orchestrator explorer ConfigMap name - DefaultOrchestratorExplorerConf string = "orchestrator-explorer-config" - // DefaultKubeAPIServerConf default Kubernetes APIServer ConfigMap name - DefaultKubeAPIServerConf string = "kube-apiserver-config" - // DefaultSystemProbeSocketPath default System Probe socket path - DefaultSystemProbeSocketPath string = "/var/run/sysprobe/sysprobe.sock" - // DefaultCSPMConf default CSPM ConfigMap name - DefaultCSPMConf string = "cspm-config" - // DefaultCWSConf default CWS ConfigMap name - DefaultCWSConf string = "cws-config" - // DefaultHelmCheckConf default Helm Check ConfigMap name - DefaultHelmCheckConf string = "helm-check-config" - - // Default Image name - DefaultAgentImageName string = "agent" - DefaultClusterAgentImageName string = "cluster-agent" - DefaultImageRegistry string = "gcr.io/datadoghq" - DefaultAzureImageRegistry string = "datadoghq.azurecr.io" - DefaultEuropeImageRegistry string = "eu.gcr.io/datadoghq" - DefaultAsiaImageRegistry string = "asia.gcr.io/datadoghq" - DefaultGovImageRegistry string = "public.ecr.aws/datadog" - - // ExtendedDaemonset defaulting - DefaultRollingUpdateMaxUnavailable = "10%" - DefaultUpdateStrategy = appsv1.RollingUpdateDaemonSetStrategyType - DefaultRollingUpdateMaxPodSchedulerFailure = "10%" - DefaultRollingUpdateMaxParallelPodCreation int32 = 250 - DefaultRollingUpdateSlowStartIntervalDuration = 1 * time.Minute - DefaultRollingUpdateSlowStartAdditiveIncrease = "5" - DefaultReconcileFrequency = 10 * time.Second - - KubeServicesAndEndpointsConfigProviders = "kube_services kube_endpoints" - KubeServicesAndEndpointsListeners = "kube_services kube_endpoints" - EndpointsChecksConfigProvider = "endpointschecks" - ClusterAndEndpointsConfigProviders = "clusterchecks endpointschecks" ) // Annotations @@ -206,64 +124,64 @@ const ( SystemProbeConfigVolumePath = "/etc/datadog-agent/system-probe.yaml" OtelCustomConfigVolumePath = "/etc/datadog-agent/otel-config.yaml" - LogDatadogVolumeName = "logdatadog" - LogDatadogVolumePath = "/var/log/datadog" - TmpVolumeName = "tmp" - TmpVolumePath = "/tmp" - CertificatesVolumeName = "certificates" - CertificatesVolumePath = "/etc/datadog-agent/certificates" - AuthVolumeName = "datadog-agent-auth" - AuthVolumePath = "/etc/datadog-agent/auth" - InstallInfoVolumeName = "installinfo" - InstallInfoVolumeSubPath = "install_info" - InstallInfoVolumePath = "/etc/datadog-agent/install_info" - InstallInfoVolumeReadOnly = true - PointerVolumeName = "pointerdir" - PointerVolumePath = "/opt/datadog-agent/run" - LogTempStoragePath = "/var/lib/datadog-agent/logs" - PodLogVolumeName = "logpodpath" - PodLogVolumePath = "/var/log/pods" - ContainerLogVolumeName = "logcontainerpath" - ContainerLogVolumePath = "/var/lib/docker/containers" - SymlinkContainerVolumeName = "symlinkcontainerpath" - SymlinkContainerVolumePath = "/var/log/containers" - DogstatsdHostPortName = "dogstatsdport" - DogstatsdHostPortHostPort = 8125 - DogstatsdSocketVolumeName = "dsdsocket" - DogstatsdAPMSocketHostPath = "/var/run/datadog" - DogstatsdSocketLocalPath = "/var/run/datadog" - DogstatsdSocketName = "dsd.socket" - SecurityAgentComplianceCustomConfigDirVolumeName = "customcompliancebenchmarks" - SecurityAgentComplianceConfigDirVolumeName = "compliancedir" - SecurityAgentComplianceConfigDirVolumePath = "/etc/datadog-agent/compliance.d" - SecurityAgentRuntimeCustomPoliciesVolumeName = "customruntimepolicies" - SecurityAgentRuntimeCustomPoliciesVolumePath = "/etc/datadog-agent-runtime-policies" - SecurityAgentRuntimePoliciesDirVolumeName = "runtimepoliciesdir" - SecurityAgentRuntimePoliciesDirVolumePath = "/etc/datadog-agent/runtime-security.d" - HostCriSocketPathPrefix = "/host" - CriSocketVolumeName = "runtimesocketdir" - RuntimeDirVolumePath = "/var/run" - KubeletAgentCAPath = "/var/run/host-kubelet-ca.crt" - KubeletCAVolumeName = "kubelet-ca" - APMHostPortName = "traceport" - APMHostPortHostPort = 8126 - APMSocketVolumeName = "apmsocket" - APMSocketVolumeLocalPath = "/var/run/datadog" - APMSocketName = "apm.socket" - AdmissionControllerPortName = "admissioncontrollerport" - AdmissionControllerSocketCommunicationMode = "socket" - ExternalMetricsPortName = "metricsapi" - ExternalMetricsAPIServiceName = "v1beta1.external.metrics.k8s.io" - OTLPGRPCPortName = "otlpgrpcport" - OTLPHTTPPortName = "otlphttpport" - SeccompSecurityVolumeName = "datadog-agent-security" - SeccompSecurityVolumePath = "/etc/config" - SeccompRootVolumeName = "seccomp-root" - SeccompRootVolumePath = "/host/var/lib/kubelet/seccomp" - SeccompRootPath = "/var/lib/kubelet/seccomp" - SystemProbeSeccompKey = "system-probe-seccomp.json" - SystemProbeAgentSecurityConfigMapSuffixName = "system-probe-seccomp" - SystemProbeSeccompProfileName = "system-probe" + LogDatadogVolumeName = "logdatadog" + LogDatadogVolumePath = "/var/log/datadog" + TmpVolumeName = "tmp" + TmpVolumePath = "/tmp" + CertificatesVolumeName = "certificates" + CertificatesVolumePath = "/etc/datadog-agent/certificates" + AuthVolumeName = "datadog-agent-auth" + AuthVolumePath = "/etc/datadog-agent/auth" + InstallInfoVolumeName = "installinfo" + InstallInfoVolumeSubPath = "install_info" + InstallInfoVolumePath = "/etc/datadog-agent/install_info" + InstallInfoVolumeReadOnly = true + PointerVolumeName = "pointerdir" + PointerVolumePath = "/opt/datadog-agent/run" + LogTempStoragePath = "/var/lib/datadog-agent/logs" + PodLogVolumeName = "logpodpath" + PodLogVolumePath = "/var/log/pods" + ContainerLogVolumeName = "logcontainerpath" + ContainerLogVolumePath = "/var/lib/docker/containers" + SymlinkContainerVolumeName = "symlinkcontainerpath" + SymlinkContainerVolumePath = "/var/log/containers" + DogstatsdHostPortName = "dogstatsdport" + DogstatsdHostPortHostPort = 8125 + DogstatsdSocketVolumeName = "dsdsocket" + DogstatsdAPMSocketHostPath = "/var/run/datadog" + DogstatsdSocketLocalPath = "/var/run/datadog" + DogstatsdSocketName = "dsd.socket" + // SecurityAgentComplianceCustomConfigDirVolumeName = "customcompliancebenchmarks" // Not used + SecurityAgentComplianceConfigDirVolumeName = "compliancedir" + SecurityAgentComplianceConfigDirVolumePath = "/etc/datadog-agent/compliance.d" + SecurityAgentRuntimeCustomPoliciesVolumeName = "customruntimepolicies" + SecurityAgentRuntimeCustomPoliciesVolumePath = "/etc/datadog-agent-runtime-policies" + SecurityAgentRuntimePoliciesDirVolumeName = "runtimepoliciesdir" + SecurityAgentRuntimePoliciesDirVolumePath = "/etc/datadog-agent/runtime-security.d" + HostCriSocketPathPrefix = "/host" + CriSocketVolumeName = "runtimesocketdir" + RuntimeDirVolumePath = "/var/run" + KubeletAgentCAPath = "/var/run/host-kubelet-ca.crt" + KubeletCAVolumeName = "kubelet-ca" + APMHostPortName = "traceport" + // APMHostPortHostPort = 8126 // Not used + APMSocketVolumeName = "apmsocket" + APMSocketVolumeLocalPath = "/var/run/datadog" + APMSocketName = "apm.socket" + AdmissionControllerPortName = "admissioncontrollerport" + AdmissionControllerSocketCommunicationMode = "socket" + ExternalMetricsPortName = "metricsapi" + ExternalMetricsAPIServiceName = "v1beta1.external.metrics.k8s.io" + OTLPGRPCPortName = "otlpgrpcport" + OTLPHTTPPortName = "otlphttpport" + SeccompSecurityVolumeName = "datadog-agent-security" + SeccompSecurityVolumePath = "/etc/config" + SeccompRootVolumeName = "seccomp-root" + SeccompRootVolumePath = "/host/var/lib/kubelet/seccomp" + SeccompRootPath = "/var/lib/kubelet/seccomp" + SystemProbeSeccompKey = "system-probe-seccomp.json" + SystemProbeAgentSecurityConfigMapSuffixName = "system-probe-seccomp" + SystemProbeSeccompProfileName = "system-probe" AppArmorAnnotationKey = "container.apparmor.security.beta.kubernetes.io" diff --git a/api/datadoghq/v2alpha1/const.go b/api/datadoghq/v2alpha1/const.go index b6810b54e..7fe87e8f9 100644 --- a/api/datadoghq/v2alpha1/const.go +++ b/api/datadoghq/v2alpha1/const.go @@ -5,7 +5,7 @@ package v2alpha1 -// This file tracks constants closely related to the CRD, such as ConditionTypes +// This file tracks constants closely related to the DatadogAgent CRD const ( @@ -56,4 +56,65 @@ const ( DefaultApmPort = 8126 // DefaultApmPortName default apm port name DefaultApmPortName = "traceport" + + // DefaultAgentResourceSuffix use as suffix for agent resource naming + DefaultAgentResourceSuffix = "agent" + // DefaultClusterAgentResourceSuffix use as suffix for cluster-agent resource naming + DefaultClusterAgentResourceSuffix = "cluster-agent" + // DefaultClusterChecksRunnerResourceSuffix use as suffix for cluster-checks-runner resource naming + DefaultClusterChecksRunnerResourceSuffix = "cluster-checks-runner" + // DefaultMetricsServerResourceSuffix use as suffix for cluster-agent metrics-server resource naming + DefaultMetricsServerResourceSuffix = "cluster-agent-metrics-server" + // DefaultAPPKeyKey default app-key key (use in secret for instance). + DefaultAPPKeyKey = "app_key" + // DefaultAPIKeyKey default api-key key (use in secret for instance). + DefaultAPIKeyKey = "api_key" + // DefaultTokenKey default token key (use in secret for instance). + DefaultTokenKey = "token" + // DefaultClusterAgentReplicas default cluster-agent deployment replicas + DefaultClusterAgentReplicas = 1 + // DefaultClusterAgentServicePort default cluster-agent service port + DefaultClusterAgentServicePort = 5005 + // DefaultClusterChecksRunnerReplicas default cluster checks runner deployment replicas + DefaultClusterChecksRunnerReplicas = 1 + // DefaultAdmissionControllerServicePort default admission controller service port + DefaultAdmissionControllerServicePort = 443 + // DefaultAdmissionControllerTargetPort default admission controller pod port + DefaultAdmissionControllerTargetPort = 8000 + // DefaultAdmissionControllerWebhookName default admission controller webhook name + DefaultAdmissionControllerWebhookName string = "datadog-webhook" + // DefaultDogstatsdOriginDetection default Origin Detection + // DefaultDogstatsdOriginDetection = "false" // CELENE NOT USED! + // DefaultDogstatsdPort default dogstatsd port + DefaultDogstatsdPort = 8125 + // DefaultDogstatsdPortName default dogstatsd port name + DefaultDogstatsdPortName = "dogstatsdport" + // DefaultKubeStateMetricsCoreConf default ksm core ConfigMap name + DefaultKubeStateMetricsCoreConf string = "kube-state-metrics-core-config" + // DefaultOrchestratorExplorerConf default orchestrator explorer ConfigMap name + DefaultOrchestratorExplorerConf string = "orchestrator-explorer-config" + // DefaultKubeAPIServerConf default Kubernetes APIServer ConfigMap name + DefaultKubeAPIServerConf string = "kube-apiserver-config" + // DefaultSystemProbeSocketPath default System Probe socket path + DefaultSystemProbeSocketPath string = "/var/run/sysprobe/sysprobe.sock" + // DefaultCSPMConf default CSPM ConfigMap name + DefaultCSPMConf string = "cspm-config" + // DefaultCWSConf default CWS ConfigMap name + DefaultCWSConf string = "cws-config" + // DefaultHelmCheckConf default Helm Check ConfigMap name + DefaultHelmCheckConf string = "helm-check-config" + + // Default Image name + DefaultAgentImageName string = "agent" + DefaultClusterAgentImageName string = "cluster-agent" + DefaultImageRegistry string = "gcr.io/datadoghq" + DefaultAzureImageRegistry string = "datadoghq.azurecr.io" + DefaultEuropeImageRegistry string = "eu.gcr.io/datadoghq" + DefaultAsiaImageRegistry string = "asia.gcr.io/datadoghq" + DefaultGovImageRegistry string = "public.ecr.aws/datadog" + + KubeServicesAndEndpointsConfigProviders = "kube_services kube_endpoints" + KubeServicesAndEndpointsListeners = "kube_services kube_endpoints" + EndpointsChecksConfigProvider = "endpointschecks" + ClusterAndEndpointsConfigProviders = "clusterchecks endpointschecks" ) diff --git a/api/datadoghq/v2alpha1/datadogagent_default.go b/api/datadoghq/v2alpha1/datadogagent_default.go index 224890dde..c4f4bb59a 100644 --- a/api/datadoghq/v2alpha1/datadogagent_default.go +++ b/api/datadoghq/v2alpha1/datadogagent_default.go @@ -58,7 +58,6 @@ const ( defaultDogstatsdOriginDetectionEnabled bool = false defaultDogstatsdHostPortEnabled bool = false - defaultDogstatsdPort int32 = 8125 defaultDogstatsdSocketEnabled bool = true defaultDogstatsdHostSocketPath string = apicommon.DogstatsdAPMSocketHostPath + "/" + apicommon.DogstatsdSocketName @@ -139,15 +138,15 @@ func defaultGlobalConfig(ddaSpec *DatadogAgentSpec) { if ddaSpec.Global.Registry == nil { switch *ddaSpec.Global.Site { case defaultEuropeSite: - ddaSpec.Global.Registry = apiutils.NewStringPointer(apicommon.DefaultEuropeImageRegistry) + ddaSpec.Global.Registry = apiutils.NewStringPointer(DefaultEuropeImageRegistry) case defaultAsiaSite: - ddaSpec.Global.Registry = apiutils.NewStringPointer(apicommon.DefaultAsiaImageRegistry) + ddaSpec.Global.Registry = apiutils.NewStringPointer(DefaultAsiaImageRegistry) case defaultAzureSite: - ddaSpec.Global.Registry = apiutils.NewStringPointer(apicommon.DefaultAzureImageRegistry) + ddaSpec.Global.Registry = apiutils.NewStringPointer(DefaultAzureImageRegistry) case defaultGovSite: - ddaSpec.Global.Registry = apiutils.NewStringPointer(apicommon.DefaultGovImageRegistry) + ddaSpec.Global.Registry = apiutils.NewStringPointer(DefaultGovImageRegistry) default: - ddaSpec.Global.Registry = apiutils.NewStringPointer(apicommon.DefaultImageRegistry) + ddaSpec.Global.Registry = apiutils.NewStringPointer(DefaultImageRegistry) } } @@ -362,7 +361,7 @@ func defaultFeaturesConfig(ddaSpec *DatadogAgentSpec) { } if *ddaSpec.Features.Dogstatsd.HostPortConfig.Enabled { - apiutils.DefaultInt32IfUnset(&ddaSpec.Features.Dogstatsd.HostPortConfig.Port, defaultDogstatsdPort) + apiutils.DefaultInt32IfUnset(&ddaSpec.Features.Dogstatsd.HostPortConfig.Port, DefaultDogstatsdPort) } if ddaSpec.Features.Dogstatsd.UnixDomainSocketConfig == nil { diff --git a/api/datadoghq/v2alpha1/datadogagent_default_test.go b/api/datadoghq/v2alpha1/datadogagent_default_test.go index f1fe5f66e..0bd4e3bd6 100644 --- a/api/datadoghq/v2alpha1/datadogagent_default_test.go +++ b/api/datadoghq/v2alpha1/datadogagent_default_test.go @@ -8,7 +8,6 @@ package v2alpha1 import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/google/go-cmp/cmp" @@ -34,7 +33,7 @@ func Test_defaultGlobal(t *testing.T) { want: &DatadogAgentSpec{ Global: &GlobalConfig{ Site: apiutils.NewStringPointer(defaultSite), - Registry: apiutils.NewStringPointer(apicommon.DefaultImageRegistry), + Registry: apiutils.NewStringPointer(DefaultImageRegistry), LogLevel: apiutils.NewStringPointer(defaultLogLevel), }, }, @@ -49,7 +48,7 @@ func Test_defaultGlobal(t *testing.T) { want: &DatadogAgentSpec{ Global: &GlobalConfig{ Site: apiutils.NewStringPointer(defaultEuropeSite), - Registry: apiutils.NewStringPointer(apicommon.DefaultEuropeImageRegistry), + Registry: apiutils.NewStringPointer(DefaultEuropeImageRegistry), LogLevel: apiutils.NewStringPointer(defaultLogLevel), }, }, @@ -64,7 +63,7 @@ func Test_defaultGlobal(t *testing.T) { want: &DatadogAgentSpec{ Global: &GlobalConfig{ Site: apiutils.NewStringPointer(defaultAsiaSite), - Registry: apiutils.NewStringPointer(apicommon.DefaultAsiaImageRegistry), + Registry: apiutils.NewStringPointer(DefaultAsiaImageRegistry), LogLevel: apiutils.NewStringPointer(defaultLogLevel), }, }, @@ -79,7 +78,7 @@ func Test_defaultGlobal(t *testing.T) { want: &DatadogAgentSpec{ Global: &GlobalConfig{ Site: apiutils.NewStringPointer(defaultAzureSite), - Registry: apiutils.NewStringPointer(apicommon.DefaultAzureImageRegistry), + Registry: apiutils.NewStringPointer(DefaultAzureImageRegistry), LogLevel: apiutils.NewStringPointer(defaultLogLevel), }, }, @@ -94,7 +93,7 @@ func Test_defaultGlobal(t *testing.T) { want: &DatadogAgentSpec{ Global: &GlobalConfig{ Site: apiutils.NewStringPointer(defaultGovSite), - Registry: apiutils.NewStringPointer(apicommon.DefaultGovImageRegistry), + Registry: apiutils.NewStringPointer(DefaultGovImageRegistry), LogLevel: apiutils.NewStringPointer(defaultLogLevel), }, }, @@ -110,7 +109,7 @@ func Test_defaultGlobal(t *testing.T) { Enabled: apiutils.NewBoolPointer(defaultFIPSEnabled), }, Site: apiutils.NewStringPointer(defaultSite), - Registry: apiutils.NewStringPointer(apicommon.DefaultImageRegistry), + Registry: apiutils.NewStringPointer(DefaultImageRegistry), LogLevel: apiutils.NewStringPointer(defaultLogLevel), }, }, @@ -138,7 +137,7 @@ func Test_defaultGlobal(t *testing.T) { UseHTTPS: apiutils.NewBoolPointer(defaultFIPSUseHTTPS), }, Site: apiutils.NewStringPointer(defaultSite), - Registry: apiutils.NewStringPointer(apicommon.DefaultImageRegistry), + Registry: apiutils.NewStringPointer(DefaultImageRegistry), LogLevel: apiutils.NewStringPointer(defaultLogLevel), }, }, diff --git a/api/datadoghq/v2alpha1/secret.go b/api/datadoghq/v2alpha1/secret.go index 2ae07e9e1..dbf5d33bb 100644 --- a/api/datadoghq/v2alpha1/secret.go +++ b/api/datadoghq/v2alpha1/secret.go @@ -9,8 +9,6 @@ import ( "fmt" "os" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -30,7 +28,7 @@ func GetDefaultDCATokenSecretName(dda metav1.Object) string { func GetAPIKeySecret(credentials *DatadogCredentials, defaultName string) (bool, string, string) { isSet := false secretName := defaultName - secretKey := apicommon.DefaultAPIKeyKey + secretKey := DefaultAPIKeyKey if credentials.APISecret != nil { isSet = true @@ -51,7 +49,7 @@ func GetAPIKeySecret(credentials *DatadogCredentials, defaultName string) (bool, func GetAppKeySecret(credentials *DatadogCredentials, defaultName string) (bool, string, string) { isSet := false secretName := defaultName - secretKey := apicommon.DefaultAPPKeyKey + secretKey := DefaultAPPKeyKey if credentials.AppSecret != nil { isSet = true @@ -71,10 +69,10 @@ func GetKeysFromCredentials(credentials *DatadogCredentials) map[string][]byte { data := make(map[string][]byte) // Create secret using DatadogAgent credentials if it exists if credentials.APIKey != nil && *credentials.APIKey != "" { - data[apicommon.DefaultAPIKeyKey] = []byte(*credentials.APIKey) + data[DefaultAPIKeyKey] = []byte(*credentials.APIKey) } if credentials.AppKey != nil && *credentials.AppKey != "" { - data[apicommon.DefaultAPPKeyKey] = []byte(*credentials.AppKey) + data[DefaultAPPKeyKey] = []byte(*credentials.AppKey) } return data diff --git a/api/datadoghq/v2alpha1/utils.go b/api/datadoghq/v2alpha1/utils.go index 0bc95c561..951be9eaa 100644 --- a/api/datadoghq/v2alpha1/utils.go +++ b/api/datadoghq/v2alpha1/utils.go @@ -8,7 +8,6 @@ package v2alpha1 import ( "fmt" - "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/pkg/defaulting" apiutils "github.com/DataDog/datadog-operator/api/utils" @@ -29,7 +28,7 @@ func GetConfName(owner metav1.Object, conf *CustomConfig, defaultName string) st // GetClusterAgentServiceAccount return the cluster-agent serviceAccountName func GetClusterAgentServiceAccount(dda *DatadogAgent) string { - saDefault := fmt.Sprintf("%s-%s", dda.Name, common.DefaultClusterAgentResourceSuffix) + saDefault := fmt.Sprintf("%s-%s", dda.Name, DefaultClusterAgentResourceSuffix) if dda.Spec.Override[ClusterAgentComponentName] != nil && dda.Spec.Override[ClusterAgentComponentName].ServiceAccountName != nil { return *dda.Spec.Override[ClusterAgentComponentName].ServiceAccountName } @@ -38,7 +37,7 @@ func GetClusterAgentServiceAccount(dda *DatadogAgent) string { // GetAgentServiceAccount returns the agent service account name func GetAgentServiceAccount(dda *DatadogAgent) string { - saDefault := fmt.Sprintf("%s-%s", dda.Name, common.DefaultAgentResourceSuffix) + saDefault := fmt.Sprintf("%s-%s", dda.Name, DefaultAgentResourceSuffix) if dda.Spec.Override[NodeAgentComponentName] != nil && dda.Spec.Override[NodeAgentComponentName].ServiceAccountName != nil { return *dda.Spec.Override[NodeAgentComponentName].ServiceAccountName } @@ -47,7 +46,7 @@ func GetAgentServiceAccount(dda *DatadogAgent) string { // GetClusterChecksRunnerServiceAccount return the cluster-checks-runner service account name func GetClusterChecksRunnerServiceAccount(dda *DatadogAgent) string { - saDefault := fmt.Sprintf("%s-%s", dda.Name, common.DefaultClusterChecksRunnerResourceSuffix) + saDefault := fmt.Sprintf("%s-%s", dda.Name, DefaultClusterChecksRunnerResourceSuffix) if dda.Spec.Override[ClusterChecksRunnerComponentName] != nil && dda.Spec.Override[ClusterChecksRunnerComponentName].ServiceAccountName != nil { return *dda.Spec.Override[ClusterChecksRunnerComponentName].ServiceAccountName } @@ -79,7 +78,7 @@ func GetLocalAgentServiceName(dda *DatadogAgent) string { if dda.Spec.Global.LocalService != nil && dda.Spec.Global.LocalService.NameOverride != nil { return *dda.Spec.Global.LocalService.NameOverride } - return fmt.Sprintf("%s-%s", dda.Name, common.DefaultAgentResourceSuffix) + return fmt.Sprintf("%s-%s", dda.Name, DefaultAgentResourceSuffix) } // IsNetworkPolicyEnabled returns whether a network policy should be created and which flavor to use diff --git a/api/datadoghq/v2alpha1/utils_test.go b/api/datadoghq/v2alpha1/utils_test.go index be4951df8..2647ebb28 100644 --- a/api/datadoghq/v2alpha1/utils_test.go +++ b/api/datadoghq/v2alpha1/utils_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/assert" - "github.com/DataDog/datadog-operator/api/datadoghq/common" apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/pkg/defaulting" @@ -136,7 +135,7 @@ func TestServiceAccountOverride(t *testing.T) { }, want: map[ComponentName]string{ ClusterAgentComponentName: customServiceAccount, - NodeAgentComponentName: fmt.Sprintf("%s-%s", ddaName, common.DefaultAgentResourceSuffix), + NodeAgentComponentName: fmt.Sprintf("%s-%s", ddaName, DefaultAgentResourceSuffix), ClusterChecksRunnerComponentName: customServiceAccount, }, }, diff --git a/internal/controller/datadogagent/common/utils.go b/internal/controller/datadogagent/common/utils.go index 1b6f352bd..91f2b8877 100644 --- a/internal/controller/datadogagent/common/utils.go +++ b/internal/controller/datadogagent/common/utils.go @@ -120,7 +120,7 @@ const ( func GetAgentLocalServiceSelector(dda metav1.Object) map[string]string { return map[string]string{ kubernetes.AppKubernetesPartOfLabelKey: object.NewPartOfLabelValue(dda).String(), - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: v2alpha1.DefaultAgentResourceSuffix, } } diff --git a/internal/controller/datadogagent/component/agent/default.go b/internal/controller/datadogagent/component/agent/default.go index 7c7058dde..089c4b9fa 100644 --- a/internal/controller/datadogagent/component/agent/default.go +++ b/internal/controller/datadogagent/component/agent/default.go @@ -28,7 +28,7 @@ import ( // NewDefaultAgentDaemonset return a new default agent DaemonSet func NewDefaultAgentDaemonset(dda metav1.Object, edsOptions *ExtendedDaemonsetOptions, agentComponent feature.RequiredComponent) *appsv1.DaemonSet { - daemonset := NewDaemonset(dda, edsOptions, apicommon.DefaultAgentResourceSuffix, GetAgentName(dda), common.GetAgentVersion(dda), nil) + daemonset := NewDaemonset(dda, edsOptions, v2alpha1.DefaultAgentResourceSuffix, GetAgentName(dda), common.GetAgentVersion(dda), nil) podTemplate := NewDefaultAgentPodTemplateSpec(dda, agentComponent, daemonset.GetLabels()) daemonset.Spec.Template = *podTemplate return daemonset @@ -36,7 +36,7 @@ func NewDefaultAgentDaemonset(dda metav1.Object, edsOptions *ExtendedDaemonsetOp // NewDefaultAgentExtendedDaemonset return a new default agent DaemonSet func NewDefaultAgentExtendedDaemonset(dda metav1.Object, edsOptions *ExtendedDaemonsetOptions, agentComponent feature.RequiredComponent) *edsv1alpha1.ExtendedDaemonSet { - edsDaemonset := NewExtendedDaemonset(dda, edsOptions, apicommon.DefaultAgentResourceSuffix, GetAgentName(dda), common.GetAgentVersion(dda), nil) + edsDaemonset := NewExtendedDaemonset(dda, edsOptions, v2alpha1.DefaultAgentResourceSuffix, GetAgentName(dda), common.GetAgentVersion(dda), nil) edsDaemonset.Spec.Template = *NewDefaultAgentPodTemplateSpec(dda, agentComponent, edsDaemonset.GetLabels()) return edsDaemonset } @@ -88,20 +88,20 @@ func DefaultCapabilitiesForSystemProbe() []corev1.Capability { // GetAgentName return the Agent name based on the DatadogAgent info func GetAgentName(dda metav1.Object) string { - return fmt.Sprintf("%s-%s", dda.GetName(), apicommon.DefaultAgentResourceSuffix) + return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultAgentResourceSuffix) } // GetAgentRoleName returns the name of the role for the Agent func GetAgentRoleName(dda metav1.Object) string { - return fmt.Sprintf("%s-%s", dda.GetName(), apicommon.DefaultAgentResourceSuffix) + return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultAgentResourceSuffix) } func getDefaultServiceAccountName(dda metav1.Object) string { - return fmt.Sprintf("%s-%s", dda.GetName(), apicommon.DefaultAgentResourceSuffix) + return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultAgentResourceSuffix) } func agentImage() string { - return fmt.Sprintf("%s/%s:%s", apicommon.DefaultImageRegistry, apicommon.DefaultAgentImageName, defaulting.AgentLatestVersion) + return fmt.Sprintf("%s/%s:%s", v2alpha1.DefaultImageRegistry, v2alpha1.DefaultAgentImageName, defaulting.AgentLatestVersion) } func initContainers(dda metav1.Object, requiredContainers []apicommon.AgentContainerName) []corev1.Container { diff --git a/internal/controller/datadogagent/component/clusteragent/default.go b/internal/controller/datadogagent/component/clusteragent/default.go index c0d6ffa85..ceb573462 100644 --- a/internal/controller/datadogagent/component/clusteragent/default.go +++ b/internal/controller/datadogagent/component/clusteragent/default.go @@ -25,12 +25,12 @@ import ( // GetClusterAgentServiceName return the Cluster-Agent service name based on the DatadogAgent name func GetClusterAgentServiceName(dda metav1.Object) string { - return fmt.Sprintf("%s-%s", dda.GetName(), apicommon.DefaultClusterAgentResourceSuffix) + return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultClusterAgentResourceSuffix) } // GetClusterAgentName return the Cluster-Agent name based on the DatadogAgent name func GetClusterAgentName(dda metav1.Object) string { - return fmt.Sprintf("%s-%s", dda.GetName(), apicommon.DefaultClusterAgentResourceSuffix) + return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultClusterAgentResourceSuffix) } // GetClusterAgentVersion return the Cluster-Agent version based on the DatadogAgent info @@ -41,17 +41,17 @@ func GetClusterAgentVersion(dda metav1.Object) string { // GetClusterAgentRbacResourcesName return the Cluster-Agent RBAC resource name func GetClusterAgentRbacResourcesName(dda metav1.Object) string { - return fmt.Sprintf("%s-%s", dda.GetName(), apicommon.DefaultClusterAgentResourceSuffix) + return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultClusterAgentResourceSuffix) } // getDefaultServiceAccountName return the default Cluster-Agent ServiceAccountName func getDefaultServiceAccountName(dda metav1.Object) string { - return fmt.Sprintf("%s-%s", dda.GetName(), apicommon.DefaultClusterAgentResourceSuffix) + return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultClusterAgentResourceSuffix) } // NewDefaultClusterAgentDeployment return a new default cluster-agent deployment func NewDefaultClusterAgentDeployment(dda metav1.Object) *appsv1.Deployment { - deployment := common.NewDeployment(dda, apicommon.DefaultClusterAgentResourceSuffix, GetClusterAgentName(dda), GetClusterAgentVersion(dda), nil) + deployment := common.NewDeployment(dda, v2alpha1.DefaultClusterAgentResourceSuffix, GetClusterAgentName(dda), GetClusterAgentVersion(dda), nil) podTemplate := NewDefaultClusterAgentPodTemplateSpec(dda) for key, val := range deployment.GetLabels() { podTemplate.Labels[key] = val @@ -61,7 +61,7 @@ func NewDefaultClusterAgentDeployment(dda metav1.Object) *appsv1.Deployment { podTemplate.Annotations[key] = val } deployment.Spec.Template = *podTemplate - deployment.Spec.Replicas = apiutils.NewInt32Pointer(apicommon.DefaultClusterAgentReplicas) + deployment.Spec.Replicas = apiutils.NewInt32Pointer(v2alpha1.DefaultClusterAgentReplicas) return deployment } @@ -111,7 +111,7 @@ func defaultPodSpec(dda metav1.Object, volumes []corev1.Volume, volumeMounts []c Containers: []corev1.Container{ { Name: string(apicommon.ClusterAgentContainerName), - Image: fmt.Sprintf("%s/%s:%s", apicommon.DefaultImageRegistry, apicommon.DefaultClusterAgentImageName, defaulting.ClusterAgentLatestVersion), + Image: fmt.Sprintf("%s/%s:%s", v2alpha1.DefaultImageRegistry, v2alpha1.DefaultClusterAgentImageName, defaulting.ClusterAgentLatestVersion), Ports: []corev1.ContainerPort{ { ContainerPort: 5005, @@ -202,7 +202,7 @@ func DefaultAffinity() *corev1.Affinity { PodAffinityTerm: corev1.PodAffinityTerm{ LabelSelector: &metav1.LabelSelector{ MatchLabels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultClusterAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: v2alpha1.DefaultClusterAgentResourceSuffix, }, }, TopologyKey: "kubernetes.io/hostname", diff --git a/internal/controller/datadogagent/component/clusteragent/default_test.go b/internal/controller/datadogagent/component/clusteragent/default_test.go index 7387c23d0..5f7dabba1 100644 --- a/internal/controller/datadogagent/component/clusteragent/default_test.go +++ b/internal/controller/datadogagent/component/clusteragent/default_test.go @@ -5,7 +5,6 @@ import ( "strconv" "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" @@ -209,7 +208,7 @@ func clusterAgentDefaultEnvVars(dda *datadoghqv2alpha1.DatadogAgent) []corev1.En }, { Name: "DD_CLUSTER_AGENT_KUBERNETES_SERVICE_NAME", - Value: fmt.Sprintf("%s-%s", testDdaName, apicommon.DefaultClusterAgentResourceSuffix), + Value: fmt.Sprintf("%s-%s", testDdaName, datadoghqv2alpha1.DefaultClusterAgentResourceSuffix), }, { Name: "DD_LEADER_ELECTION", diff --git a/internal/controller/datadogagent/component/clusteragent/utils.go b/internal/controller/datadogagent/component/clusteragent/utils.go index 0e363bf5d..653ce2596 100644 --- a/internal/controller/datadogagent/component/clusteragent/utils.go +++ b/internal/controller/datadogagent/component/clusteragent/utils.go @@ -10,6 +10,7 @@ import ( "strings" apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" @@ -21,7 +22,7 @@ import ( // GetClusterAgentService returns the Cluster-Agent service func GetClusterAgentService(dda metav1.Object) *corev1.Service { - labels := object.GetDefaultLabels(dda, apicommon.DefaultClusterAgentResourceSuffix, GetClusterAgentVersion(dda)) + labels := object.GetDefaultLabels(dda, v2alpha1.DefaultClusterAgentResourceSuffix, GetClusterAgentVersion(dda)) annotations := object.GetDefaultAnnotations(dda) service := &corev1.Service{ @@ -35,13 +36,13 @@ func GetClusterAgentService(dda metav1.Object) *corev1.Service { Type: corev1.ServiceTypeClusterIP, Selector: map[string]string{ apicommon.AgentDeploymentNameLabelKey: dda.GetName(), - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultClusterAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: v2alpha1.DefaultClusterAgentResourceSuffix, }, Ports: []corev1.ServicePort{ { Protocol: corev1.ProtocolTCP, - TargetPort: intstr.FromInt(apicommon.DefaultClusterAgentServicePort), - Port: apicommon.DefaultClusterAgentServicePort, + TargetPort: intstr.FromInt(v2alpha1.DefaultClusterAgentServicePort), + Port: v2alpha1.DefaultClusterAgentServicePort, }, }, SessionAffinity: corev1.ServiceAffinityNone, @@ -54,7 +55,7 @@ func GetClusterAgentService(dda metav1.Object) *corev1.Service { // GetMetricsServerServiceName returns the external metrics provider service name func GetMetricsServerServiceName(dda metav1.Object) string { - return fmt.Sprintf("%s-%s", dda.GetName(), apicommon.DefaultMetricsServerResourceSuffix) + return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultMetricsServerResourceSuffix) } // GetMetricsServerAPIServiceName returns the external metrics provider apiservice name diff --git a/internal/controller/datadogagent/component/clusterchecksrunner/default.go b/internal/controller/datadogagent/component/clusterchecksrunner/default.go index bd9333706..9690ecef1 100644 --- a/internal/controller/datadogagent/component/clusterchecksrunner/default.go +++ b/internal/controller/datadogagent/component/clusterchecksrunner/default.go @@ -23,12 +23,12 @@ import ( // GetClusterChecksRunnerName return the Cluster-Checks-Runner name based on the DatadogAgent name func GetClusterChecksRunnerName(dda metav1.Object) string { - return fmt.Sprintf("%s-%s", dda.GetName(), apicommon.DefaultClusterChecksRunnerResourceSuffix) + return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultClusterChecksRunnerResourceSuffix) } // NewDefaultClusterChecksRunnerDeployment return a new default cluster-checks-runner deployment func NewDefaultClusterChecksRunnerDeployment(dda metav1.Object) *appsv1.Deployment { - deployment := common.NewDeployment(dda, apicommon.DefaultClusterChecksRunnerResourceSuffix, GetClusterChecksRunnerName(dda), common.GetAgentVersion(dda), nil) + deployment := common.NewDeployment(dda, v2alpha1.DefaultClusterChecksRunnerResourceSuffix, GetClusterChecksRunnerName(dda), common.GetAgentVersion(dda), nil) podTemplate := NewDefaultClusterChecksRunnerPodTemplateSpec(dda) for key, val := range deployment.GetLabels() { @@ -40,7 +40,7 @@ func NewDefaultClusterChecksRunnerDeployment(dda metav1.Object) *appsv1.Deployme } deployment.Spec.Template = *podTemplate - deployment.Spec.Replicas = apiutils.NewInt32Pointer(apicommon.DefaultClusterChecksRunnerReplicas) + deployment.Spec.Replicas = apiutils.NewInt32Pointer(v2alpha1.DefaultClusterChecksRunnerReplicas) return deployment } @@ -84,11 +84,11 @@ func NewDefaultClusterChecksRunnerPodTemplateSpec(dda metav1.Object) *corev1.Pod // getDefaultServiceAccountName return the default Cluster-Agent ServiceAccountName func getDefaultServiceAccountName(dda metav1.Object) string { - return fmt.Sprintf("%s-%s", dda.GetName(), apicommon.DefaultClusterChecksRunnerResourceSuffix) + return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultClusterChecksRunnerResourceSuffix) } func clusterChecksRunnerImage() string { - return fmt.Sprintf("%s/%s:%s", apicommon.DefaultImageRegistry, apicommon.DefaultAgentImageName, defaulting.AgentLatestVersion) + return fmt.Sprintf("%s/%s:%s", v2alpha1.DefaultImageRegistry, v2alpha1.DefaultAgentImageName, defaulting.AgentLatestVersion) } func defaultPodSpec(dda metav1.Object, volumes []corev1.Volume, volumeMounts []corev1.VolumeMount, envVars []corev1.EnvVar) corev1.PodSpec { @@ -221,7 +221,7 @@ func DefaultAffinity() *corev1.Affinity { PodAffinityTerm: corev1.PodAffinityTerm{ LabelSelector: &metav1.LabelSelector{ MatchLabels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultClusterChecksRunnerResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: v2alpha1.DefaultClusterChecksRunnerResourceSuffix, }, }, TopologyKey: "kubernetes.io/hostname", diff --git a/internal/controller/datadogagent/component/objects/network.go b/internal/controller/datadogagent/component/objects/network.go index f07d17c7e..bf6110665 100644 --- a/internal/controller/datadogagent/component/objects/network.go +++ b/internal/controller/datadogagent/component/objects/network.go @@ -14,7 +14,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" componentagent "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" @@ -137,13 +136,13 @@ func GetNetworkPolicyMetadata(dda metav1.Object, componentName v2alpha1.Componen switch componentName { case v2alpha1.NodeAgentComponentName: policyName = componentagent.GetAgentName(dda) - suffix = apicommon.DefaultAgentResourceSuffix + suffix = v2alpha1.DefaultAgentResourceSuffix case v2alpha1.ClusterAgentComponentName: policyName = componentdca.GetClusterAgentName(dda) - suffix = apicommon.DefaultClusterAgentResourceSuffix + suffix = v2alpha1.DefaultClusterAgentResourceSuffix case v2alpha1.ClusterChecksRunnerComponentName: policyName = componentccr.GetClusterChecksRunnerName(dda) - suffix = apicommon.DefaultClusterChecksRunnerResourceSuffix + suffix = v2alpha1.DefaultClusterChecksRunnerResourceSuffix } podSelector = metav1.LabelSelector{ MatchLabels: map[string]string{ @@ -169,7 +168,7 @@ func dcaServicePort() netv1.NetworkPolicyPort { return netv1.NetworkPolicyPort{ Port: &intstr.IntOrString{ Type: intstr.Int, - IntVal: apicommon.DefaultClusterAgentServicePort, + IntVal: v2alpha1.DefaultClusterAgentServicePort, }, } } @@ -405,7 +404,7 @@ func ingressDogstatsd(podSelector metav1.LabelSelector) cilium.NetworkPolicySpec { Ports: []cilium.PortProtocol{ { - Port: strconv.Itoa(apicommon.DefaultDogstatsdPort), + Port: strconv.Itoa(v2alpha1.DefaultDogstatsdPort), Protocol: cilium.ProtocolUDP, }, }, @@ -556,7 +555,7 @@ func egressCCRToDCA(podSelector metav1.LabelSelector, dda metav1.Object) cilium. ToEndpoints: []metav1.LabelSelector{ { MatchLabels: map[string]string{ - kubernetes.AppKubernetesInstanceLabelKey: apicommon.DefaultClusterAgentResourceSuffix, + kubernetes.AppKubernetesInstanceLabelKey: v2alpha1.DefaultClusterAgentResourceSuffix, kubernetes.AppKubernetesPartOfLabelKey: fmt.Sprintf("%s-%s", dda.GetNamespace(), dda.GetName()), }, }, diff --git a/internal/controller/datadogagent/controller_reconcile_agent.go b/internal/controller/datadogagent/controller_reconcile_agent.go index a9a10bea3..26b856673 100644 --- a/internal/controller/datadogagent/controller_reconcile_agent.go +++ b/internal/controller/datadogagent/controller_reconcile_agent.go @@ -347,7 +347,7 @@ func (r *Reconciler) cleanupPodsForProfilesThatNoLongerApply(ctx context.Context ctx, agentPods, client.MatchingLabels(map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, }), client.InNamespace(ddaNamespace), ) @@ -394,7 +394,7 @@ func (r *Reconciler) cleanupPodsForProfilesThatNoLongerApply(ctx context.Context func (r *Reconciler) cleanupExtraneousDaemonSets(ctx context.Context, logger logr.Logger, dda *datadoghqv2alpha1.DatadogAgent, newStatus *datadoghqv2alpha1.DatadogAgentStatus, providerList map[string]struct{}, profiles []v1alpha1.DatadogAgentProfile) error { matchLabels := client.MatchingLabels{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", } diff --git a/internal/controller/datadogagent/controller_reconcile_agent_test.go b/internal/controller/datadogagent/controller_reconcile_agent_test.go index 489d66360..08cd603d7 100644 --- a/internal/controller/datadogagent/controller_reconcile_agent_test.go +++ b/internal/controller/datadogagent/controller_reconcile_agent_test.go @@ -268,7 +268,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "dda-foo-agent", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -290,7 +290,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "dda-foo-agent", ResourceVersion: "999", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -312,7 +312,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "dda-foo-agent", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -340,7 +340,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "dda-foo-agent", ResourceVersion: "999", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -358,7 +358,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -390,7 +390,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, ResourceVersion: "999", @@ -415,7 +415,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -453,7 +453,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, ResourceVersion: "999", @@ -471,7 +471,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }}, }, @@ -480,7 +480,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent-with-profile-ns-1-profile-1", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -491,7 +491,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -523,7 +523,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, ResourceVersion: "999", @@ -547,7 +547,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -557,7 +557,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent-with-profile-ns-1-profile-1", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -568,7 +568,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -579,7 +579,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -590,7 +590,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -622,7 +622,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, ResourceVersion: "999", @@ -642,7 +642,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, ResourceVersion: "999", @@ -660,7 +660,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }}, }, @@ -670,7 +670,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }}, }, @@ -679,7 +679,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent-with-profile-ns-1-profile-1", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -690,7 +690,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -722,7 +722,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, ResourceVersion: "999", @@ -746,7 +746,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -756,7 +756,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent-with-profile-ns-1-profile-1", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -767,7 +767,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -778,7 +778,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -789,7 +789,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -828,7 +828,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, ResourceVersion: "999", @@ -846,7 +846,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "dda-foo-agent", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }}, }, @@ -855,7 +855,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent-with-profile-ns-1-profile-1", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -866,7 +866,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -903,7 +903,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent-with-profile-ns-1-profile-1", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, ResourceVersion: "999", @@ -914,7 +914,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "dda-foo-agent", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, ResourceVersion: "999", @@ -938,7 +938,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "dda-foo-agent", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -948,7 +948,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent-with-profile-ns-1-profile-1", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -959,7 +959,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -970,7 +970,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -981,7 +981,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -991,7 +991,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent-with-profile-ns-1-profile-1", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, }, @@ -1028,7 +1028,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent-with-profile-ns-1-profile-1", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, ResourceVersion: "999", @@ -1047,7 +1047,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "dda-foo-agent", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, kubernetes.AppKubernetesManageByLabelKey: "datadog-operator", }, ResourceVersion: "999", @@ -1184,7 +1184,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, }, }, }, @@ -1203,7 +1203,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent-with-profile-ns-1-profile-1", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, }, }, }, @@ -1239,7 +1239,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Name: "datadog-agent-with-profile-ns-1-profile-1", Namespace: "ns-1", Labels: map[string]string{ - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, }, ResourceVersion: "999", }, @@ -1297,7 +1297,7 @@ func Test_cleanupExtraneousDaemonSets(t *testing.T) { Namespace: "ns-1", Labels: map[string]string{ apicommon.MD5AgentDeploymentProviderLabelKey: gkeCosProvider, - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, }, ResourceVersion: "999", }, diff --git a/internal/controller/datadogagent/controller_reconcile_v2.go b/internal/controller/datadogagent/controller_reconcile_v2.go index c7b29b792..862c2027f 100644 --- a/internal/controller/datadogagent/controller_reconcile_v2.go +++ b/internal/controller/datadogagent/controller_reconcile_v2.go @@ -10,7 +10,6 @@ import ( "fmt" "time" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" @@ -311,7 +310,7 @@ func ensureAutoGeneratedTokenInStatus(instance *datadoghqv2alpha1.DatadogAgent, return } - generatedToken := tokenSecret.(*corev1.Secret).Data[apicommon.DefaultTokenKey] + generatedToken := tokenSecret.(*corev1.Secret).Data[datadoghqv2alpha1.DefaultTokenKey] if newStatus == nil { newStatus = &datadoghqv2alpha1.DatadogAgentStatus{} } diff --git a/internal/controller/datadogagent/feature/admissioncontroller/feature.go b/internal/controller/datadogagent/feature/admissioncontroller/feature.go index 3eefc5bf7..936b408f4 100644 --- a/internal/controller/datadogagent/feature/admissioncontroller/feature.go +++ b/internal/controller/datadogagent/feature/admissioncontroller/feature.go @@ -108,7 +108,7 @@ func (f *admissionControllerFeature) Configure(dda *v2alpha1.DatadogAgent) (reqC f.failurePolicy = *ac.FailurePolicy } - f.webhookName = apicommon.DefaultAdmissionControllerWebhookName + f.webhookName = v2alpha1.DefaultAdmissionControllerWebhookName if ac.WebhookName != nil { f.webhookName = *ac.WebhookName } @@ -141,7 +141,7 @@ func (f *admissionControllerFeature) Configure(dda *v2alpha1.DatadogAgent) (reqC // set agent image from admissionController config or nodeAgent override image name. else, It will follow agent image name. // default is "agent" - f.agentSidecarConfig.imageName = apicommon.DefaultAgentImageName + f.agentSidecarConfig.imageName = v2alpha1.DefaultAgentImageName f.agentSidecarConfig.imageTag = defaulting.AgentLatestVersion componentOverride, ok := dda.Spec.Override[v2alpha1.NodeAgentComponentName] @@ -206,14 +206,14 @@ func (f *admissionControllerFeature) ManageDependencies(managers feature.Resourc // service selector := map[string]string{ apicommon.AgentDeploymentNameLabelKey: f.owner.GetName(), - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultClusterAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: v2alpha1.DefaultClusterAgentResourceSuffix, } port := []corev1.ServicePort{ { Name: apicommon.AdmissionControllerPortName, Protocol: corev1.ProtocolTCP, - TargetPort: intstr.FromInt(apicommon.DefaultAdmissionControllerTargetPort), - Port: apicommon.DefaultAdmissionControllerServicePort, + TargetPort: intstr.FromInt(v2alpha1.DefaultAdmissionControllerTargetPort), + Port: v2alpha1.DefaultAdmissionControllerServicePort, }, } if err := managers.ServiceManager().AddService(f.serviceName, ns, selector, port, nil); err != nil { diff --git a/internal/controller/datadogagent/feature/clusterchecks/feature.go b/internal/controller/datadogagent/feature/clusterchecks/feature.go index d57aa0a44..168c56ebd 100644 --- a/internal/controller/datadogagent/feature/clusterchecks/feature.go +++ b/internal/controller/datadogagent/feature/clusterchecks/feature.go @@ -89,7 +89,7 @@ func (f *clusterChecksFeature) ManageDependencies(managers feature.ResourceManag { Port: &intstr.IntOrString{ Type: intstr.Int, - IntVal: apicommon.DefaultClusterAgentServicePort, + IntVal: v2alpha1.DefaultClusterAgentServicePort, }, }, }, @@ -149,7 +149,7 @@ func (f *clusterChecksFeature) ManageClusterAgent(managers feature.PodTemplateMa apicommon.ClusterAgentContainerName, &corev1.EnvVar{ Name: apicommon.DDExtraConfigProviders, - Value: apicommon.KubeServicesAndEndpointsConfigProviders, + Value: v2alpha1.KubeServicesAndEndpointsConfigProviders, }, ) @@ -157,7 +157,7 @@ func (f *clusterChecksFeature) ManageClusterAgent(managers feature.PodTemplateMa apicommon.ClusterAgentContainerName, &corev1.EnvVar{ Name: apicommon.DDExtraListeners, - Value: apicommon.KubeServicesAndEndpointsListeners, + Value: v2alpha1.KubeServicesAndEndpointsListeners, }, ) @@ -187,7 +187,7 @@ func (f *clusterChecksFeature) manageNodeAgent(agentContainerName apicommon.Agen agentContainerName, &corev1.EnvVar{ Name: apicommon.DDExtraConfigProviders, - Value: apicommon.EndpointsChecksConfigProvider, + Value: v2alpha1.EndpointsChecksConfigProvider, }, ) } else { @@ -195,7 +195,7 @@ func (f *clusterChecksFeature) manageNodeAgent(agentContainerName apicommon.Agen agentContainerName, &corev1.EnvVar{ Name: apicommon.DDExtraConfigProviders, - Value: apicommon.ClusterAndEndpointsConfigProviders, + Value: v2alpha1.ClusterAndEndpointsConfigProviders, }, ) } diff --git a/internal/controller/datadogagent/feature/clusterchecks/feature_test.go b/internal/controller/datadogagent/feature/clusterchecks/feature_test.go index 66fbb9d93..2a87930b6 100644 --- a/internal/controller/datadogagent/feature/clusterchecks/feature_test.go +++ b/internal/controller/datadogagent/feature/clusterchecks/feature_test.go @@ -171,11 +171,11 @@ func wantClusterAgentHasExpectedEnvs(t testing.TB, mgrInterface feature.PodTempl }, { Name: apicommon.DDExtraConfigProviders, - Value: apicommon.KubeServicesAndEndpointsConfigProviders, + Value: v2alpha1.KubeServicesAndEndpointsConfigProviders, }, { Name: apicommon.DDExtraListeners, - Value: apicommon.KubeServicesAndEndpointsListeners, + Value: v2alpha1.KubeServicesAndEndpointsListeners, }, } @@ -228,7 +228,7 @@ func testAgentHasExpectedEnvsWithRunners(agentContainerName apicommon.AgentConta expectedAgentEnvs := []*corev1.EnvVar{ { Name: apicommon.DDExtraConfigProviders, - Value: apicommon.EndpointsChecksConfigProvider, + Value: v2alpha1.EndpointsChecksConfigProvider, }, } @@ -250,7 +250,7 @@ func testAgentHasExpectedEnvsWithNoRunners(agentContainerName apicommon.AgentCon expectedAgentEnvs := []*corev1.EnvVar{ { Name: apicommon.DDExtraConfigProviders, - Value: apicommon.ClusterAndEndpointsConfigProviders, + Value: v2alpha1.ClusterAndEndpointsConfigProviders, }, } diff --git a/internal/controller/datadogagent/feature/cspm/feature.go b/internal/controller/datadogagent/feature/cspm/feature.go index 266a7e9da..2e23d929f 100644 --- a/internal/controller/datadogagent/feature/cspm/feature.go +++ b/internal/controller/datadogagent/feature/cspm/feature.go @@ -89,7 +89,7 @@ func (f *cspmFeature) Configure(dda *v2alpha1.DatadogAgent) (reqComp feature.Req f.customConfigAnnotationValue = hash f.customConfigAnnotationKey = object.GetChecksumAnnotationKey(feature.CSPMIDType) } - f.configMapName = v2alpha1.GetConfName(dda, f.customConfig, apicommon.DefaultCSPMConf) + f.configMapName = v2alpha1.GetConfName(dda, f.customConfig, v2alpha1.DefaultCSPMConf) // TODO add settings to configure f.createPSP diff --git a/internal/controller/datadogagent/feature/cws/feature.go b/internal/controller/datadogagent/feature/cws/feature.go index fc38c9ff1..71b92b883 100644 --- a/internal/controller/datadogagent/feature/cws/feature.go +++ b/internal/controller/datadogagent/feature/cws/feature.go @@ -85,7 +85,7 @@ func (f *cwsFeature) Configure(dda *v2alpha1.DatadogAgent) (reqComp feature.Requ f.customConfigAnnotationValue = hash f.customConfigAnnotationKey = object.GetChecksumAnnotationKey(feature.CWSIDType) } - f.configMapName = v2alpha1.GetConfName(dda, f.customConfig, apicommon.DefaultCWSConf) + f.configMapName = v2alpha1.GetConfName(dda, f.customConfig, v2alpha1.DefaultCWSConf) if cwsConfig.Network != nil { f.networkEnabled = apiutils.BoolValue(cwsConfig.Network.Enabled) diff --git a/internal/controller/datadogagent/feature/dogstatsd/feature.go b/internal/controller/datadogagent/feature/dogstatsd/feature.go index 976667919..ce014755c 100644 --- a/internal/controller/datadogagent/feature/dogstatsd/feature.go +++ b/internal/controller/datadogagent/feature/dogstatsd/feature.go @@ -105,9 +105,9 @@ func (f *dogstatsdFeature) ManageDependencies(managers feature.ResourceManagers, if common.ShouldCreateAgentLocalService(managers.Store().GetVersionInfo(), f.forceEnableLocalService) { dsdPort := &corev1.ServicePort{ Protocol: corev1.ProtocolUDP, - TargetPort: intstr.FromInt(int(apicommon.DefaultDogstatsdPort)), - Port: apicommon.DefaultDogstatsdPort, - Name: apicommon.DefaultDogstatsdPortName, + TargetPort: intstr.FromInt(int(v2alpha1.DefaultDogstatsdPort)), + Port: v2alpha1.DefaultDogstatsdPort, + Name: v2alpha1.DefaultDogstatsdPortName, } if f.hostPortEnabled { dsdPort.Port = f.hostPortHostPort @@ -149,14 +149,14 @@ func (f *dogstatsdFeature) ManageNodeAgent(managers feature.PodTemplateManagers, func (f *dogstatsdFeature) manageNodeAgent(agentContainerName apicommon.AgentContainerName, managers feature.PodTemplateManagers, provider string) error { // udp dogstatsdPort := &corev1.ContainerPort{ - Name: apicommon.DefaultDogstatsdPortName, - ContainerPort: apicommon.DefaultDogstatsdPort, + Name: v2alpha1.DefaultDogstatsdPortName, + ContainerPort: v2alpha1.DefaultDogstatsdPort, Protocol: corev1.ProtocolUDP, } if f.hostPortEnabled { // f.hostPortHostPort will be 0 if HostPort is not set in v1alpha1 // f.hostPortHostPort will default to 8125 in v2alpha1 - dsdPortEnvVarValue := apicommon.DefaultDogstatsdPort + dsdPortEnvVarValue := v2alpha1.DefaultDogstatsdPort if f.hostPortHostPort != 0 { dogstatsdPort.HostPort = f.hostPortHostPort // if using host network, host port should be set and needs to match container port diff --git a/internal/controller/datadogagent/feature/dogstatsd/feature_test.go b/internal/controller/datadogagent/feature/dogstatsd/feature_test.go index 7c176d067..8bbc3d052 100644 --- a/internal/controller/datadogagent/feature/dogstatsd/feature_test.go +++ b/internal/controller/datadogagent/feature/dogstatsd/feature_test.go @@ -182,7 +182,7 @@ func Test_DogstatsdFeature_Configure(t *testing.T) { { Name: apicommon.DogstatsdHostPortName, HostPort: 8125, - ContainerPort: apicommon.DefaultDogstatsdPort, + ContainerPort: v2alpha1.DefaultDogstatsdPort, Protocol: corev1.ProtocolUDP, }, } @@ -367,7 +367,7 @@ func getWantUDPEnvVars() []*corev1.EnvVar { wantUDPEnvVars := []*corev1.EnvVar{ { Name: apicommon.DDDogstatsdPort, - Value: strconv.Itoa(apicommon.DefaultDogstatsdPort), + Value: strconv.Itoa(v2alpha1.DefaultDogstatsdPort), }, { Name: apicommon.DDDogstatsdNonLocalTraffic, diff --git a/internal/controller/datadogagent/feature/ebpfcheck/feature.go b/internal/controller/datadogagent/feature/ebpfcheck/feature.go index 5373a49a9..89d46893c 100644 --- a/internal/controller/datadogagent/feature/ebpfcheck/feature.go +++ b/internal/controller/datadogagent/feature/ebpfcheck/feature.go @@ -85,7 +85,7 @@ func (f *ebpfCheckFeature) ManageNodeAgent(managers feature.PodTemplateManagers, socketEnvVar := &corev1.EnvVar{ Name: apicommon.DDSystemProbeSocket, - Value: apicommon.DefaultSystemProbeSocketPath, + Value: v2alpha1.DefaultSystemProbeSocketPath, } managers.EnvVar().AddEnvVarToContainer(apicommon.CoreAgentContainerName, socketEnvVar) diff --git a/internal/controller/datadogagent/feature/ebpfcheck/feature_test.go b/internal/controller/datadogagent/feature/ebpfcheck/feature_test.go index cba86aa60..c91543cf5 100644 --- a/internal/controller/datadogagent/feature/ebpfcheck/feature_test.go +++ b/internal/controller/datadogagent/feature/ebpfcheck/feature_test.go @@ -100,7 +100,7 @@ func Test_ebpfCheckFeature_Configure(t *testing.T) { }, { Name: apicommon.DDSystemProbeSocket, - Value: apicommon.DefaultSystemProbeSocketPath, + Value: v2alpha1.DefaultSystemProbeSocketPath, }, } agentEnvVars := mgr.EnvVarMgr.EnvVarsByC[apicommon.CoreAgentContainerName] diff --git a/internal/controller/datadogagent/feature/enabledefault/feature.go b/internal/controller/datadogagent/feature/enabledefault/feature.go index b2c1f54fa..6f620213f 100644 --- a/internal/controller/datadogagent/feature/enabledefault/feature.go +++ b/internal/controller/datadogagent/feature/enabledefault/feature.go @@ -133,18 +133,18 @@ func (f *defaultFeature) Configure(dda *v2alpha1.DatadogAgent) feature.RequiredC } if creds.APIKey != nil { - f.credentialsInfo.secretCreation.data[apicommon.DefaultAPIKeyKey] = *creds.APIKey + f.credentialsInfo.secretCreation.data[v2alpha1.DefaultAPIKeyKey] = *creds.APIKey f.credentialsInfo.apiKey.SecretName = f.credentialsInfo.secretCreation.name - f.credentialsInfo.apiKey.SecretKey = apicommon.DefaultAPIKeyKey + f.credentialsInfo.apiKey.SecretKey = v2alpha1.DefaultAPIKeyKey } else if creds.APISecret != nil { f.credentialsInfo.apiKey.SecretName = creds.APISecret.SecretName f.credentialsInfo.apiKey.SecretKey = creds.APISecret.KeyName } if creds.AppKey != nil { - f.credentialsInfo.secretCreation.data[apicommon.DefaultAPPKeyKey] = *creds.AppKey + f.credentialsInfo.secretCreation.data[v2alpha1.DefaultAPPKeyKey] = *creds.AppKey f.credentialsInfo.appKey.SecretName = f.credentialsInfo.secretCreation.name - f.credentialsInfo.appKey.SecretKey = apicommon.DefaultAPPKeyKey + f.credentialsInfo.appKey.SecretKey = v2alpha1.DefaultAPPKeyKey } else if creds.AppSecret != nil { f.credentialsInfo.appKey.SecretName = creds.AppSecret.SecretName f.credentialsInfo.appKey.SecretKey = creds.AppSecret.KeyName @@ -153,12 +153,12 @@ func (f *defaultFeature) Configure(dda *v2alpha1.DatadogAgent) feature.RequiredC // DCA Token management f.dcaTokenInfo.token.SecretName = v2alpha1.GetDefaultDCATokenSecretName(dda) - f.dcaTokenInfo.token.SecretKey = apicommon.DefaultTokenKey + f.dcaTokenInfo.token.SecretKey = v2alpha1.DefaultTokenKey if dda.Spec.Global.ClusterAgentToken != nil { // User specifies token f.dcaTokenInfo.secretCreation.createSecret = true f.dcaTokenInfo.secretCreation.name = f.dcaTokenInfo.token.SecretName - f.dcaTokenInfo.secretCreation.data[apicommon.DefaultTokenKey] = *dda.Spec.Global.ClusterAgentToken + f.dcaTokenInfo.secretCreation.data[v2alpha1.DefaultTokenKey] = *dda.Spec.Global.ClusterAgentToken } else if dda.Spec.Global.ClusterAgentTokenSecret != nil { // User specifies token secret f.dcaTokenInfo.token.SecretName = dda.Spec.Global.ClusterAgentTokenSecret.SecretName @@ -168,9 +168,9 @@ func (f *defaultFeature) Configure(dda *v2alpha1.DatadogAgent) feature.RequiredC f.dcaTokenInfo.secretCreation.createSecret = true f.dcaTokenInfo.secretCreation.name = f.dcaTokenInfo.token.SecretName if dda.Status.ClusterAgent == nil || dda.Status.ClusterAgent.GeneratedToken == "" { - f.dcaTokenInfo.secretCreation.data[apicommon.DefaultTokenKey] = apiutils.GenerateRandomString(32) + f.dcaTokenInfo.secretCreation.data[v2alpha1.DefaultTokenKey] = apiutils.GenerateRandomString(32) } else { - f.dcaTokenInfo.secretCreation.data[apicommon.DefaultTokenKey] = dda.Status.ClusterAgent.GeneratedToken + f.dcaTokenInfo.secretCreation.data[v2alpha1.DefaultTokenKey] = dda.Status.ClusterAgent.GeneratedToken } } hash, err := comparison.GenerateMD5ForSpec(f.dcaTokenInfo.secretCreation.data) diff --git a/internal/controller/datadogagent/feature/enabledefault/rbac.go b/internal/controller/datadogagent/feature/enabledefault/rbac.go index 64fe295b6..1f9e6f432 100644 --- a/internal/controller/datadogagent/feature/enabledefault/rbac.go +++ b/internal/controller/datadogagent/feature/enabledefault/rbac.go @@ -8,7 +8,7 @@ package enabledefault import ( "fmt" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/pkg/controller/utils" "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" @@ -177,7 +177,7 @@ func getLeaderElectionPolicyRuleDCA(dda metav1.Object) []rbacv1.PolicyRule { // getCCRRbacResourcesName returns the Cluster Checks Runner RBAC resource name func getCCRRbacResourcesName(dda metav1.Object) string { - return fmt.Sprintf("%s-%s", dda.GetName(), apicommon.DefaultClusterChecksRunnerResourceSuffix) + return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultClusterChecksRunnerResourceSuffix) } // getDefaultClusterChecksRunnerClusterRolePolicyRules returns the default Cluster Role Policy Rules for the Cluster Checks Runner diff --git a/internal/controller/datadogagent/feature/eventcollection/feature.go b/internal/controller/datadogagent/feature/eventcollection/feature.go index f7fdb2548..562a1c7c5 100644 --- a/internal/controller/datadogagent/feature/eventcollection/feature.go +++ b/internal/controller/datadogagent/feature/eventcollection/feature.go @@ -74,7 +74,7 @@ func (f *eventCollectionFeature) Configure(dda *v2alpha1.DatadogAgent) (reqComp if apiutils.BoolValue(dda.Spec.Features.EventCollection.UnbundleEvents) { if len(dda.Spec.Features.EventCollection.CollectedEventTypes) > 0 { - f.configMapName = v2alpha1.GetConfName(dda, nil, apicommon.DefaultKubeAPIServerConf) + f.configMapName = v2alpha1.GetConfName(dda, nil, v2alpha1.DefaultKubeAPIServerConf) f.unbundleEvents = *dda.Spec.Features.EventCollection.UnbundleEvents f.unbundleEventTypes = dda.Spec.Features.EventCollection.CollectedEventTypes } else { diff --git a/internal/controller/datadogagent/feature/externalmetrics/feature.go b/internal/controller/datadogagent/feature/externalmetrics/feature.go index e838723f8..5488f06bf 100644 --- a/internal/controller/datadogagent/feature/externalmetrics/feature.go +++ b/internal/controller/datadogagent/feature/externalmetrics/feature.go @@ -103,7 +103,7 @@ func (f *externalMetricsFeature) Configure(dda *v2alpha1.DatadogAgent) (reqComp _, secretName, secretKey := v2alpha1.GetAPIKeySecret(creds, componentdca.GetDefaultExternalMetricSecretName(f.owner)) if secretName != "" && secretKey != "" { // api key secret exists; store secret name and key instead - f.keySecret[apicommon.DefaultAPIKeyKey] = secret{ + f.keySecret[v2alpha1.DefaultAPIKeyKey] = secret{ name: secretName, key: secretKey, } @@ -113,7 +113,7 @@ func (f *externalMetricsFeature) Configure(dda *v2alpha1.DatadogAgent) (reqComp _, secretName, secretKey := v2alpha1.GetAppKeySecret(creds, componentdca.GetDefaultExternalMetricSecretName(f.owner)) if secretName != "" && secretKey != "" { // app key secret exists; store secret name and key instead - f.keySecret[apicommon.DefaultAPPKeyKey] = secret{ + f.keySecret[v2alpha1.DefaultAPPKeyKey] = secret{ name: secretName, key: secretKey, } @@ -154,7 +154,7 @@ func (f *externalMetricsFeature) ManageDependencies(managers feature.ResourceMan } selector := map[string]string{ apicommon.AgentDeploymentNameLabelKey: f.owner.GetName(), - apicommon.AgentDeploymentComponentLabelKey: apicommon.DefaultClusterAgentResourceSuffix, + apicommon.AgentDeploymentComponentLabelKey: v2alpha1.DefaultClusterAgentResourceSuffix, } serviceName := componentdca.GetMetricsServerServiceName(f.owner) if err := managers.ServiceManager().AddService(serviceName, ns, selector, emPorts, nil); err != nil { @@ -285,7 +285,7 @@ func (f *externalMetricsFeature) ManageClusterAgent(managers feature.PodTemplate if len(f.keySecret) != 0 { // api key - if s, ok := f.keySecret[apicommon.DefaultAPIKeyKey]; ok { + if s, ok := f.keySecret[v2alpha1.DefaultAPIKeyKey]; ok { var apiKeyEnvVar *corev1.EnvVar // api key from existing secret if s.name != "" { @@ -297,13 +297,13 @@ func (f *externalMetricsFeature) ManageClusterAgent(managers feature.PodTemplate // api key from secret created by operator apiKeyEnvVar = common.BuildEnvVarFromSource( apicommon.DDExternalMetricsProviderAPIKey, - common.BuildEnvVarFromSecret(componentdca.GetDefaultExternalMetricSecretName(f.owner), apicommon.DefaultAPIKeyKey), + common.BuildEnvVarFromSecret(componentdca.GetDefaultExternalMetricSecretName(f.owner), v2alpha1.DefaultAPIKeyKey), ) } managers.EnvVar().AddEnvVarToContainer(apicommon.ClusterAgentContainerName, apiKeyEnvVar) } // app key - if s, ok := f.keySecret[apicommon.DefaultAPPKeyKey]; ok { + if s, ok := f.keySecret[v2alpha1.DefaultAPPKeyKey]; ok { var appKeyEnvVar *corev1.EnvVar // app key from existing secret if s.name != "" { @@ -315,7 +315,7 @@ func (f *externalMetricsFeature) ManageClusterAgent(managers feature.PodTemplate // api key from secret created by operator appKeyEnvVar = common.BuildEnvVarFromSource( apicommon.DDExternalMetricsProviderAppKey, - common.BuildEnvVarFromSecret(componentdca.GetDefaultExternalMetricSecretName(f.owner), apicommon.DefaultAPPKeyKey), + common.BuildEnvVarFromSecret(componentdca.GetDefaultExternalMetricSecretName(f.owner), v2alpha1.DefaultAPPKeyKey), ) } managers.EnvVar().AddEnvVarToContainer(apicommon.ClusterAgentContainerName, appKeyEnvVar) diff --git a/internal/controller/datadogagent/feature/externalmetrics/feature_test.go b/internal/controller/datadogagent/feature/externalmetrics/feature_test.go index df9f35147..97ed4c4ab 100644 --- a/internal/controller/datadogagent/feature/externalmetrics/feature_test.go +++ b/internal/controller/datadogagent/feature/externalmetrics/feature_test.go @@ -166,7 +166,7 @@ func testDCAResources(useDDM, wpaController, keySecrets bool) *test.ComponentTes LocalObjectReference: corev1.LocalObjectReference{ Name: "-metrics-server", // from default secret name }, - Key: apicommon.DefaultAPPKeyKey, + Key: v2alpha1.DefaultAPPKeyKey, }, }, }, diff --git a/internal/controller/datadogagent/feature/helmcheck/configmap_test.go b/internal/controller/datadogagent/feature/helmcheck/configmap_test.go index 114b562ae..1073f4f4e 100644 --- a/internal/controller/datadogagent/feature/helmcheck/configmap_test.go +++ b/internal/controller/datadogagent/feature/helmcheck/configmap_test.go @@ -11,7 +11,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/equality" ) @@ -43,11 +43,11 @@ func Test_buildHelmCheckConfigMap(t *testing.T) { fields: fields{ owner: owner, enable: true, - configMapName: apicommon.DefaultHelmCheckConf, + configMapName: v2alpha1.DefaultHelmCheckConf, }, want: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Name: apicommon.DefaultHelmCheckConf, + Name: v2alpha1.DefaultHelmCheckConf, Namespace: owner.GetNamespace(), }, Data: map[string]string{ @@ -66,11 +66,11 @@ instances: owner: owner, enable: true, runInClusterChecksRunner: false, - configMapName: apicommon.DefaultHelmCheckConf, + configMapName: v2alpha1.DefaultHelmCheckConf, }, want: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Name: apicommon.DefaultHelmCheckConf, + Name: v2alpha1.DefaultHelmCheckConf, Namespace: owner.GetNamespace(), }, Data: map[string]string{ @@ -89,12 +89,12 @@ instances: owner: owner, enable: true, runInClusterChecksRunner: true, - configMapName: apicommon.DefaultHelmCheckConf, + configMapName: v2alpha1.DefaultHelmCheckConf, collectEvents: true, }, want: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Name: apicommon.DefaultHelmCheckConf, + Name: v2alpha1.DefaultHelmCheckConf, Namespace: owner.GetNamespace(), }, Data: map[string]string{ @@ -113,12 +113,12 @@ instances: owner: owner, enable: true, runInClusterChecksRunner: false, - configMapName: apicommon.DefaultHelmCheckConf, + configMapName: v2alpha1.DefaultHelmCheckConf, collectEvents: true, }, want: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Name: apicommon.DefaultHelmCheckConf, + Name: v2alpha1.DefaultHelmCheckConf, Namespace: owner.GetNamespace(), }, Data: map[string]string{ @@ -137,12 +137,12 @@ instances: owner: owner, enable: true, runInClusterChecksRunner: true, - configMapName: apicommon.DefaultHelmCheckConf, + configMapName: v2alpha1.DefaultHelmCheckConf, valuesAsTags: map[string]string{"zip": "zap", "foo": "bar"}, // tags map should get sorted alphabetically by key }, want: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Name: apicommon.DefaultHelmCheckConf, + Name: v2alpha1.DefaultHelmCheckConf, Namespace: owner.GetNamespace(), }, Data: map[string]string{ @@ -164,12 +164,12 @@ instances: owner: owner, enable: true, runInClusterChecksRunner: false, - configMapName: apicommon.DefaultHelmCheckConf, + configMapName: v2alpha1.DefaultHelmCheckConf, valuesAsTags: map[string]string{"foo": "bar", "zip": "zap"}, }, want: &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ - Name: apicommon.DefaultHelmCheckConf, + Name: v2alpha1.DefaultHelmCheckConf, Namespace: owner.GetNamespace(), }, Data: map[string]string{ diff --git a/internal/controller/datadogagent/feature/helmcheck/feature.go b/internal/controller/datadogagent/feature/helmcheck/feature.go index e1acfcc6a..3252f7392 100644 --- a/internal/controller/datadogagent/feature/helmcheck/feature.go +++ b/internal/controller/datadogagent/feature/helmcheck/feature.go @@ -72,7 +72,7 @@ func (f *helmCheckFeature) Configure(dda *v2alpha1.DatadogAgent) (reqComp featur reqComp.ClusterAgent.IsRequired = apiutils.NewBoolPointer(true) reqComp.Agent.IsRequired = apiutils.NewBoolPointer(true) - f.configMapName = fmt.Sprintf("%s-%s", f.owner.GetName(), apicommon.DefaultHelmCheckConf) + f.configMapName = fmt.Sprintf("%s-%s", f.owner.GetName(), v2alpha1.DefaultHelmCheckConf) f.collectEvents = apiutils.BoolValue(helmCheck.CollectEvents) f.valuesAsTags = helmCheck.ValuesAsTags f.serviceAccountName = v2alpha1.GetClusterAgentServiceAccount(dda) diff --git a/internal/controller/datadogagent/feature/helmcheck/feature_test.go b/internal/controller/datadogagent/feature/helmcheck/feature_test.go index a11625d6d..0e9e911fa 100644 --- a/internal/controller/datadogagent/feature/helmcheck/feature_test.go +++ b/internal/controller/datadogagent/feature/helmcheck/feature_test.go @@ -17,6 +17,7 @@ import ( rbacv1 "k8s.io/api/rbac/v1" apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" @@ -74,7 +75,7 @@ func Test_helmCheckFeature_Configure(t *testing.T) { func helmCheckWantDepsFunc(ccr bool, collectEvents bool, valuesAsTags map[string]string, rbacSuffix string) func(t testing.TB, store store.StoreClient) { return func(t testing.TB, store store.StoreClient) { // validate configMap - configMapName := fmt.Sprintf("%s-%s", resourcesName, apicommon.DefaultHelmCheckConf) + configMapName := fmt.Sprintf("%s-%s", resourcesName, v2alpha1.DefaultHelmCheckConf) obj, found := store.Get(kubernetes.ConfigMapKind, resourcesNamespace, configMapName) @@ -141,7 +142,7 @@ func helmCheckWantResourcesFunc(ccr bool, collectEvents bool) *test.ComponentTes // validate volumes expectedVols := []*corev1.Volume{ { - Name: apicommon.DefaultHelmCheckConf, + Name: v2alpha1.DefaultHelmCheckConf, VolumeSource: corev1.VolumeSource{ ConfigMap: &corev1.ConfigMapVolumeSource{ LocalObjectReference: corev1.LocalObjectReference{ @@ -163,7 +164,7 @@ func helmCheckWantResourcesFunc(ccr bool, collectEvents bool) *test.ComponentTes // validate volumeMounts expectedVolMounts := []*corev1.VolumeMount{ { - Name: apicommon.DefaultHelmCheckConf, + Name: v2alpha1.DefaultHelmCheckConf, MountPath: "/etc/datadog-agent/conf.d/helm.d", ReadOnly: true, }, diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go b/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go index f5dff375f..1cea9f5af 100644 --- a/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go +++ b/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go @@ -9,7 +9,6 @@ import ( "reflect" "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" corev1 "k8s.io/api/core/v1" @@ -54,9 +53,9 @@ instances: owner: owner, enable: true, runInClusterChecksRunner: true, - configConfigMapName: apicommon.DefaultKubeStateMetricsCoreConf, + configConfigMapName: v2alpha1.DefaultKubeStateMetricsCoreConf, }, - want: buildDefaultConfigMap(owner.GetNamespace(), apicommon.DefaultKubeStateMetricsCoreConf, ksmCheckConfig(true, defaultOptions)), + want: buildDefaultConfigMap(owner.GetNamespace(), v2alpha1.DefaultKubeStateMetricsCoreConf, ksmCheckConfig(true, defaultOptions)), }, { name: "override", @@ -64,12 +63,12 @@ instances: owner: owner, enable: true, runInClusterChecksRunner: true, - configConfigMapName: apicommon.DefaultKubeStateMetricsCoreConf, + configConfigMapName: v2alpha1.DefaultKubeStateMetricsCoreConf, customConfig: &v2alpha1.CustomConfig{ ConfigData: &overrideConf, }, }, - want: buildDefaultConfigMap(owner.GetNamespace(), apicommon.DefaultKubeStateMetricsCoreConf, overrideConf), + want: buildDefaultConfigMap(owner.GetNamespace(), v2alpha1.DefaultKubeStateMetricsCoreConf, overrideConf), }, { name: "no cluster check runners", @@ -77,9 +76,9 @@ instances: owner: owner, enable: true, runInClusterChecksRunner: false, - configConfigMapName: apicommon.DefaultKubeStateMetricsCoreConf, + configConfigMapName: v2alpha1.DefaultKubeStateMetricsCoreConf, }, - want: buildDefaultConfigMap(owner.GetNamespace(), apicommon.DefaultKubeStateMetricsCoreConf, ksmCheckConfig(false, defaultOptions)), + want: buildDefaultConfigMap(owner.GetNamespace(), v2alpha1.DefaultKubeStateMetricsCoreConf, ksmCheckConfig(false, defaultOptions)), }, { name: "with vpa", @@ -87,10 +86,10 @@ instances: owner: owner, enable: true, runInClusterChecksRunner: true, - configConfigMapName: apicommon.DefaultKubeStateMetricsCoreConf, + configConfigMapName: v2alpha1.DefaultKubeStateMetricsCoreConf, collectorOpts: optionsWithVPA, }, - want: buildDefaultConfigMap(owner.GetNamespace(), apicommon.DefaultKubeStateMetricsCoreConf, ksmCheckConfig(true, optionsWithVPA)), + want: buildDefaultConfigMap(owner.GetNamespace(), v2alpha1.DefaultKubeStateMetricsCoreConf, ksmCheckConfig(true, optionsWithVPA)), }, { name: "with CRDs", @@ -98,10 +97,10 @@ instances: owner: owner, enable: true, runInClusterChecksRunner: true, - configConfigMapName: apicommon.DefaultKubeStateMetricsCoreConf, + configConfigMapName: v2alpha1.DefaultKubeStateMetricsCoreConf, collectorOpts: optionsWithCRD, }, - want: buildDefaultConfigMap(owner.GetNamespace(), apicommon.DefaultKubeStateMetricsCoreConf, ksmCheckConfig(true, optionsWithCRD)), + want: buildDefaultConfigMap(owner.GetNamespace(), v2alpha1.DefaultKubeStateMetricsCoreConf, ksmCheckConfig(true, optionsWithCRD)), }, { name: "with APIServices", @@ -109,10 +108,10 @@ instances: owner: owner, enable: true, runInClusterChecksRunner: true, - configConfigMapName: apicommon.DefaultKubeStateMetricsCoreConf, + configConfigMapName: v2alpha1.DefaultKubeStateMetricsCoreConf, collectorOpts: optionsWithAPIService, }, - want: buildDefaultConfigMap(owner.GetNamespace(), apicommon.DefaultKubeStateMetricsCoreConf, ksmCheckConfig(true, optionsWithAPIService)), + want: buildDefaultConfigMap(owner.GetNamespace(), v2alpha1.DefaultKubeStateMetricsCoreConf, ksmCheckConfig(true, optionsWithAPIService)), }, } for _, tt := range tests { diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go b/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go index 6c1c68c39..71575751a 100644 --- a/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go +++ b/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go @@ -119,7 +119,7 @@ func (f *ksmFeature) Configure(dda *v2alpha1.DatadogAgent) feature.RequiredCompo f.customConfigAnnotationKey = object.GetChecksumAnnotationKey(feature.KubernetesStateCoreIDType) } - f.configConfigMapName = v2alpha1.GetConfName(dda, f.customConfig, apicommon.DefaultKubeStateMetricsCoreConf) + f.configConfigMapName = v2alpha1.GetConfName(dda, f.customConfig, v2alpha1.DefaultKubeStateMetricsCoreConf) } return output diff --git a/internal/controller/datadogagent/feature/npm/feature.go b/internal/controller/datadogagent/feature/npm/feature.go index a80d0103d..a85a8aeb7 100644 --- a/internal/controller/datadogagent/feature/npm/feature.go +++ b/internal/controller/datadogagent/feature/npm/feature.go @@ -145,7 +145,7 @@ func (f *npmFeature) ManageNodeAgent(managers feature.PodTemplateManagers, provi socketEnvVar := &corev1.EnvVar{ Name: apicommon.DDSystemProbeSocket, - Value: apicommon.DefaultSystemProbeSocketPath, + Value: v2alpha1.DefaultSystemProbeSocketPath, } managers.EnvVar().AddEnvVarToContainers(containersForEnvVars, socketEnvVar) diff --git a/internal/controller/datadogagent/feature/npm/feature_test.go b/internal/controller/datadogagent/feature/npm/feature_test.go index 67a683959..d382ef558 100644 --- a/internal/controller/datadogagent/feature/npm/feature_test.go +++ b/internal/controller/datadogagent/feature/npm/feature_test.go @@ -52,7 +52,7 @@ func Test_npmFeature_Configure(t *testing.T) { }, { Name: apicommon.DDSystemProbeSocket, - Value: apicommon.DefaultSystemProbeSocketPath, + Value: v2alpha1.DefaultSystemProbeSocketPath, }, { Name: apicommon.DDSystemProbeCollectDNSStatsEnabled, @@ -176,7 +176,7 @@ func Test_npmFeature_Configure(t *testing.T) { }, { Name: apicommon.DDSystemProbeSocket, - Value: apicommon.DefaultSystemProbeSocketPath, + Value: v2alpha1.DefaultSystemProbeSocketPath, }, } npmFeatureEnvVar := []*corev1.EnvVar{ diff --git a/internal/controller/datadogagent/feature/oomkill/feature.go b/internal/controller/datadogagent/feature/oomkill/feature.go index 8bc7c3fb9..ad8e0ee48 100644 --- a/internal/controller/datadogagent/feature/oomkill/feature.go +++ b/internal/controller/datadogagent/feature/oomkill/feature.go @@ -120,7 +120,7 @@ func (f *oomKillFeature) ManageNodeAgent(managers feature.PodTemplateManagers, p socketEnvVar := &corev1.EnvVar{ Name: apicommon.DDSystemProbeSocket, - Value: apicommon.DefaultSystemProbeSocketPath, + Value: v2alpha1.DefaultSystemProbeSocketPath, } managers.EnvVar().AddEnvVarToContainers([]apicommon.AgentContainerName{apicommon.CoreAgentContainerName, apicommon.SystemProbeContainerName}, socketEnvVar) diff --git a/internal/controller/datadogagent/feature/oomkill/feature_test.go b/internal/controller/datadogagent/feature/oomkill/feature_test.go index 32612b5bb..efa661056 100644 --- a/internal/controller/datadogagent/feature/oomkill/feature_test.go +++ b/internal/controller/datadogagent/feature/oomkill/feature_test.go @@ -135,7 +135,7 @@ func Test_oomKillFeature_Configure(t *testing.T) { }, { Name: apicommon.DDSystemProbeSocket, - Value: apicommon.DefaultSystemProbeSocketPath, + Value: v2alpha1.DefaultSystemProbeSocketPath, }, } agentEnvVars := mgr.EnvVarMgr.EnvVarsByC[apicommon.CoreAgentContainerName] diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/configmap_test.go b/internal/controller/datadogagent/feature/orchestratorexplorer/configmap_test.go index 57938a597..87cb218b1 100644 --- a/internal/controller/datadogagent/feature/orchestratorexplorer/configmap_test.go +++ b/internal/controller/datadogagent/feature/orchestratorexplorer/configmap_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/require" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" corev1 "k8s.io/api/core/v1" @@ -53,9 +52,9 @@ instances: owner: owner, enable: true, runInClusterChecksRunner: false, - configConfigMapName: apicommon.DefaultOrchestratorExplorerConf, + configConfigMapName: v2alpha1.DefaultOrchestratorExplorerConf, }, - want: buildDefaultConfigMap(owner.GetNamespace(), apicommon.DefaultOrchestratorExplorerConf, orchestratorExplorerCheckConfig(false, []string{})), + want: buildDefaultConfigMap(owner.GetNamespace(), v2alpha1.DefaultOrchestratorExplorerConf, orchestratorExplorerCheckConfig(false, []string{})), }, { name: "override", @@ -63,22 +62,22 @@ instances: owner: owner, enable: true, runInClusterChecksRunner: true, - configConfigMapName: apicommon.DefaultOrchestratorExplorerConf, + configConfigMapName: v2alpha1.DefaultOrchestratorExplorerConf, customConfig: &v2alpha1.CustomConfig{ ConfigData: &overrideConf, }, }, - want: buildDefaultConfigMap(owner.GetNamespace(), apicommon.DefaultOrchestratorExplorerConf, overrideConf), + want: buildDefaultConfigMap(owner.GetNamespace(), v2alpha1.DefaultOrchestratorExplorerConf, overrideConf), }, { name: "default config with crs", fields: fields{ owner: owner, enable: true, runInClusterChecksRunner: false, - configConfigMapName: apicommon.DefaultOrchestratorExplorerConf, + configConfigMapName: v2alpha1.DefaultOrchestratorExplorerConf, crCollection: crs, }, - want: buildDefaultConfigMap(owner.GetNamespace(), apicommon.DefaultOrchestratorExplorerConf, orchestratorExplorerCheckConfig(false, crs)), + want: buildDefaultConfigMap(owner.GetNamespace(), v2alpha1.DefaultOrchestratorExplorerConf, orchestratorExplorerCheckConfig(false, crs)), }, } for _, tt := range tests { diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go b/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go index e9e38bd57..9d73a6ddc 100644 --- a/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go +++ b/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go @@ -104,7 +104,7 @@ func (f *orchestratorExplorerFeature) Configure(dda *v2alpha1.DatadogAgent) (req f.customConfigAnnotationKey = object.GetChecksumAnnotationKey(feature.OrchestratorExplorerIDType) } f.customResources = dda.Spec.Features.OrchestratorExplorer.CustomResources - f.configConfigMapName = v2alpha1.GetConfName(dda, f.customConfig, apicommon.DefaultOrchestratorExplorerConf) + f.configConfigMapName = v2alpha1.GetConfName(dda, f.customConfig, v2alpha1.DefaultOrchestratorExplorerConf) f.scrubContainers = apiutils.BoolValue(orchestratorExplorer.ScrubContainers) f.extraTags = orchestratorExplorer.ExtraTags if orchestratorExplorer.DDUrl != nil { diff --git a/internal/controller/datadogagent/feature/tcpqueuelength/feature.go b/internal/controller/datadogagent/feature/tcpqueuelength/feature.go index a9dc6dae5..8fa1c557b 100644 --- a/internal/controller/datadogagent/feature/tcpqueuelength/feature.go +++ b/internal/controller/datadogagent/feature/tcpqueuelength/feature.go @@ -127,7 +127,7 @@ func (f *tcpQueueLengthFeature) ManageNodeAgent(managers feature.PodTemplateMana socketEnvVar := &corev1.EnvVar{ Name: apicommon.DDSystemProbeSocket, - Value: apicommon.DefaultSystemProbeSocketPath, + Value: v2alpha1.DefaultSystemProbeSocketPath, } managers.EnvVar().AddEnvVarToContainers( []apicommon.AgentContainerName{apicommon.CoreAgentContainerName, apicommon.SystemProbeContainerName}, diff --git a/internal/controller/datadogagent/feature/tcpqueuelength/feature_test.go b/internal/controller/datadogagent/feature/tcpqueuelength/feature_test.go index b691b6cb7..25796c3ee 100644 --- a/internal/controller/datadogagent/feature/tcpqueuelength/feature_test.go +++ b/internal/controller/datadogagent/feature/tcpqueuelength/feature_test.go @@ -136,7 +136,7 @@ func Test_tcpQueueLengthFeature_Configure(t *testing.T) { }, { Name: apicommon.DDSystemProbeSocket, - Value: apicommon.DefaultSystemProbeSocketPath, + Value: v2alpha1.DefaultSystemProbeSocketPath, }, } agentEnvVars := mgr.EnvVarMgr.EnvVarsByC[apicommon.CoreAgentContainerName] diff --git a/internal/controller/datadogagent/feature/usm/feature.go b/internal/controller/datadogagent/feature/usm/feature.go index 3be79daec..3a6f289ba 100644 --- a/internal/controller/datadogagent/feature/usm/feature.go +++ b/internal/controller/datadogagent/feature/usm/feature.go @@ -162,7 +162,7 @@ func (f *usmFeature) ManageNodeAgent(managers feature.PodTemplateManagers, provi sysProbeSocketEnvVar := &corev1.EnvVar{ Name: apicommon.DDSystemProbeSocket, - Value: apicommon.DefaultSystemProbeSocketPath, + Value: v2alpha1.DefaultSystemProbeSocketPath, } managers.EnvVar().AddEnvVarToContainers(containersForEnvVars, sysProbeSocketEnvVar) diff --git a/internal/controller/datadogagent/feature/usm/feature_test.go b/internal/controller/datadogagent/feature/usm/feature_test.go index a99bcb5d9..630d12eea 100644 --- a/internal/controller/datadogagent/feature/usm/feature_test.go +++ b/internal/controller/datadogagent/feature/usm/feature_test.go @@ -145,7 +145,7 @@ func Test_usmFeature_Configure(t *testing.T) { }, { Name: apicommon.DDSystemProbeSocket, - Value: apicommon.DefaultSystemProbeSocketPath, + Value: v2alpha1.DefaultSystemProbeSocketPath, }, } diff --git a/internal/controller/datadogagent/override/global.go b/internal/controller/datadogagent/override/global.go index 5240635fa..2ed3bf94e 100644 --- a/internal/controller/datadogagent/override/global.go +++ b/internal/controller/datadogagent/override/global.go @@ -66,11 +66,11 @@ func applyGlobalSettings(logger logr.Logger, manager feature.PodTemplateManagers } // Registry is the image registry to use for all Agent images. - if *config.Registry != apicommon.DefaultImageRegistry { - image := apicommon.DefaultAgentImageName + if *config.Registry != v2alpha1.DefaultImageRegistry { + image := v2alpha1.DefaultAgentImageName version := defaulting.AgentLatestVersion if componentName == v2alpha1.ClusterAgentComponentName { - image = apicommon.DefaultClusterAgentImageName + image = v2alpha1.DefaultClusterAgentImageName version = defaulting.ClusterAgentLatestVersion } fullImage := fmt.Sprintf("%s/%s:%s", *config.Registry, image, version) diff --git a/pkg/config/config.go b/pkg/config/config.go index f2041e210..8e9698764 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -105,7 +105,7 @@ func CacheOptions(logger logr.Logger, opts WatchOptions) cache.Options { Namespaces: agentNamespaces, Label: labels.SelectorFromSet(map[string]string{ - common.AgentDeploymentComponentLabelKey: common.DefaultAgentResourceSuffix, + common.AgentDeploymentComponentLabelKey: datadoghqv2alpha1.DefaultAgentResourceSuffix, }), Transform: func(obj interface{}) (interface{}, error) { diff --git a/pkg/defaulting/images.go b/pkg/defaulting/images.go index 419ce439b..709de424a 100644 --- a/pkg/defaulting/images.go +++ b/pkg/defaulting/images.go @@ -46,7 +46,7 @@ func IsImageNameContainsTag(name string) bool { return imageHasTag.MatchString(name) } -// Image represent a container image information +// Image represents a container image information type Image struct { registry ContainerRegistry imageName string