Merge "zuul-merger: fix CRD logLevel parameter not handled correctly"

softwarefactory-project · Jun 17, 2024 · d729d19 · d729d19
2 parents 4a778a4 + a2bdc22
commit d729d19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/controllers/zuul.go b/controllers/zuul.go
@@ -352,7 +352,7 @@ func (r *SFController) ensureZuulLoggingConfigMap() {
 		zuulWebLogLevel = r.cr.Spec.Zuul.Web.LogLevel
 	}
 	if r.cr.Spec.Zuul.Merger.LogLevel != "" {
-		zuulMergerLogLevel = r.cr.Spec.Zuul.Web.LogLevel
+		zuulMergerLogLevel = r.cr.Spec.Zuul.Merger.LogLevel
 	}
 	var forwardLogs = false
 	var inputBaseURL = ""
@@ -625,6 +625,7 @@ func (r *SFController) EnsureZuulMerger(cfg *ini.File) bool {
 		"zuul-image":                 getZuulImage(service),
 		"serial":                     "5",
 		"zuul-connections":           utils.IniSectionsChecksum(cfg, utils.IniGetSectionNamesByPrefix(cfg, "connection")),
+		"zuul-logging":               utils.Checksum([]byte(r.getZuulLoggingString("zuul-merger"))),
 		"corporate-ca-certs-version": getCMVersion(corporateCM, corporateCMExists),
 	}
 

diff --git a/doc/reference/CHANGELOG.md b/doc/reference/CHANGELOG.md
@@ -11,6 +11,9 @@ All notable changes to this project will be documented in this file.
 ### Deprecated
 ### Removed
 ### Fixed
+
+- zuul-merger: CRD logLevel parameter not handled correctly
+
 ### Security
 
 - Update of components base container images to addess several base OS security issues