Revert "Update liveness and readiness probes"

This reverts commit 4373f03.
DataDog · Jun 29, 2020 · 1b1d6ae · 1b1d6ae
1 parent 4373f03
commit 1b1d6ae
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 70 deletions.
diff --git a/pkg/apis/datadoghq/v1alpha1/const.go b/pkg/apis/datadoghq/v1alpha1/const.go
@@ -160,22 +160,13 @@ const (
 
 	// Liveness probe default config
 
-	DefaultLivenessProbeInitialDelaySeconds int32 = 15
-	DefaultLivenessProbePeriodSeconds       int32 = 15
-	DefaultLivenessProbeTimeoutSeconds      int32 = 5
-	DefaultLivenessProbeSuccessThreshold    int32 = 1
-	DefaultLivenessProbeFailureThreshold    int32 = 6
+	DefaultLivenessProveInitialDelaySeconds int32 = 15
+	DefaultLivenessProvePeriodSeconds       int32 = 15
+	DefaultLivenessProveTimeoutSeconds      int32 = 5
+	DefaultLivenessProveSuccessThreshold    int32 = 1
+	DefaultLivenessProveFailureThreshold    int32 = 6
 	DefaultAgentHealthPort                  int32 = 5555
-	DefaultLivenessProbeHTTPPath                  = "/live"
-
-	// Readiness probe default config
-
-	DefaultReadinessProbeInitialDelaySeconds int32 = 15
-	DefaultReadinessProbePeriodSeconds       int32 = 15
-	DefaultReadinessProbeTimeoutSeconds      int32 = 5
-	DefaultReadinessProbeSuccessThreshold    int32 = 1
-	DefaultReadinessProbeFailureThreshold    int32 = 6
-	DefaultReadinessProbeHTTPPath                  = "/ready"
+	DefaultLivenessProveHTTPPath                  = "/health"
 
 	// APM default values
 

diff --git a/pkg/controller/datadogagent/agent_test.go b/pkg/controller/datadogagent/agent_test.go
@@ -68,25 +68,7 @@ func defaultLivenessProbe() *corev1.Probe {
 		FailureThreshold:    6,
 		Handler: corev1.Handler{
 			HTTPGet: &corev1.HTTPGetAction{
-				Path: "/live",
-				Port: intstr.IntOrString{
-					IntVal: 5555,
-				},
-			},
-		},
-	}
-}
-
-func defaultReadinessProbe() *corev1.Probe {
-	return &corev1.Probe{
-		InitialDelaySeconds: 15,
-		PeriodSeconds:       15,
-		TimeoutSeconds:      5,
-		SuccessThreshold:    1,
-		FailureThreshold:    6,
-		Handler: corev1.Handler{
-			HTTPGet: &corev1.HTTPGetAction{
-				Path: "/ready",
+				Path: "/health",
 				Port: intstr.IntOrString{
 					IntVal: 5555,
 				},
@@ -330,10 +312,9 @@ func defaultPodSpec() corev1.PodSpec {
 						Protocol:      "UDP",
 					},
 				},
-				Env:            defaultEnvVars(),
-				VolumeMounts:   defaultMountVolume(),
-				LivenessProbe:  defaultLivenessProbe(),
-				ReadinessProbe: defaultReadinessProbe(),
+				Env:           defaultEnvVars(),
+				VolumeMounts:  defaultMountVolume(),
+				LivenessProbe: defaultLivenessProbe(),
 			},
 		},
 		Volumes: defaultVolumes(),

diff --git a/pkg/controller/datadogagent/clusterchecksrunner.go b/pkg/controller/datadogagent/clusterchecksrunner.go
@@ -262,7 +262,6 @@ func newClusterChecksRunnerPodTemplate(dda *datadoghqv1alpha1.DatadogAgent, labe
 					Env:             getEnvVarsForClusterChecksRunner(dda),
 					VolumeMounts:    getVolumeMountsForClusterChecksRunner(dda),
 					LivenessProbe:   getDefaultLivenessProbe(),
-					ReadinessProbe:  getDefaultReadinessProbe(),
 				},
 			},
 			Volumes:           getVolumesForClusterChecksRunner(dda),

diff --git a/pkg/controller/datadogagent/clusterchecksrunner_test.go b/pkg/controller/datadogagent/clusterchecksrunner_test.go
@@ -32,7 +32,6 @@ func clusterChecksRunnerDefaultPodSpec() corev1.PodSpec {
 				Env:             clusterChecksRunnerDefaultEnvVars(),
 				VolumeMounts:    clusterChecksRunnerDefaultVolumeMounts(),
 				LivenessProbe:   getDefaultLivenessProbe(),
-				ReadinessProbe:  getDefaultReadinessProbe(),
 			},
 		},
 		Volumes: clusterChecksRunnerDefaultVolumes(),

diff --git a/pkg/controller/datadogagent/utils.go b/pkg/controller/datadogagent/utils.go
@@ -193,10 +193,9 @@ func getAgentContainer(dda *datadoghqv1alpha1.DatadogAgent) (*corev1.Container,
 		Ports: []corev1.ContainerPort{
 			udpPort,
 		},
-		Env:            envVars,
-		VolumeMounts:   getVolumeMountsForAgent(&dda.Spec),
-		LivenessProbe:  getDefaultLivenessProbe(),
-		ReadinessProbe: getDefaultReadinessProbe(),
+		Env:           envVars,
+		VolumeMounts:  getVolumeMountsForAgent(&dda.Spec),
+		LivenessProbe: getDefaultLivenessProbe(),
 	}
 
 	return agentContainer, nil
@@ -1134,43 +1133,26 @@ func isCreateRBACEnabled(config datadoghqv1alpha1.RbacConfig) bool {
 
 func getDefaultLivenessProbe() *corev1.Probe {
 	livenessProbe := &corev1.Probe{
-		InitialDelaySeconds: datadoghqv1alpha1.DefaultLivenessProbeInitialDelaySeconds,
-		PeriodSeconds:       datadoghqv1alpha1.DefaultLivenessProbePeriodSeconds,
-		TimeoutSeconds:      datadoghqv1alpha1.DefaultLivenessProbeTimeoutSeconds,
-		SuccessThreshold:    datadoghqv1alpha1.DefaultLivenessProbeSuccessThreshold,
-		FailureThreshold:    datadoghqv1alpha1.DefaultLivenessProbeFailureThreshold,
+		InitialDelaySeconds: datadoghqv1alpha1.DefaultLivenessProveInitialDelaySeconds,
+		PeriodSeconds:       datadoghqv1alpha1.DefaultLivenessProvePeriodSeconds,
+		TimeoutSeconds:      datadoghqv1alpha1.DefaultLivenessProveTimeoutSeconds,
+		SuccessThreshold:    datadoghqv1alpha1.DefaultLivenessProveSuccessThreshold,
+		FailureThreshold:    datadoghqv1alpha1.DefaultLivenessProveFailureThreshold,
 	}
 	livenessProbe.HTTPGet = &corev1.HTTPGetAction{
-		Path: datadoghqv1alpha1.DefaultLivenessProbeHTTPPath,
+		Path: datadoghqv1alpha1.DefaultLivenessProveHTTPPath,
 		Port: intstr.IntOrString{
 			IntVal: datadoghqv1alpha1.DefaultAgentHealthPort,
 		},
 	}
 	return livenessProbe
 }
 
-func getDefaultReadinessProbe() *corev1.Probe {
-	readinessProbe := &corev1.Probe{
-		InitialDelaySeconds: datadoghqv1alpha1.DefaultReadinessProbeInitialDelaySeconds,
-		PeriodSeconds:       datadoghqv1alpha1.DefaultReadinessProbePeriodSeconds,
-		TimeoutSeconds:      datadoghqv1alpha1.DefaultReadinessProbeTimeoutSeconds,
-		SuccessThreshold:    datadoghqv1alpha1.DefaultReadinessProbeSuccessThreshold,
-		FailureThreshold:    datadoghqv1alpha1.DefaultReadinessProbeFailureThreshold,
-	}
-	readinessProbe.HTTPGet = &corev1.HTTPGetAction{
-		Path: datadoghqv1alpha1.DefaultReadinessProbeHTTPPath,
-		Port: intstr.IntOrString{
-			IntVal: datadoghqv1alpha1.DefaultAgentHealthPort,
-		},
-	}
-	return readinessProbe
-}
-
 func getDefaultAPMAgentLivenessProbe() *corev1.Probe {
 	livenessProbe := &corev1.Probe{
-		InitialDelaySeconds: datadoghqv1alpha1.DefaultLivenessProbeInitialDelaySeconds,
-		PeriodSeconds:       datadoghqv1alpha1.DefaultLivenessProbePeriodSeconds,
-		TimeoutSeconds:      datadoghqv1alpha1.DefaultLivenessProbeTimeoutSeconds,
+		InitialDelaySeconds: datadoghqv1alpha1.DefaultLivenessProveInitialDelaySeconds,
+		PeriodSeconds:       datadoghqv1alpha1.DefaultLivenessProvePeriodSeconds,
+		TimeoutSeconds:      datadoghqv1alpha1.DefaultLivenessProveTimeoutSeconds,
 	}
 	livenessProbe.TCPSocket = &corev1.TCPSocketAction{
 		Port: intstr.IntOrString{