Merge pull request #77 from scitix/feat/remove-default-readiness-probe

remove default readiness probe for application

Author: nightmeng

internal/controller/arksapplication_controller.go

@@ -568,21 +568,6 @@ func generateLws(application *arksv1.ArksApplication, model *arksv1.ArksModel) (
 		})
 	}
 
-	readinessProbe := &corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
-			TCPSocket: &corev1.TCPSocketAction{
-				Port: intstr.FromInt32(8080),
-			},
-		},
-		InitialDelaySeconds: 15,
-		PeriodSeconds:       10,
-	}
-	if application.Spec.InstanceSpec.ReadinessProbe != nil {
-		readinessProbe = application.Spec.InstanceSpec.ReadinessProbe
-	}
-
-	livenessProbe := application.Spec.InstanceSpec.LivenessProbe
-
 	lws := &lwsapi.LeaderWorkerSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: application.Namespace,
@@ -648,8 +633,8 @@ func generateLws(application *arksv1.ArksApplication, model *arksv1.ArksModel) (
 										ContainerPort: 8080,
 									},
 								},
-								ReadinessProbe: readinessProbe,
-								LivenessProbe:  livenessProbe,
+								ReadinessProbe: application.Spec.InstanceSpec.ReadinessProbe,
+								LivenessProbe:  application.Spec.InstanceSpec.LivenessProbe,
 							},
 						},
 						Volumes: volumes,
@@ -775,21 +760,6 @@ func generateRBGS(application *arksv1.ArksApplication, model *arksv1.ArksModel)
 		})
 	}
 
-	readinessProbe := &corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
-			TCPSocket: &corev1.TCPSocketAction{
-				Port: intstr.FromInt32(8080),
-			},
-		},
-		InitialDelaySeconds: 15,
-		PeriodSeconds:       10,
-	}
-	if application.Spec.InstanceSpec.ReadinessProbe != nil {
-		readinessProbe = application.Spec.InstanceSpec.ReadinessProbe
-	}
-
-	livenessProbe := application.Spec.InstanceSpec.LivenessProbe
-
 	// Create the base pod spec
 	podSpec := corev1.PodSpec{
 		TerminationGracePeriodSeconds: application.Spec.InstanceSpec.TerminationGracePeriodSeconds,
@@ -840,8 +810,8 @@ func generateRBGS(application *arksv1.ArksApplication, model *arksv1.ArksModel)
 					},
 				},
 				SecurityContext: application.Spec.InstanceSpec.SecurityContext,
-				ReadinessProbe:  readinessProbe,
-				LivenessProbe:   livenessProbe,
+				ReadinessProbe:  application.Spec.InstanceSpec.ReadinessProbe,
+				LivenessProbe:   application.Spec.InstanceSpec.LivenessProbe,
 				StartupProbe:    application.Spec.InstanceSpec.StartupProbe,
 			},
 		},

internal/controller/arksdisaggregatedapplication_controller.go

@@ -1019,22 +1019,6 @@ func (r *ArksDisaggregatedApplicationReconciler) buildWorkloadRole(application *
 		workerCommands = workload.WorkerCommandOverride
 	}
 
-	readinessProbe := &corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
-			HTTPGet: &corev1.HTTPGetAction{
-				Path: "/health",
-				Port: intstr.FromInt(8080),
-			},
-		},
-		InitialDelaySeconds: 30,
-		PeriodSeconds:       10,
-		TimeoutSeconds:      3,
-		FailureThreshold:    120,
-	}
-	if workload.InstanceSpec.ReadinessProbe != nil {
-		readinessProbe = workload.InstanceSpec.ReadinessProbe
-	}
-
 	podSpec := corev1.PodSpec{
 		TerminationGracePeriodSeconds: workload.InstanceSpec.TerminationGracePeriodSeconds,
 		ActiveDeadlineSeconds:         workload.InstanceSpec.ActiveDeadlineSeconds,
@@ -1093,7 +1077,7 @@ func (r *ArksDisaggregatedApplicationReconciler) buildWorkloadRole(application *
 					Name:           "main",
 					Command:        leaderCommands,
 					Env:            leaderEnvs,
-					ReadinessProbe: readinessProbe,
+					ReadinessProbe: workload.InstanceSpec.ReadinessProbe,
 					LivenessProbe:  workload.InstanceSpec.LivenessProbe,
 					StartupProbe:   workload.InstanceSpec.StartupProbe,
 					Ports: []corev1.ContainerPort{
@@ -1427,22 +1411,6 @@ func (r *ArksDisaggregatedApplicationReconciler) generateDisaggregatedLws(applic
 		workerCommands = workload.WorkerCommandOverride
 	}
 
-	readinessProbe := &corev1.Probe{
-		ProbeHandler: corev1.ProbeHandler{
-			HTTPGet: &corev1.HTTPGetAction{
-				Path: "/health",
-				Port: intstr.FromInt(8080),
-			},
-		},
-		InitialDelaySeconds: 30,
-		PeriodSeconds:       10,
-		TimeoutSeconds:      3,
-		FailureThreshold:    120,
-	}
-	if workload.InstanceSpec.ReadinessProbe != nil {
-		readinessProbe = workload.InstanceSpec.ReadinessProbe
-	}
-
 	lws := &lwsapi.LeaderWorkerSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: application.Namespace,
@@ -1509,7 +1477,7 @@ func (r *ArksDisaggregatedApplicationReconciler) generateDisaggregatedLws(applic
 									},
 								},
 								SecurityContext: workload.InstanceSpec.SecurityContext,
-								ReadinessProbe:  readinessProbe,
+								ReadinessProbe:  workload.InstanceSpec.ReadinessProbe,
 								LivenessProbe:   workload.InstanceSpec.LivenessProbe,
 								StartupProbe:    workload.InstanceSpec.StartupProbe,
 							},