Purgelogs container image based on UBI 9

Change-Id: I844334fe98596099094998243e05ef97f41ee821
softwarefactory-project · Nov 15, 2023 · 52b5a3b · 52b5a3b
1 parent 118622e
commit 52b5a3b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/controllers/libs/base/images.go b/controllers/libs/base/images.go
@@ -23,7 +23,7 @@ var (
 	GerritImage           = ImageToString(Image{Path: "quay.io/software-factory/gerrit", Version: "3.6.4-8"})
 	GitServerImage        = ImageToString(Image{Path: "quay.io/software-factory/git-deamon", Version: "2.39.1-3"})
 	SSHDImage             = ImageToString(Image{Path: "quay.io/software-factory/sshd", Version: "0.1-2"})
-	PurgeLogsImage        = ImageToString(Image{Path: "quay.io/software-factory/purgelogs", Version: "0.2.3-2"})
+	PurgeLogsImage        = ImageToString(Image{Path: "quay.io/software-factory/purgelogs", Version: "0.2.3-3"})
 	NodepoolLauncherImage = ImageToString(Image{Path: "quay.io/software-factory/nodepool-launcher", Version: nodepoolImageVersion})
 	NodepoolBuilderImage  = ImageToString(Image{Path: "quay.io/software-factory/nodepool-builder", Version: nodepoolImageVersion})
 	MariabDBImage         = ImageToString(Image{Path: "quay.io/software-factory/mariadb", Version: "10.5.16-4"})

diff --git a/controllers/logserver_controller.go b/controllers/logserver_controller.go
@@ -338,10 +338,13 @@ func (r *LogServerController) DeployLogserver() sfv1.LogServerStatus {
 	// Increase serial each time you need to enforce a deployment change/pod restart between operator versions
 	annotations := map[string]string{
 		"fqdn":       r.cr.Spec.FQDN,
-		"serial":     "3",
+		"serial":     "4",
 		"httpd-conf": utils.Checksum([]byte(logserverConf)),
 		"purgeLogConfig": "retentionDays:" + strconv.Itoa(r.cr.Spec.Settings.RetentionDays) +
 			" loopDelay:" + strconv.Itoa(r.cr.Spec.Settings.LoopDelay),
+		"httpd-image":     base.HTTPDImage,
+		"purgelogs-image": base.PurgeLogsImage,
+		"sshd-image":      base.SSHDImage,
 	}
 
 	// do we have an existing deployment?