[cleanup] move env vars out of /api folder

api/datadoghq/v2alpha1/envvar.go

@@ -5,74 +5,4 @@
 
 package v2alpha1
 
-const (
-	DDAPIKey      = "DD_API_KEY"
-	DDAppKey      = "DD_APP_KEY"
-	DDddURL       = "DD_DD_URL"
-	DDURL         = "DD_URL"
-	DDSite        = "DD_SITE"
-	DDLogLevel    = "DD_LOG_LEVEL"
-	DDClusterName = "DD_CLUSTER_NAME"
-
-	DDAPMEnabled                           = "DD_APM_ENABLED"
-	DDAPMInstrumentationInstallTime        = "DD_INSTRUMENTATION_INSTALL_TIME"
-	DDAPMInstrumentationInstallId          = "DD_INSTRUMENTATION_INSTALL_ID"
-	DDAPMInstrumentationInstallType        = "DD_INSTRUMENTATION_INSTALL_TYPE"
-	DDAuthTokenFilePath                    = "DD_AUTH_TOKEN_FILE_PATH"
-	DDChecksTagCardinality                 = "DD_CHECKS_TAG_CARDINALITY"
-	DDClcRunnerEnabled                     = "DD_CLC_RUNNER_ENABLED"
-	DDClcRunnerHost                        = "DD_CLC_RUNNER_HOST"
-	DDClcRunnerID                          = "DD_CLC_RUNNER_ID"
-	DDClusterAgentEnabled                  = "DD_CLUSTER_AGENT_ENABLED"
-	DDClusterAgentKubeServiceName          = "DD_CLUSTER_AGENT_KUBERNETES_SERVICE_NAME"
-	DDClusterAgentTokenName                = "DD_CLUSTER_AGENT_TOKEN_NAME"
-	DDContainerCollectionEnabled           = "DD_PROCESS_CONFIG_CONTAINER_COLLECTION_ENABLED"
-	DDContainerImageEnabled                = "DD_CONTAINER_IMAGE_ENABLED"
-	DDCriSocketPath                        = "DD_CRI_SOCKET_PATH"
-	DDDogstatsdEnabled                     = "DD_USE_DOGSTATSD"
-	DDEnableMetadataCollection             = "DD_ENABLE_METADATA_COLLECTION"
-	DDFIPSEnabled                          = "DD_FIPS_ENABLED"
-	DDFIPSPortRangeStart                   = "DD_FIPS_PORT_RANGE_START"
-	DDFIPSUseHTTPS                         = "DD_FIPS_HTTPS"
-	DDFIPSLocalAddress                     = "DD_FIPS_LOCAL_ADDRESS"
-	DDHealthPort                           = "DD_HEALTH_PORT"
-	DDHostname                             = "DD_HOSTNAME"
-	DDHostRootEnvVar                       = "HOST_ROOT"
-	DDKubeletCAPath                        = "DD_KUBELET_CLIENT_CA"
-	DDKubeletHost                          = "DD_KUBERNETES_KUBELET_HOST"
-	DDKubeletTLSVerify                     = "DD_KUBELET_TLS_VERIFY"
-	DDKubeResourcesNamespace               = "DD_KUBE_RESOURCES_NAMESPACE"
-	DDKubernetesResourcesLabelsAsTags      = "DD_KUBERNETES_RESOURCES_LABELS_AS_TAGS"
-	DDKubernetesResourcesAnnotationsAsTags = "DD_KUBERNETES_RESOURCES_ANNOTATIONS_AS_TAGS"
-	DDKubernetesPodResourcesSocket         = "DD_KUBERNETES_KUBELET_PODRESOURCES_SOCKET"
-	DDLeaderElection                       = "DD_LEADER_ELECTION"
-	DDLogsEnabled                          = "DD_LOGS_ENABLED"
-	DDNamespaceLabelsAsTags                = "DD_KUBERNETES_NAMESPACE_LABELS_AS_TAGS"
-	DDNamespaceAnnotationsAsTags           = "DD_KUBERNETES_NAMESPACE_ANNOTATIONS_AS_TAGS"
-	DDNodeLabelsAsTags                     = "DD_KUBERNETES_NODE_LABELS_AS_TAGS"
-	DDOriginDetectionUnified               = "DD_ORIGIN_DETECTION_UNIFIED"
-	DDPodAnnotationsAsTags                 = "DD_KUBERNETES_POD_ANNOTATIONS_AS_TAGS"
-	DDPodLabelsAsTags                      = "DD_KUBERNETES_POD_LABELS_AS_TAGS"
-	DDPodName                              = "DD_POD_NAME"
-	DDProcessCollectionEnabled             = "DD_PROCESS_CONFIG_PROCESS_COLLECTION_ENABLED"
-	DDProcessConfigRunInCoreAgent          = "DD_PROCESS_CONFIG_RUN_IN_CORE_AGENT_ENABLED"
-	DDSecretBackendCommand                 = "DD_SECRET_BACKEND_COMMAND"
-	DDSecretBackendArguments               = "DD_SECRET_BACKEND_ARGUMENTS"
-	DDSecretBackendTimeout                 = "DD_SECRET_BACKEND_TIMEOUT"
-	DDSystemProbeEnabled                   = "DD_SYSTEM_PROBE_ENABLED"
-	DDSystemProbeExternal                  = "DD_SYSTEM_PROBE_EXTERNAL"
-	DDSystemProbeSocket                    = "DD_SYSPROBE_SOCKET"
-	DDTags                                 = "DD_TAGS"
-	DDAgentIpcPort                         = "DD_AGENT_IPC_PORT"
-	DDAgentIpcConfigRefreshInterval        = "DD_AGENT_IPC_CONFIG_REFRESH_INTERVAL"
-
-	// otelcollector core agent configs
-	DDOtelCollectorCoreConfigEnabled          = "DD_OTELCOLLECTOR_ENABLED"
-	DDOtelCollectorCoreConfigExtensionURL     = "DD_OTELCOLLECTOR_EXTENSION_URL"
-	DDOtelCollectorCoreConfigExtensionTimeout = "DD_OTELCOLLECTOR_EXTENSION_TIMEOUT"
-
-	DockerHost = "DOCKER_HOST"
-	// KubernetesEnvvarName Env var used by the Datadog Agent container entrypoint
-	// to add kubelet config provider and listener
-	KubernetesEnvVar = "KUBERNETES"
-)
+const ()

internal/controller/datadogagent/common/envvar.go

@@ -0,0 +1,32 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2025-present Datadog, Inc.
+
+package common
+
+const (
+	DDAPMEnabled                    = "DD_APM_ENABLED"
+	DDAPMInstrumentationInstallTime = "DD_INSTRUMENTATION_INSTALL_TIME"
+	DDAPMInstrumentationInstallId   = "DD_INSTRUMENTATION_INSTALL_ID"
+	DDAPMInstrumentationInstallType = "DD_INSTRUMENTATION_INSTALL_TYPE"
+	DDClusterAgentEnabled           = "DD_CLUSTER_AGENT_ENABLED"
+	DDClusterAgentKubeServiceName   = "DD_CLUSTER_AGENT_KUBERNETES_SERVICE_NAME"
+	DDClusterAgentTokenName         = "DD_CLUSTER_AGENT_TOKEN_NAME"
+	DDContainerCollectionEnabled    = "DD_PROCESS_CONFIG_CONTAINER_COLLECTION_ENABLED"
+	DDDogstatsdEnabled              = "DD_USE_DOGSTATSD"
+	DDHealthPort                    = "DD_HEALTH_PORT"
+	DDHostRootEnvVar                = "HOST_ROOT"
+	DDKubeletHost                   = "DD_KUBERNETES_KUBELET_HOST"
+	DDLeaderElection                = "DD_LEADER_ELECTION"
+	DDLogsEnabled                   = "DD_LOGS_ENABLED"
+	DDProcessCollectionEnabled      = "DD_PROCESS_CONFIG_PROCESS_COLLECTION_ENABLED"
+	DDProcessConfigRunInCoreAgent   = "DD_PROCESS_CONFIG_RUN_IN_CORE_AGENT_ENABLED"
+	DDSystemProbeEnabled            = "DD_SYSTEM_PROBE_ENABLED"
+	DDSystemProbeExternal           = "DD_SYSTEM_PROBE_EXTERNAL"
+	DDSystemProbeSocket             = "DD_SYSPROBE_SOCKET"
+
+	// KubernetesEnvvarName Env var used by the Datadog Agent container entrypoint
+	// to add kubelet config provider and listener
+	KubernetesEnvVar = "KUBERNETES" //common
+)

internal/controller/datadogagent/component/agent/default.go

@@ -333,23 +333,23 @@ func initSeccompSetupContainer() corev1.Container {
 func commonEnvVars(dda metav1.Object) []corev1.EnvVar {
 	return []corev1.EnvVar{
 		{
-			Name:  v2alpha1.KubernetesEnvVar,
+			Name:  common.KubernetesEnvVar,
 			Value: "yes",
 		},
 		{
-			Name:  v2alpha1.DDClusterAgentEnabled,
+			Name:  common.DDClusterAgentEnabled,
 			Value: strconv.FormatBool(true),
 		},
 		{
-			Name:  v2alpha1.DDClusterAgentKubeServiceName,
+			Name:  common.DDClusterAgentKubeServiceName,
 			Value: componentdca.GetClusterAgentServiceName(dda),
 		},
 		{
-			Name:  v2alpha1.DDClusterAgentTokenName,
+			Name:  common.DDClusterAgentTokenName,
 			Value: secrets.GetDefaultDCATokenSecretName(dda),
 		},
 		{
-			Name: v2alpha1.DDKubeletHost,
+			Name: common.DDKubeletHost,
 			ValueFrom: &corev1.EnvVarSource{
 				FieldRef: &corev1.ObjectFieldSelector{
 					FieldPath: v2alpha1.FieldPathStatusHostIP,
@@ -362,17 +362,17 @@ func commonEnvVars(dda metav1.Object) []corev1.EnvVar {
 func envVarsForCoreAgent(dda metav1.Object) []corev1.EnvVar {
 	envs := []corev1.EnvVar{
 		{
-			Name:  v2alpha1.DDHealthPort,
+			Name:  common.DDHealthPort,
 			Value: strconv.Itoa(int(constants.DefaultAgentHealthPort)),
 		},
 		{
-			Name:  v2alpha1.DDLeaderElection,
+			Name:  common.DDLeaderElection,
 			Value: "true",
 		},
 		{
 			// we want to default it in 7.49.0
 			// but in 7.50.0 it will be already defaulted in the agent process.
-			Name:  v2alpha1.DDContainerImageEnabled,
+			Name:  DDContainerImageEnabled,
 			Value: "true",
 		},
 	}
@@ -383,15 +383,15 @@ func envVarsForCoreAgent(dda metav1.Object) []corev1.EnvVar {
 func envVarsForTraceAgent(dda metav1.Object) []corev1.EnvVar {
 	envs := []corev1.EnvVar{
 		{
-			Name:  v2alpha1.DDAPMInstrumentationInstallId,
+			Name:  common.DDAPMInstrumentationInstallId,
 			Value: utils.GetDatadogAgentResourceUID(dda),
 		},
 		{
-			Name:  v2alpha1.DDAPMInstrumentationInstallTime,
+			Name:  common.DDAPMInstrumentationInstallTime,
 			Value: utils.GetDatadogAgentResourceCreationTime(dda),
 		},
 		{
-			Name:  v2alpha1.DDAPMInstrumentationInstallType,
+			Name:  common.DDAPMInstrumentationInstallType,
 			Value: common.DefaultAgentInstallType,
 		},
 	}

internal/controller/datadogagent/component/agent/envvar.go

@@ -0,0 +1,10 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2025-present Datadog, Inc.
+
+package agent
+
+const (
+	DDContainerImageEnabled = "DD_CONTAINER_IMAGE_ENABLED"
+)

internal/controller/datadogagent/component/clusteragent/default.go

@@ -152,43 +152,43 @@ func defaultPodSpec(dda metav1.Object, volumes []corev1.Volume, volumeMounts []c
 func defaultEnvVars(dda metav1.Object) []corev1.EnvVar {
 	envVars := []corev1.EnvVar{
 		{
-			Name: v2alpha1.DDPodName,
+			Name: DDPodName,
 			ValueFrom: &corev1.EnvVarSource{
 				FieldRef: &corev1.ObjectFieldSelector{
 					FieldPath: "metadata.name",
 				},
 			},
 		},
 		{
-			Name:  v2alpha1.DDClusterAgentKubeServiceName,
+			Name:  common.DDClusterAgentKubeServiceName,
 			Value: GetClusterAgentServiceName(dda),
 		},
 		{
-			Name:  v2alpha1.DDKubeResourcesNamespace,
+			Name:  DDKubeResourcesNamespace,
 			Value: utils.GetDatadogAgentResourceNamespace(dda),
 		},
 		{
-			Name:  v2alpha1.DDLeaderElection,
+			Name:  common.DDLeaderElection,
 			Value: "true",
 		},
 		{
-			Name:  v2alpha1.DDHealthPort,
+			Name:  common.DDHealthPort,
 			Value: strconv.Itoa(int(constants.DefaultAgentHealthPort)),
 		},
 		{
-			Name:  v2alpha1.DDAPMInstrumentationInstallId,
+			Name:  common.DDAPMInstrumentationInstallId,
 			Value: utils.GetDatadogAgentResourceUID(dda),
 		},
 		{
-			Name:  v2alpha1.DDAPMInstrumentationInstallTime,
+			Name:  common.DDAPMInstrumentationInstallTime,
 			Value: utils.GetDatadogAgentResourceCreationTime(dda),
 		},
 		{
-			Name:  v2alpha1.DDAPMInstrumentationInstallType,
+			Name:  common.DDAPMInstrumentationInstallType,
 			Value: common.DefaultAgentInstallType,
 		},
 		{
-			Name:  v2alpha1.DDAuthTokenFilePath,
+			Name:  DDAuthTokenFilePath,
 			Value: filepath.Join(v2alpha1.AuthVolumePath, "token"),
 		},
 	}

internal/controller/datadogagent/component/clusteragent/envvar.go

@@ -0,0 +1,12 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2025-present Datadog, Inc.
+
+package clusteragent
+
+const (
+	DDAuthTokenFilePath      = "DD_AUTH_TOKEN_FILE_PATH"
+	DDKubeResourcesNamespace = "DD_KUBE_RESOURCES_NAMESPACE"
+	DDPodName                = "DD_POD_NAME"
+)

internal/controller/datadogagent/component/clusterchecksrunner/default.go

@@ -183,67 +183,67 @@ func defaultPodSpec(dda metav1.Object, volumes []corev1.Volume, volumeMounts []c
 func defaultEnvVars(dda metav1.Object) []corev1.EnvVar {
 	envVars := []corev1.EnvVar{
 		{
-			Name:  v2alpha1.DDClusterAgentKubeServiceName,
+			Name:  common.DDClusterAgentKubeServiceName,
 			Value: componentdca.GetClusterAgentServiceName(dda),
 		},
 		{
-			Name:  v2alpha1.DDClusterAgentEnabled,
+			Name:  common.DDClusterAgentEnabled,
 			Value: "true",
 		},
 		{
-			Name:  v2alpha1.DDHealthPort,
+			Name:  common.DDHealthPort,
 			Value: strconv.Itoa(int(constants.DefaultAgentHealthPort)),
 		},
 		{
-			Name:  v2alpha1.KubernetesEnvVar,
+			Name:  common.KubernetesEnvVar,
 			Value: "yes",
 		},
 		{
-			Name:  v2alpha1.DDEnableMetadataCollection,
+			Name:  DDEnableMetadataCollection,
 			Value: "false",
 		},
 		{
-			Name:  v2alpha1.DDClcRunnerEnabled,
+			Name:  DDClcRunnerEnabled,
 			Value: "true",
 		},
 		{
-			Name: v2alpha1.DDClcRunnerHost,
+			Name: DDClcRunnerHost,
 			ValueFrom: &corev1.EnvVarSource{
 				FieldRef: &corev1.ObjectFieldSelector{
 					FieldPath: v2alpha1.FieldPathStatusPodIP,
 				},
 			},
 		},
 		{
-			Name: v2alpha1.DDClcRunnerID,
+			Name: DDClcRunnerID,
 			ValueFrom: &corev1.EnvVarSource{
 				FieldRef: &corev1.ObjectFieldSelector{
 					FieldPath: v2alpha1.FieldPathMetaName,
 				},
 			},
 		},
 		{
-			Name:  v2alpha1.DDDogstatsdEnabled,
+			Name:  common.DDDogstatsdEnabled,
 			Value: "false",
 		},
 		{
-			Name:  v2alpha1.DDProcessCollectionEnabled,
+			Name:  common.DDProcessCollectionEnabled,
 			Value: "false",
 		},
 		{
-			Name:  v2alpha1.DDContainerCollectionEnabled,
+			Name:  common.DDContainerCollectionEnabled,
 			Value: "true",
 		},
 		{
-			Name:  v2alpha1.DDLogsEnabled,
+			Name:  common.DDLogsEnabled,
 			Value: "false",
 		},
 		{
-			Name:  v2alpha1.DDAPMEnabled,
+			Name:  common.DDAPMEnabled,
 			Value: "false",
 		},
 		{
-			Name: v2alpha1.DDHostname,
+			Name: DDHostname,
 			ValueFrom: &corev1.EnvVarSource{
 				FieldRef: &corev1.ObjectFieldSelector{
 					FieldPath: v2alpha1.FieldPathSpecNodeName,

internal/controller/datadogagent/component/clusterchecksrunner/envvar.go

@@ -0,0 +1,14 @@
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2025-present Datadog, Inc.
+
+package clusterchecksrunner
+
+const (
+	DDClcRunnerEnabled         = "DD_CLC_RUNNER_ENABLED"
+	DDClcRunnerHost            = "DD_CLC_RUNNER_HOST"
+	DDClcRunnerID              = "DD_CLC_RUNNER_ID"
+	DDEnableMetadataCollection = "DD_ENABLE_METADATA_COLLECTION"
+	DDHostname                 = "DD_HOSTNAME"
+)

internal/controller/datadogagent/feature/apm/feature.go

@@ -352,7 +352,7 @@ func (f *apmFeature) ManageNodeAgent(managers feature.PodTemplateManagers, provi
 func (f *apmFeature) manageNodeAgent(agentContainerName apicommon.AgentContainerName, managers feature.PodTemplateManagers, provider string) error {
 
 	managers.EnvVar().AddEnvVarToContainer(agentContainerName, &corev1.EnvVar{
-		Name:  v2alpha1.DDAPMEnabled,
+		Name:  common.DDAPMEnabled,
 		Value: "true",
 	})
 
@@ -398,7 +398,7 @@ func (f *apmFeature) manageNodeAgent(agentContainerName apicommon.AgentContainer
 
 		// Always add this envvar to Core and Process containers
 		runInCoreAgentEnvVar := &corev1.EnvVar{
-			Name:  v2alpha1.DDProcessConfigRunInCoreAgent,
+			Name:  common.DDProcessConfigRunInCoreAgent,
 			Value: apiutils.BoolToString(&f.processCheckRunsInCoreAgent),
 		}
 		managers.EnvVar().AddEnvVarToContainer(apicommon.ProcessAgentContainerName, runInCoreAgentEnvVar)