From 52b5a3b1aef29d6c73ef8f875ccdf88b0682694e Mon Sep 17 00:00:00 2001 From: fserucas Date: Mon, 13 Nov 2023 15:30:53 +0000 Subject: [PATCH] Purgelogs container image based on UBI 9 Change-Id: I844334fe98596099094998243e05ef97f41ee821 --- controllers/libs/base/images.go | 2 +- controllers/logserver_controller.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/controllers/libs/base/images.go b/controllers/libs/base/images.go index eff32d46..c2636917 100644 --- 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 index d3c01ad1..64df9508 100644 --- 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?