Use proper probe handlers

[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-15 13:14:57 -05:00
parent 134174095f
commit 365d81e48e

View File

@@ -70,11 +70,20 @@ func (b *Builder) buildDepPodTemplate(zitadel *zitadelv1alpha1.ZitadelCluster, l
} }
func (b *Builder) buildDepContainers(zitadel *zitadelv1alpha1.ZitadelCluster) *[]corev1.Container { func (b *Builder) buildDepContainers(zitadel *zitadelv1alpha1.ZitadelCluster) *[]corev1.Container {
probeHandle := corev1.ProbeHandler{ readyProbeHandle := corev1.ProbeHandler{
HTTPGet: &corev1.HTTPGetAction{HTTPHeaders: []corev1.HTTPHeader{}, HTTPGet: &corev1.HTTPGetAction{HTTPHeaders: []corev1.HTTPHeader{},
Port: intstr.FromInt(deployment.ZitadelPort), Port: intstr.FromInt(deployment.ZitadelPort),
Scheme: corev1.URISchemeHTTP, 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{ return &[]corev1.Container{
{ {
@@ -96,24 +105,17 @@ func (b *Builder) buildDepContainers(zitadel *zitadelv1alpha1.ZitadelCluster) *[
{Name: deployment.ZitadelName, ContainerPort: deployment.ZitadelPort}, {Name: deployment.ZitadelName, ContainerPort: deployment.ZitadelPort},
}, },
LivenessProbe: &corev1.Probe{ LivenessProbe: &corev1.Probe{
ProbeHandler: probeHandle, ProbeHandler: livenessProbeHandle,
FailureThreshold: 3, FailureThreshold: 10,
InitialDelaySeconds: 0, InitialDelaySeconds: 0,
PeriodSeconds: 5, PeriodSeconds: 5,
}, },
ReadinessProbe: &corev1.Probe{ ReadinessProbe: &corev1.Probe{
ProbeHandler: probeHandle, ProbeHandler: readyProbeHandle,
FailureThreshold: 3, FailureThreshold: 3,
InitialDelaySeconds: 0, InitialDelaySeconds: 0,
PeriodSeconds: 5, PeriodSeconds: 5,
}, },
StartupProbe: &corev1.Probe{
ProbeHandler: probeHandle,
FailureThreshold: 30,
InitialDelaySeconds: 0,
PeriodSeconds: 1,
},
Resources: zitadel.Spec.Resources, Resources: zitadel.Spec.Resources,
VolumeMounts: []corev1.VolumeMount{ VolumeMounts: []corev1.VolumeMount{
{Name: "zitadel-config-yaml", MountPath: "/config"}, {Name: "zitadel-config-yaml", MountPath: "/config"},