Merge branch 'main' into levan-m/conductor_testing_branch

.gitlab-ci.yml

@@ -529,12 +529,11 @@ publish_nightly_workflow:
     CONDUCTOR_TARGET: $CONDUCTOR_TARGET
     DDR_WORKFLOW_ID: $DDR_WORKFLOW_ID
 
-# On success, this will cause CNAB to trigger a Deployment to Release Candidate clusters
+# On success, this will cause CNAB to trigger a Deployment to Release Candidate clusters and open a corresponding pull request
 publish_release_candidate_workflow:
   stage: deploy
   rules:
     - if: $CI_COMMIT_TAG
-      when: manual # TODO: change this to on_success when feeling confident
     - when: never
   needs:
     - trigger_internal_operator_image

api/datadoghq/common/envvar.go

@@ -154,6 +154,7 @@ const (
 	DDSecretBackendCommand                               = "DD_SECRET_BACKEND_COMMAND"
 	DDSecretBackendArguments                             = "DD_SECRET_BACKEND_ARGUMENTS"
 	DDSecretBackendTimeout                               = "DD_SECRET_BACKEND_TIMEOUT"
+	DDServiceDiscoveryEnabled                            = "DD_DISCOVERY_ENABLED"
 	DDSite                                               = "DD_SITE"
 	DDSystemProbeAgentEnabled                            = "DD_SYSTEM_PROBE_ENABLED"
 	DDSystemProbeBPFDebugEnabled                         = DDSystemProbeEnvPrefix + "BPF_DEBUG"

api/datadoghq/common/types.go

@@ -60,6 +60,8 @@ const (
 	SystemProbeContainerName AgentContainerName = "system-probe"
 	// OtelAgent is the name of the OTel container
 	OtelAgent AgentContainerName = "otel-agent"
+	// AgentDataPlaneContainerName is the name of the Agent Data Plane container
+	AgentDataPlaneContainerName AgentContainerName = "agent-data-plane"
 	// AllContainers is used internally to reference all containers in the pod
 	AllContainers AgentContainerName = "all"
 	// ClusterAgentContainerName is the name of the Cluster Agent container

api/datadoghq/v2alpha1/const.go

@@ -52,6 +52,21 @@ const (
 	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

api/datadoghq/v2alpha1/datadogagent_default.go

@@ -35,6 +35,8 @@ const (
 
 	defaultEBPFCheckEnabled bool = false
 
+	defaultServiceDiscoveryEnabled bool = false
+
 	defaultAPMEnabled                 bool   = true
 	defaultAPMHostPortEnabled         bool   = false
 	defaultAPMHostPort                int32  = 8126
@@ -243,6 +245,11 @@ func defaultFeaturesConfig(ddaSpec *DatadogAgentSpec) {
 	}
 	apiutils.DefaultBooleanIfUnset(&ddaSpec.Features.EBPFCheck.Enabled, defaultEBPFCheckEnabled)
 
+	if ddaSpec.Features.ServiceDiscovery == nil {
+		ddaSpec.Features.ServiceDiscovery = &ServiceDiscoveryFeatureConfig{}
+	}
+	apiutils.DefaultBooleanIfUnset(&ddaSpec.Features.ServiceDiscovery.Enabled, defaultServiceDiscoveryEnabled)
+
 	// APM Feature
 	// APM is enabled by default
 	if ddaSpec.Features.APM == nil {

api/datadoghq/v2alpha1/datadogagent_default_test.go

@@ -195,6 +195,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					APM: &APMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultAPMEnabled),
 						HostPortConfig: &HostPortConfig{
@@ -315,6 +318,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					APM: &APMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(valueFalse),
 					},
@@ -397,6 +403,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					APM: &APMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(valueFalse),
 					},
@@ -508,6 +517,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					APM: &APMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultAPMEnabled),
 						HostPortConfig: &HostPortConfig{
@@ -640,6 +652,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					APM: &APMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultAPMEnabled),
 						HostPortConfig: &HostPortConfig{
@@ -767,6 +782,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					APM: &APMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(valueTrue),
 						HostPortConfig: &HostPortConfig{
@@ -894,6 +912,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					APM: &APMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultAPMEnabled),
 						HostPortConfig: &HostPortConfig{
@@ -1030,6 +1051,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					APM: &APMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultAPMEnabled),
 						HostPortConfig: &HostPortConfig{
@@ -1157,6 +1181,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					APM: &APMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultAPMEnabled),
 						HostPortConfig: &HostPortConfig{
@@ -1287,6 +1314,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					APM: &APMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultAPMEnabled),
 						HostPortConfig: &HostPortConfig{
@@ -1444,6 +1474,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					CSPM: &CSPMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultCSPMEnabled),
 					},
@@ -1547,6 +1580,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					APM: &APMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultAPMEnabled),
 						HostPortConfig: &HostPortConfig{
@@ -1655,6 +1691,7 @@ func Test_defaultFeatures(t *testing.T) {
 					OOMKill:                 &OOMKillFeatureConfig{},
 					TCPQueueLength:          &TCPQueueLengthFeatureConfig{},
 					EBPFCheck:               &EBPFCheckFeatureConfig{},
+					ServiceDiscovery:        &ServiceDiscoveryFeatureConfig{},
 					APM:                     &APMFeatureConfig{},
 					ASM:                     &ASMFeatureConfig{},
 					CSPM:                    &CSPMFeatureConfig{},
@@ -1696,6 +1733,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					APM: &APMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultAPMEnabled),
 						HostPortConfig: &HostPortConfig{
@@ -1826,6 +1866,9 @@ func Test_defaultFeatures(t *testing.T) {
 					EBPFCheck: &EBPFCheckFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultEBPFCheckEnabled),
 					},
+					ServiceDiscovery: &ServiceDiscoveryFeatureConfig{
+						Enabled: apiutils.NewBoolPointer(defaultServiceDiscoveryEnabled),
+					},
 					APM: &APMFeatureConfig{
 						Enabled: apiutils.NewBoolPointer(defaultAPMEnabled),
 						HostPortConfig: &HostPortConfig{

api/datadoghq/v2alpha1/datadogagent_types.go

@@ -78,6 +78,8 @@ type DatadogFeatures struct {
 	RemoteConfiguration *RemoteConfigurationFeatureConfig `json:"remoteConfiguration,omitempty"`
 	// SBOM collection configuration.
 	SBOM *SBOMFeatureConfig `json:"sbom,omitempty"`
+	// ServiceDiscovery
+	ServiceDiscovery *ServiceDiscoveryFeatureConfig `json:"serviceDiscovery,omitempty"`
 
 	// Cluster-level features
 
@@ -486,6 +488,14 @@ type USMFeatureConfig struct {
 	Enabled *bool `json:"enabled,omitempty"`
 }
 
+// ServiceDiscoveryFeatureConfig configures the service discovery check feature.
+type ServiceDiscoveryFeatureConfig struct {
+	// Enables the service discovery check.
+	// Default: false
+	// +optional
+	Enabled *bool `json:"enabled,omitempty"`
+}
+
 // DogstatsdFeatureConfig contains the Dogstatsd configuration parameters.
 // +k8s:openapi-gen=true
 type DogstatsdFeatureConfig struct {

api/datadoghq/v2alpha1/utils.go

@@ -188,6 +188,42 @@ func GetDefaultTraceAgentProbe() *corev1.Probe {
 	return probe
 }
 
+// GetDefaultAgentDataPlaneLivenessProbe creates a defaulted liveness probe for Agent Data Plane
+func GetDefaultAgentDataPlaneLivenessProbe() *corev1.Probe {
+	livenessProbe := &corev1.Probe{
+		InitialDelaySeconds: DefaultADPLivenessProbeInitialDelaySeconds,
+		PeriodSeconds:       DefaultADPLivenessProbePeriodSeconds,
+		TimeoutSeconds:      DefaultADPLivenessProbeTimeoutSeconds,
+		SuccessThreshold:    DefaultADPLivenessProbeSuccessThreshold,
+		FailureThreshold:    DefaultADPLivenessProbeFailureThreshold,
+	}
+	livenessProbe.HTTPGet = &corev1.HTTPGetAction{
+		Path: DefaultLivenessProbeHTTPPath,
+		Port: intstr.IntOrString{
+			IntVal: DefaultADPHealthPort,
+		},
+	}
+	return livenessProbe
+}
+
+// GetDefaultAgentDataPlaneReadinessProbe creates a defaulted readiness probe for Agent Data Plane
+func GetDefaultAgentDataPlaneReadinessProbe() *corev1.Probe {
+	readinessProbe := &corev1.Probe{
+		InitialDelaySeconds: DefaultADPReadinessProbeInitialDelaySeconds,
+		PeriodSeconds:       DefaultADPReadinessProbePeriodSeconds,
+		TimeoutSeconds:      DefaultADPReadinessProbeTimeoutSeconds,
+		SuccessThreshold:    DefaultADPReadinessProbeSuccessThreshold,
+		FailureThreshold:    DefaultADPReadinessProbeFailureThreshold,
+	}
+	readinessProbe.HTTPGet = &corev1.HTTPGetAction{
+		Path: DefaultReadinessProbeHTTPPath,
+		Port: intstr.IntOrString{
+			IntVal: DefaultADPHealthPort,
+		},
+	}
+	return readinessProbe
+}
+
 // GetImage builds the image string based on ImageConfig and the registry configuration.
 func GetImage(imageSpec *AgentImageConfig, registry *string) string {
 	if defaulting.IsImageNameContainsTag(imageSpec.Name) {