update default liveness and readiness probes (#949)

* update default liveness and readiness probes * rm readiness probe from trace agent
DataDog · Oct 16, 2023 · 3851153 · 3851153
1 parent a033175
commit 3851153
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 34 deletions.
diff --git a/apis/datadoghq/common/common.go b/apis/datadoghq/common/common.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
-// GetDefaultLivenessProbe creates a all defaulted LivenessProbe
+// GetDefaultLivenessProbe creates a defaulted LivenessProbe
 func GetDefaultLivenessProbe() *corev1.Probe {
 	livenessProbe := &corev1.Probe{
 		InitialDelaySeconds: DefaultLivenessProbeInitialDelaySeconds,
@@ -30,7 +30,7 @@ func GetDefaultLivenessProbe() *corev1.Probe {
 	return livenessProbe
 }
 
-// GetDefaultReadinessProbe creates a all defaulted ReadynessProbe
+// GetDefaultReadinessProbe creates a defaulted ReadinessProbe
 func GetDefaultReadinessProbe() *corev1.Probe {
 	readinessProbe := &corev1.Probe{
 		InitialDelaySeconds: DefaultReadinessProbeInitialDelaySeconds,
@@ -48,6 +48,21 @@ func GetDefaultReadinessProbe() *corev1.Probe {
 	return readinessProbe
 }
 
+// GetDefaultTraceAgentProbe creates a defaulted liveness/readiness probe for the Trace Agent
+func GetDefaultTraceAgentProbe() *corev1.Probe {
+	probe := &corev1.Probe{
+		InitialDelaySeconds: DefaultLivenessProbeInitialDelaySeconds,
+		PeriodSeconds:       DefaultLivenessProbePeriodSeconds,
+		TimeoutSeconds:      DefaultLivenessProbeTimeoutSeconds,
+	}
+	probe.TCPSocket = &corev1.TCPSocketAction{
+		Port: intstr.IntOrString{
+			IntVal: DefaultApmPort,
+		},
+	}
+	return probe
+}
+
 // GetImage builds the image string based on ImageConfig and the registry configuration.
 func GetImage(imageSpec *commonv1.AgentImageConfig, registry *string) string {
 	if defaulting.IsImageNameContainsTag(imageSpec.Name) {

diff --git a/apis/datadoghq/v1alpha1/datadogagent_default.go b/apis/datadoghq/v1alpha1/datadogagent_default.go
@@ -551,7 +551,7 @@ func DefaultDatadogAgentSpecAgentApm(agent *DatadogAgentSpecAgentSpec) *APMSpec
 	}
 
 	if agent.Apm.LivenessProbe == nil {
-		agent.Apm.LivenessProbe = getDefaultAPMAgentLivenessProbe()
+		agent.Apm.LivenessProbe = apicommon.GetDefaultTraceAgentProbe()
 		apmOverride.LivenessProbe = agent.Apm.LivenessProbe
 	}
 
@@ -562,20 +562,6 @@ func DefaultDatadogAgentSpecAgentApm(agent *DatadogAgentSpecAgentSpec) *APMSpec
 	return apmOverride
 }
 
-func getDefaultAPMAgentLivenessProbe() *corev1.Probe {
-	livenessProbe := &corev1.Probe{
-		InitialDelaySeconds: apicommon.DefaultLivenessProbeInitialDelaySeconds,
-		PeriodSeconds:       apicommon.DefaultLivenessProbePeriodSeconds,
-		TimeoutSeconds:      apicommon.DefaultLivenessProbeTimeoutSeconds,
-	}
-	livenessProbe.TCPSocket = &corev1.TCPSocketAction{
-		Port: intstr.IntOrString{
-			IntVal: defaultApmHostPort,
-		},
-	}
-	return livenessProbe
-}
-
 // DefaultDatadogAgentSpecAgentApmUDS used to default APMUnixDomainSocketSpec
 // rreturn the defaulted APMUnixDomainSocketSpec
 func DefaultDatadogAgentSpecAgentApmUDS(apm *APMSpec) *APMUnixDomainSocketSpec {

diff --git a/apis/datadoghq/v1alpha1/datadogagent_default_test.go b/apis/datadoghq/v1alpha1/datadogagent_default_test.go
@@ -1034,7 +1034,7 @@ func TestDefaultDatadogAgentSpecAgentApm(t *testing.T) {
 			want: &APMSpec{
 				HostPort:         apiutils.NewInt32Pointer(8126),
 				UnixDomainSocket: &APMUnixDomainSocketSpec{Enabled: apiutils.NewBoolPointer(false)},
-				LivenessProbe:    getDefaultAPMAgentLivenessProbe(),
+				LivenessProbe:    apicommon.GetDefaultTraceAgentProbe(),
 			},
 		},
 	}

diff --git a/controllers/datadogagent/component/agent/default.go b/controllers/datadogagent/component/agent/default.go
@@ -140,10 +140,9 @@ func traceAgentContainer(dda metav1.Object) corev1.Container {
 			"trace-agent",
 			fmt.Sprintf("--config=%s", apicommon.AgentCustomConfigVolumePath),
 		},
-		Env:            commonEnvVars(dda),
-		VolumeMounts:   volumeMountsForTraceAgent(),
-		LivenessProbe:  apicommon.GetDefaultLivenessProbe(),
-		ReadinessProbe: apicommon.GetDefaultReadinessProbe(),
+		Env:           commonEnvVars(dda),
+		VolumeMounts:  volumeMountsForTraceAgent(),
+		LivenessProbe: apicommon.GetDefaultTraceAgentProbe(),
 	}
 }
 
@@ -155,10 +154,8 @@ func processAgentContainer(dda metav1.Object) corev1.Container {
 			"process-agent", fmt.Sprintf("--config=%s", apicommon.AgentCustomConfigVolumePath),
 			fmt.Sprintf("--sysprobe-config=%s", apicommon.SystemProbeConfigVolumePath),
 		},
-		Env:            commonEnvVars(dda),
-		VolumeMounts:   volumeMountsForProcessAgent(),
-		LivenessProbe:  apicommon.GetDefaultLivenessProbe(),
-		ReadinessProbe: apicommon.GetDefaultReadinessProbe(),
+		Env:          commonEnvVars(dda),
+		VolumeMounts: volumeMountsForProcessAgent(),
 	}
 }
 
@@ -170,10 +167,8 @@ func securityAgentContainer(dda metav1.Object) corev1.Container {
 			"security-agent",
 			"start", fmt.Sprintf("-c=%s", apicommon.AgentCustomConfigVolumePath),
 		},
-		Env:            envVarsForSecurityAgent(dda),
-		VolumeMounts:   volumeMountsForSecurityAgent(),
-		LivenessProbe:  apicommon.GetDefaultLivenessProbe(),
-		ReadinessProbe: apicommon.GetDefaultReadinessProbe(),
+		Env:          envVarsForSecurityAgent(dda),
+		VolumeMounts: volumeMountsForSecurityAgent(),
 	}
 }
 
@@ -185,10 +180,8 @@ func systemProbeContainer(dda metav1.Object) corev1.Container {
 			"system-probe",
 			fmt.Sprintf("--config=%s", apicommon.SystemProbeConfigVolumePath),
 		},
-		Env:            commonEnvVars(dda),
-		VolumeMounts:   volumeMountsForSystemProbe(),
-		LivenessProbe:  apicommon.GetDefaultLivenessProbe(),
-		ReadinessProbe: apicommon.GetDefaultReadinessProbe(),
+		Env:          commonEnvVars(dda),
+		VolumeMounts: volumeMountsForSystemProbe(),
 		SecurityContext: &corev1.SecurityContext{
 			SeccompProfile: &corev1.SeccompProfile{
 				Type:             corev1.SeccompProfileTypeLocalhost,