diff --git a/controllers/libs/base/probes.go b/controllers/libs/base/probes.go index 74f1216..49a65d7 100644 --- a/controllers/libs/base/probes.go +++ b/controllers/libs/base/probes.go @@ -100,3 +100,8 @@ func MkStartupHTTPProbe(path string, port int) *apiv1.Probe { }} return mkStartupProbe(handler) } + +func SlowStartingProbe(probe *apiv1.Probe) { + probe.PeriodSeconds = 60 + probe.FailureThreshold = 60 +} diff --git a/controllers/zuul.go b/controllers/zuul.go index 597a346..e9938e2 100644 --- a/controllers/zuul.go +++ b/controllers/zuul.go @@ -546,6 +546,7 @@ func (r *SFController) EnsureZuulScheduler(cfg *ini.File) bool { zs.Spec.Template.Spec.Containers[0].ReadinessProbe = base.MkReadinessHTTPProbe("/health/ready", zuulPrometheusPort) zs.Spec.Template.Spec.Containers[0].LivenessProbe = base.MkLiveHTTPProbe("/health/live", zuulPrometheusPort) zs.Spec.Template.Spec.Containers[0].StartupProbe = base.MkStartupHTTPProbe("/health/ready", zuulPrometheusPort) + base.SlowStartingProbe(zs.Spec.Template.Spec.Containers[0].StartupProbe) zs.Spec.Template.Spec.Containers[0].Ports = []apiv1.ContainerPort{ base.MkContainerPort(zuulPrometheusPort, ZuulPrometheusPortName), } @@ -745,6 +746,7 @@ func (r *SFController) EnsureZuulWeb(cfg *ini.File) bool { zw.Spec.Template.Spec.Containers[0].ReadinessProbe = base.MkReadinessHTTPProbe("/api/info", zuulWEBPort) zw.Spec.Template.Spec.Containers[0].LivenessProbe = base.MkLiveHTTPProbe("/api/info", zuulWEBPort) zw.Spec.Template.Spec.Containers[0].StartupProbe = base.MkStartupHTTPProbe("/api/info", zuulWEBPort) + base.SlowStartingProbe(zw.Spec.Template.Spec.Containers[0].StartupProbe) zw.Spec.Template.Spec.Containers[0].Ports = []apiv1.ContainerPort{ base.MkContainerPort(zuulPrometheusPort, ZuulPrometheusPortName), } diff --git a/doc/reference/CHANGELOG.md b/doc/reference/CHANGELOG.md index bed5aee..01bab6a 100644 --- a/doc/reference/CHANGELOG.md +++ b/doc/reference/CHANGELOG.md @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file. ### Removed - log forwarding - remove support for the HTTP input. +- zuul - Increased Zuul Scheduler and Zuul Web Startup Probes Time ### Changed ### Fixed