controllers: small probe builder refactoring

it simplies code and allows to extend it later with additional probes configuration. Such as custom script checks.

Signed-off-by: f41gh7 <[email protected]>

internal/controller/operator/factory/build/container.go

@@ -37,32 +37,27 @@ func Probe(container corev1.Container, cr probeCRD) corev1.Container {
 		sp = ep.StartupProbe
 	}
 
-	if rp == nil {
-		readinessProbeHandler := corev1.ProbeHandler{
+	defaultProbeHandler := func() corev1.ProbeHandler {
+		return corev1.ProbeHandler{
 			HTTPGet: &corev1.HTTPGetAction{
 				Port:   intstr.Parse(port),
 				Scheme: corev1.URIScheme(scheme),
 				Path:   probePath(),
 			},
 		}
+	}
+	if rp == nil {
 		rp = &corev1.Probe{
-			ProbeHandler:     readinessProbeHandler,
+			ProbeHandler:     defaultProbeHandler(),
 			TimeoutSeconds:   probeTimeoutSeconds,
 			PeriodSeconds:    5,
 			FailureThreshold: 10,
 		}
 	}
 	if needAddLiveness {
 		if lp == nil {
-			probeHandler := corev1.ProbeHandler{
-				HTTPGet: &corev1.HTTPGetAction{
-					Port:   intstr.Parse(port),
-					Scheme: corev1.URIScheme(scheme),
-					Path:   probePath(),
-				},
-			}
 			lp = &corev1.Probe{
-				ProbeHandler:     probeHandler,
+				ProbeHandler:     defaultProbeHandler(),
 				TimeoutSeconds:   probeTimeoutSeconds,
 				FailureThreshold: 10,
 				PeriodSeconds:    5,