From 365d81e48e5ae2cfa76b7376192ed2267808cedb Mon Sep 17 00:00:00 2001
From: Haim Kortovich <haim.kortovich@topmanage.com>
Date: Wed, 15 May 2024 13:14:57 -0500
Subject: [PATCH] Use proper probe handlers

[ZITADOPER-1]
---
 src/pkg/builder/deployment_builder.go | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/pkg/builder/deployment_builder.go b/src/pkg/builder/deployment_builder.go
index 98fffe9..9104adf 100644
--- a/src/pkg/builder/deployment_builder.go
+++ b/src/pkg/builder/deployment_builder.go
@@ -70,11 +70,20 @@ func (b *Builder) buildDepPodTemplate(zitadel *zitadelv1alpha1.ZitadelCluster, l
 }
 
 func (b *Builder) buildDepContainers(zitadel *zitadelv1alpha1.ZitadelCluster) *[]corev1.Container {
-	probeHandle := corev1.ProbeHandler{
+	readyProbeHandle := corev1.ProbeHandler{
 		HTTPGet: &corev1.HTTPGetAction{HTTPHeaders: []corev1.HTTPHeader{},
 			Port:   intstr.FromInt(deployment.ZitadelPort),
 			Scheme: corev1.URISchemeHTTP,
-		}}
+			Path:   "/debug/ready",
+		},
+	}
+	livenessProbeHandle := corev1.ProbeHandler{
+		HTTPGet: &corev1.HTTPGetAction{HTTPHeaders: []corev1.HTTPHeader{},
+			Port:   intstr.FromInt(deployment.ZitadelPort),
+			Scheme: corev1.URISchemeHTTP,
+			Path:   "/debug/healthz",
+		},
+	}
 
 	return &[]corev1.Container{
 		{
@@ -96,24 +105,17 @@ func (b *Builder) buildDepContainers(zitadel *zitadelv1alpha1.ZitadelCluster) *[
 				{Name: deployment.ZitadelName, ContainerPort: deployment.ZitadelPort},
 			},
 			LivenessProbe: &corev1.Probe{
-				ProbeHandler:        probeHandle,
-				FailureThreshold:    3,
+				ProbeHandler:        livenessProbeHandle,
+				FailureThreshold:    10,
 				InitialDelaySeconds: 0,
 				PeriodSeconds:       5,
 			},
 			ReadinessProbe: &corev1.Probe{
-				ProbeHandler:        probeHandle,
+				ProbeHandler:        readyProbeHandle,
 				FailureThreshold:    3,
 				InitialDelaySeconds: 0,
 				PeriodSeconds:       5,
 			},
-
-			StartupProbe: &corev1.Probe{
-				ProbeHandler:        probeHandle,
-				FailureThreshold:    30,
-				InitialDelaySeconds: 0,
-				PeriodSeconds:       1,
-			},
 			Resources: zitadel.Spec.Resources,
 			VolumeMounts: []corev1.VolumeMount{
 				{Name: "zitadel-config-yaml", MountPath: "/config"},