Skip to content

Commit

Permalink
[cleanup] Remove operator reference in /api folder, refactor v2alpha …
Browse files Browse the repository at this point in the history 
…files (#1576)

* remove move utils and reference to defaulting from api

* moving more out of api

v2alpha1/test to pkg/testutils and v2alpha1/datadogagent_default to internal/controller/defaults

* refactoring otel collector

* Update datadogagent_default_test.go
  • Loading branch information
@swang392
swang392 authored Dec 26, 2024
1 parent efaa4e9 commit 6eae617
Show file tree
Hide file tree
Showing 69 changed files with 1,392 additions and 1,343 deletions.
54 changes: 0 additions & 54 deletions api/datadoghq/v2alpha1/const.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ package v2alpha1
// This file tracks constants related to the DatadogAgent CRD

const (

// ClusterAgentReconcileConditionType ReconcileConditionType for Cluster Agent component
ClusterAgentReconcileConditionType = "ClusterAgentReconcile"
// AgentReconcileConditionType ReconcileConditionType for Agent component
Expand All @@ -25,59 +24,6 @@ const (
// ExtraChecksdConfigMapName is the name of the ConfigMap storing Custom Checksd data
ExtraChecksdConfigMapName = "%s-extra-checksd"

// DefaultAgentHealthPort default agent health port
DefaultAgentHealthPort int32 = 5555

// Liveness probe default config
DefaultLivenessProbeInitialDelaySeconds int32 = 15
DefaultLivenessProbePeriodSeconds int32 = 15
DefaultLivenessProbeTimeoutSeconds int32 = 5
DefaultLivenessProbeSuccessThreshold int32 = 1
DefaultLivenessProbeFailureThreshold int32 = 6
DefaultLivenessProbeHTTPPath = "/live"

// Readiness probe default config
DefaultReadinessProbeInitialDelaySeconds int32 = 15
DefaultReadinessProbePeriodSeconds int32 = 15
DefaultReadinessProbeTimeoutSeconds int32 = 5
DefaultReadinessProbeSuccessThreshold int32 = 1
DefaultReadinessProbeFailureThreshold int32 = 6
DefaultReadinessProbeHTTPPath = "/ready"

// Startup probe default config
DefaultStartupProbeInitialDelaySeconds int32 = 15
DefaultStartupProbePeriodSeconds int32 = 15
DefaultStartupProbeTimeoutSeconds int32 = 5
DefaultStartupProbeSuccessThreshold int32 = 1
DefaultStartupProbeFailureThreshold int32 = 6
DefaultStartupProbeHTTPPath = "/startup"

// Agent Data plane default liveness/readiness probe configs
DefaultADPLivenessProbeInitialDelaySeconds int32 = 5
DefaultADPLivenessProbePeriodSeconds int32 = 5
DefaultADPLivenessProbeTimeoutSeconds int32 = 5
DefaultADPLivenessProbeSuccessThreshold int32 = 1
DefaultADPLivenessProbeFailureThreshold int32 = 12

DefaultADPReadinessProbeInitialDelaySeconds int32 = 5
DefaultADPReadinessProbePeriodSeconds int32 = 5
DefaultADPReadinessProbeTimeoutSeconds int32 = 5
DefaultADPReadinessProbeSuccessThreshold int32 = 1
DefaultADPReadinessProbeFailureThreshold int32 = 12

DefaultADPHealthPort = 5100

// DefaultApmPort default apm port
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).
Expand Down
3 changes: 2 additions & 1 deletion internal/controller/datadogagent/common/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
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/constants"
"github.com/DataDog/datadog-operator/pkg/kubernetes"
"github.com/DataDog/datadog-operator/pkg/utils"

Expand Down Expand Up @@ -120,7 +121,7 @@ const (
func GetAgentLocalServiceSelector(dda metav1.Object) map[string]string {
return map[string]string{
kubernetes.AppKubernetesPartOfLabelKey: object.NewPartOfLabelValue(dda).String(),
apicommon.AgentDeploymentComponentLabelKey: v2alpha1.DefaultAgentResourceSuffix,
apicommon.AgentDeploymentComponentLabelKey: constants.DefaultAgentResourceSuffix,
}
}

Expand Down
31 changes: 16 additions & 15 deletions internal/controller/datadogagent/component/agent/default.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent"
"github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature"
"github.com/DataDog/datadog-operator/internal/controller/datadogagent/object"
"github.com/DataDog/datadog-operator/pkg/constants"
"github.com/DataDog/datadog-operator/pkg/controller/utils"
"github.com/DataDog/datadog-operator/pkg/defaulting"

Expand All @@ -28,15 +29,15 @@ import (

// NewDefaultAgentDaemonset return a new default agent DaemonSet
func NewDefaultAgentDaemonset(dda metav1.Object, edsOptions *ExtendedDaemonsetOptions, agentComponent feature.RequiredComponent) *appsv1.DaemonSet {
daemonset := NewDaemonset(dda, edsOptions, v2alpha1.DefaultAgentResourceSuffix, GetAgentName(dda), common.GetAgentVersion(dda), nil)
daemonset := NewDaemonset(dda, edsOptions, constants.DefaultAgentResourceSuffix, GetAgentName(dda), common.GetAgentVersion(dda), nil)
podTemplate := NewDefaultAgentPodTemplateSpec(dda, agentComponent, daemonset.GetLabels())
daemonset.Spec.Template = *podTemplate
return daemonset
}

// NewDefaultAgentExtendedDaemonset return a new default agent DaemonSet
func NewDefaultAgentExtendedDaemonset(dda metav1.Object, edsOptions *ExtendedDaemonsetOptions, agentComponent feature.RequiredComponent) *edsv1alpha1.ExtendedDaemonSet {
edsDaemonset := NewExtendedDaemonset(dda, edsOptions, v2alpha1.DefaultAgentResourceSuffix, GetAgentName(dda), common.GetAgentVersion(dda), nil)
edsDaemonset := NewExtendedDaemonset(dda, edsOptions, constants.DefaultAgentResourceSuffix, GetAgentName(dda), common.GetAgentVersion(dda), nil)
edsDaemonset.Spec.Template = *NewDefaultAgentPodTemplateSpec(dda, agentComponent, edsDaemonset.GetLabels())
return edsDaemonset
}
Expand Down Expand Up @@ -88,16 +89,16 @@ 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(), v2alpha1.DefaultAgentResourceSuffix)
return fmt.Sprintf("%s-%s", dda.GetName(), constants.DefaultAgentResourceSuffix)
}

// GetAgentRoleName returns the name of the role for the Agent
func GetAgentRoleName(dda metav1.Object) string {
return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultAgentResourceSuffix)
return fmt.Sprintf("%s-%s", dda.GetName(), constants.DefaultAgentResourceSuffix)
}

func getDefaultServiceAccountName(dda metav1.Object) string {
return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultAgentResourceSuffix)
return fmt.Sprintf("%s-%s", dda.GetName(), constants.DefaultAgentResourceSuffix)
}

func agentImage() string {
Expand Down Expand Up @@ -130,9 +131,9 @@ func agentSingleContainer(dda metav1.Object) []corev1.Container {
Image: agentImage(),
Env: envVarsForCoreAgent(dda),
VolumeMounts: volumeMountsForCoreAgent(),
LivenessProbe: v2alpha1.GetDefaultLivenessProbe(),
ReadinessProbe: v2alpha1.GetDefaultReadinessProbe(),
StartupProbe: v2alpha1.GetDefaultStartupProbe(),
LivenessProbe: constants.GetDefaultLivenessProbe(),
ReadinessProbe: constants.GetDefaultReadinessProbe(),
StartupProbe: constants.GetDefaultStartupProbe(),
}

containers := []corev1.Container{
Expand Down Expand Up @@ -174,9 +175,9 @@ func coreAgentContainer(dda metav1.Object) corev1.Container {
Command: []string{"agent", "run"},
Env: envVarsForCoreAgent(dda),
VolumeMounts: volumeMountsForCoreAgent(),
LivenessProbe: v2alpha1.GetDefaultLivenessProbe(),
ReadinessProbe: v2alpha1.GetDefaultReadinessProbe(),
StartupProbe: v2alpha1.GetDefaultStartupProbe(),
LivenessProbe: constants.GetDefaultLivenessProbe(),
ReadinessProbe: constants.GetDefaultReadinessProbe(),
StartupProbe: constants.GetDefaultStartupProbe(),
}
}

Expand All @@ -190,7 +191,7 @@ func traceAgentContainer(dda metav1.Object) corev1.Container {
},
Env: envVarsForTraceAgent(dda),
VolumeMounts: volumeMountsForTraceAgent(),
LivenessProbe: v2alpha1.GetDefaultTraceAgentProbe(),
LivenessProbe: constants.GetDefaultTraceAgentProbe(),
}
}

Expand Down Expand Up @@ -282,8 +283,8 @@ func agentDataPlaneContainer(dda metav1.Object) corev1.Container {
},
Env: commonEnvVars(dda),
VolumeMounts: volumeMountsForAgentDataPlane(),
LivenessProbe: v2alpha1.GetDefaultAgentDataPlaneLivenessProbe(),
ReadinessProbe: v2alpha1.GetDefaultAgentDataPlaneReadinessProbe(),
LivenessProbe: constants.GetDefaultAgentDataPlaneLivenessProbe(),
ReadinessProbe: constants.GetDefaultAgentDataPlaneReadinessProbe(),
}
}

Expand Down Expand Up @@ -361,7 +362,7 @@ func envVarsForCoreAgent(dda metav1.Object) []corev1.EnvVar {
envs := []corev1.EnvVar{
{
Name: v2alpha1.DDHealthPort,
Value: strconv.Itoa(int(v2alpha1.DefaultAgentHealthPort)),
Value: strconv.Itoa(int(constants.DefaultAgentHealthPort)),
},
{
Name: v2alpha1.DDLeaderElection,
Expand Down
23 changes: 12 additions & 11 deletions internal/controller/datadogagent/component/clusteragent/default.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,24 @@ import (
apiutils "github.com/DataDog/datadog-operator/api/utils"

"github.com/DataDog/datadog-operator/internal/controller/datadogagent/common"
"github.com/DataDog/datadog-operator/pkg/constants"
"github.com/DataDog/datadog-operator/pkg/controller/utils"
"github.com/DataDog/datadog-operator/pkg/defaulting"
)

// 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(), v2alpha1.DefaultClusterAgentResourceSuffix)
return fmt.Sprintf("%s-%s", dda.GetName(), constants.DefaultClusterAgentResourceSuffix)
}

// GetClusterAgentPodDisruptionBudgetName return the Cluster-Agent PodDisruptionBudget name based on the DatadogAgent name
func GetClusterAgentPodDisruptionBudgetName(dda metav1.Object) string {
return fmt.Sprintf("%s-%s-pdb", dda.GetName(), v2alpha1.DefaultClusterAgentResourceSuffix)
return fmt.Sprintf("%s-%s-pdb", dda.GetName(), constants.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(), v2alpha1.DefaultClusterAgentResourceSuffix)
return fmt.Sprintf("%s-%s", dda.GetName(), constants.DefaultClusterAgentResourceSuffix)
}

// GetClusterAgentVersion return the Cluster-Agent version based on the DatadogAgent info
Expand All @@ -46,17 +47,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(), v2alpha1.DefaultClusterAgentResourceSuffix)
return fmt.Sprintf("%s-%s", dda.GetName(), constants.DefaultClusterAgentResourceSuffix)
}

// getDefaultServiceAccountName return the default Cluster-Agent ServiceAccountName
func getDefaultServiceAccountName(dda metav1.Object) string {
return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultClusterAgentResourceSuffix)
return fmt.Sprintf("%s-%s", dda.GetName(), constants.DefaultClusterAgentResourceSuffix)
}

// NewDefaultClusterAgentDeployment return a new default cluster-agent deployment
func NewDefaultClusterAgentDeployment(dda metav1.Object) *appsv1.Deployment {
deployment := common.NewDeployment(dda, v2alpha1.DefaultClusterAgentResourceSuffix, GetClusterAgentName(dda), GetClusterAgentVersion(dda), nil)
deployment := common.NewDeployment(dda, constants.DefaultClusterAgentResourceSuffix, GetClusterAgentName(dda), GetClusterAgentVersion(dda), nil)
podTemplate := NewDefaultClusterAgentPodTemplateSpec(dda)
for key, val := range deployment.GetLabels() {
podTemplate.Labels[key] = val
Expand Down Expand Up @@ -126,9 +127,9 @@ func defaultPodSpec(dda metav1.Object, volumes []corev1.Volume, volumeMounts []c
},
Env: envVars,
VolumeMounts: volumeMounts,
LivenessProbe: v2alpha1.GetDefaultLivenessProbe(),
ReadinessProbe: v2alpha1.GetDefaultReadinessProbe(),
StartupProbe: v2alpha1.GetDefaultStartupProbe(),
LivenessProbe: constants.GetDefaultLivenessProbe(),
ReadinessProbe: constants.GetDefaultReadinessProbe(),
StartupProbe: constants.GetDefaultStartupProbe(),
Command: nil,
Args: nil,
SecurityContext: &corev1.SecurityContext{
Expand Down Expand Up @@ -172,7 +173,7 @@ func defaultEnvVars(dda metav1.Object) []corev1.EnvVar {
},
{
Name: v2alpha1.DDHealthPort,
Value: strconv.Itoa(int(v2alpha1.DefaultAgentHealthPort)),
Value: strconv.Itoa(int(constants.DefaultAgentHealthPort)),
},
{
Name: v2alpha1.DDAPMInstrumentationInstallId,
Expand Down Expand Up @@ -207,7 +208,7 @@ func DefaultAffinity() *corev1.Affinity {
PodAffinityTerm: corev1.PodAffinityTerm{
LabelSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
apicommon.AgentDeploymentComponentLabelKey: v2alpha1.DefaultClusterAgentResourceSuffix,
apicommon.AgentDeploymentComponentLabelKey: constants.DefaultClusterAgentResourceSuffix,
},
},
TopologyKey: "kubernetes.io/hostname",
Expand Down
3 changes: 2 additions & 1 deletion internal/controller/datadogagent/component/clusteragent/default_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
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"
"github.com/DataDog/datadog-operator/pkg/constants"
"github.com/DataDog/datadog-operator/pkg/defaulting"
"github.com/DataDog/datadog-operator/pkg/testutils"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -222,7 +223,7 @@ func clusterAgentDefaultEnvVars(dda *datadoghqv2alpha1.DatadogAgent) []corev1.En
},
{
Name: "DD_CLUSTER_AGENT_KUBERNETES_SERVICE_NAME",
Value: fmt.Sprintf("%s-%s", testDdaName, datadoghqv2alpha1.DefaultClusterAgentResourceSuffix),
Value: fmt.Sprintf("%s-%s", testDdaName, constants.DefaultClusterAgentResourceSuffix),
},
{
Name: "DD_LEADER_ELECTION",
Expand Down
7 changes: 4 additions & 3 deletions internal/controller/datadogagent/component/clusteragent/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/DataDog/datadog-operator/pkg/controller/utils/comparison"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/DataDog/datadog-operator/pkg/constants"
corev1 "k8s.io/api/core/v1"
policyv1 "k8s.io/api/policy/v1"
policyv1beta1 "k8s.io/api/policy/v1beta1"
Expand All @@ -29,7 +30,7 @@ const (

// GetClusterAgentService returns the Cluster-Agent service
func GetClusterAgentService(dda metav1.Object) *corev1.Service {
labels := object.GetDefaultLabels(dda, v2alpha1.DefaultClusterAgentResourceSuffix, GetClusterAgentVersion(dda))
labels := object.GetDefaultLabels(dda, constants.DefaultClusterAgentResourceSuffix, GetClusterAgentVersion(dda))
annotations := object.GetDefaultAnnotations(dda)

service := &corev1.Service{
Expand All @@ -43,7 +44,7 @@ func GetClusterAgentService(dda metav1.Object) *corev1.Service {
Type: corev1.ServiceTypeClusterIP,
Selector: map[string]string{
apicommon.AgentDeploymentNameLabelKey: dda.GetName(),
apicommon.AgentDeploymentComponentLabelKey: v2alpha1.DefaultClusterAgentResourceSuffix,
apicommon.AgentDeploymentComponentLabelKey: constants.DefaultClusterAgentResourceSuffix,
},
Ports: []corev1.ServicePort{
{
Expand All @@ -65,7 +66,7 @@ func GetClusterAgentPodDisruptionBudget(dda metav1.Object, useV1BetaPDB bool) cl
minAvailableStr := intstr.FromInt(pdbMinAvailableInstances)
matchLabels := map[string]string{
apicommon.AgentDeploymentNameLabelKey: dda.GetName(),
apicommon.AgentDeploymentComponentLabelKey: v2alpha1.DefaultClusterAgentResourceSuffix}
apicommon.AgentDeploymentComponentLabelKey: constants.DefaultClusterAgentResourceSuffix}
if useV1BetaPDB {
return &policyv1beta1.PodDisruptionBudget{
ObjectMeta: metav1.ObjectMeta{
Expand Down
21 changes: 11 additions & 10 deletions internal/controller/datadogagent/component/clusterchecksrunner/default.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
apiutils "github.com/DataDog/datadog-operator/api/utils"
"github.com/DataDog/datadog-operator/internal/controller/datadogagent/common"
componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent"
"github.com/DataDog/datadog-operator/pkg/constants"
"github.com/DataDog/datadog-operator/pkg/defaulting"
)

Expand All @@ -31,12 +32,12 @@ const (

// 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(), v2alpha1.DefaultClusterChecksRunnerResourceSuffix)
return fmt.Sprintf("%s-%s", dda.GetName(), constants.DefaultClusterChecksRunnerResourceSuffix)
}

// NewDefaultClusterChecksRunnerDeployment return a new default cluster-checks-runner deployment
func NewDefaultClusterChecksRunnerDeployment(dda metav1.Object) *appsv1.Deployment {
deployment := common.NewDeployment(dda, v2alpha1.DefaultClusterChecksRunnerResourceSuffix, GetClusterChecksRunnerName(dda), common.GetAgentVersion(dda), nil)
deployment := common.NewDeployment(dda, constants.DefaultClusterChecksRunnerResourceSuffix, GetClusterChecksRunnerName(dda), common.GetAgentVersion(dda), nil)

podTemplate := NewDefaultClusterChecksRunnerPodTemplateSpec(dda)
for key, val := range deployment.GetLabels() {
Expand Down Expand Up @@ -91,14 +92,14 @@ func NewDefaultClusterChecksRunnerPodTemplateSpec(dda metav1.Object) *corev1.Pod
}

func GetClusterChecksRunnerPodDisruptionBudgetName(dda metav1.Object) string {
return fmt.Sprintf("%s-%s-pdb", dda.GetName(), v2alpha1.DefaultClusterChecksRunnerResourceSuffix)
return fmt.Sprintf("%s-%s-pdb", dda.GetName(), constants.DefaultClusterChecksRunnerResourceSuffix)
}

func GetClusterChecksRunnerPodDisruptionBudget(dda metav1.Object, useV1BetaPDB bool) client.Object {
maxUnavailableStr := intstr.FromInt(pdbMaxUnavailableInstances)
matchLabels := map[string]string{
apicommon.AgentDeploymentNameLabelKey: dda.GetName(),
apicommon.AgentDeploymentComponentLabelKey: v2alpha1.DefaultClusterChecksRunnerResourceSuffix}
apicommon.AgentDeploymentComponentLabelKey: constants.DefaultClusterChecksRunnerResourceSuffix}
if useV1BetaPDB {
return &policyv1beta1.PodDisruptionBudget{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -129,7 +130,7 @@ func GetClusterChecksRunnerPodDisruptionBudget(dda metav1.Object, useV1BetaPDB b

// getDefaultServiceAccountName return the default Cluster-Agent ServiceAccountName
func getDefaultServiceAccountName(dda metav1.Object) string {
return fmt.Sprintf("%s-%s", dda.GetName(), v2alpha1.DefaultClusterChecksRunnerResourceSuffix)
return fmt.Sprintf("%s-%s", dda.GetName(), constants.DefaultClusterChecksRunnerResourceSuffix)
}

func clusterChecksRunnerImage() string {
Expand Down Expand Up @@ -160,9 +161,9 @@ func defaultPodSpec(dda metav1.Object, volumes []corev1.Volume, volumeMounts []c
Args: []string{
"agent run",
},
LivenessProbe: v2alpha1.GetDefaultLivenessProbe(),
ReadinessProbe: v2alpha1.GetDefaultReadinessProbe(),
StartupProbe: v2alpha1.GetDefaultStartupProbe(),
LivenessProbe: constants.GetDefaultLivenessProbe(),
ReadinessProbe: constants.GetDefaultReadinessProbe(),
StartupProbe: constants.GetDefaultStartupProbe(),
SecurityContext: &corev1.SecurityContext{
ReadOnlyRootFilesystem: apiutils.NewBoolPointer(true),
AllowPrivilegeEscalation: apiutils.NewBoolPointer(false),
Expand Down Expand Up @@ -191,7 +192,7 @@ func defaultEnvVars(dda metav1.Object) []corev1.EnvVar {
},
{
Name: v2alpha1.DDHealthPort,
Value: strconv.Itoa(int(v2alpha1.DefaultAgentHealthPort)),
Value: strconv.Itoa(int(constants.DefaultAgentHealthPort)),
},
{
Name: v2alpha1.KubernetesEnvVar,
Expand Down Expand Up @@ -266,7 +267,7 @@ func DefaultAffinity() *corev1.Affinity {
PodAffinityTerm: corev1.PodAffinityTerm{
LabelSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
apicommon.AgentDeploymentComponentLabelKey: v2alpha1.DefaultClusterChecksRunnerResourceSuffix,
apicommon.AgentDeploymentComponentLabelKey: constants.DefaultClusterChecksRunnerResourceSuffix,
},
},
TopologyKey: "kubernetes.io/hostname",
Expand Down
Loading

0 comments on commit 6eae617

Please sign in to comment.