diff --git a/controllers/zuul.go b/controllers/zuul.go index e117cdd3..c54d47f6 100644 --- a/controllers/zuul.go +++ b/controllers/zuul.go @@ -284,7 +284,7 @@ func mkZuulVolumes(service string, r *SFController, corporateCMExists bool) []ap }) // Install the logging settings config map resource - r.ensureZuulLoggingConfigMap() + r.EnsureConfigMap("zuul-logging", r.computeLoggingConfig()) volumes := []apiv1.Volume{ base.MkVolumeSecret("ca-cert"), @@ -348,7 +348,7 @@ func (r *SFController) getTenantsEnvs() []apiv1.EnvVar { } } -func (r *SFController) ensureZuulLoggingConfigMap() { +func (r *SFController) computeLoggingConfig() map[string]string { loggingData := make(map[string]string) zuulExecutorLogLevel := sfv1.InfoLogLevel @@ -407,16 +407,12 @@ func (r *SFController) ensureZuulLoggingConfigMap() { BaseURL: inputBaseURL, }) - r.EnsureConfigMap("zuul-logging", loggingData) - + return loggingData } func (r *SFController) getZuulLoggingString(service string) string { - var loggingcm apiv1.ConfigMap - if !r.GetM("zuul-logging-config-map", &loggingcm) { - return "" - } - return loggingcm.Data[service+"-logging.yaml"] + loggingData := r.computeLoggingConfig() + return loggingData[service+"-logging.yaml"] } func (r *SFController) EnsureZuulScheduler(cfg *ini.File) bool { diff --git a/doc/reference/CHANGELOG.md b/doc/reference/CHANGELOG.md index 71da6845..6c3843a9 100644 --- a/doc/reference/CHANGELOG.md +++ b/doc/reference/CHANGELOG.md @@ -12,6 +12,9 @@ All notable changes to this project will be documented in this file. ### Deprecated ### Removed ### Fixed + +- zuul: fix services not rollout after log level change + ### Security ## [v0.0.36] - 2024-08-14