Merge "Change the way sf-operator set images names in annotations"

Microzuul CI · Gerrit Code Review · commit db4ce7e75617 · 2025-10-14T21:55:17.000Z
diff --git a/controllers/gateway.go b/controllers/gateway.go
@@ -7,6 +7,7 @@ package controllers
 
 import (
 	_ "embed"
+	"maps"
 
 	"github.com/softwarefactory-project/sf-operator/controllers/libs/base"
 	"github.com/softwarefactory-project/sf-operator/controllers/libs/logging"
@@ -33,12 +34,14 @@ func (r *SFController) DeployHTTPDGateway() bool {
 	})
 
 	annotations := map[string]string{
-		"image":       base.HTTPDImage(),
 		"config-hash": utils.Checksum([]byte(gatewayConfig)),
 		"serial":      "1",
 	}
 
 	dep := base.MkDeployment(ident, r.ns, base.HTTPDImage(), r.cr.Spec.ExtraLabels, r.isOpenShift)
+
+	maps.Copy(annotations, ImagesAnnotationsFromSpec(dep.Spec.Template.Spec.Containers))
+
 	dep.Spec.Template.ObjectMeta.Annotations = annotations
 	dep.Spec.Template.Spec.Volumes = []apiv1.Volume{
 		base.MkVolumeCM(ident, ident+"-config-map"),
diff --git a/controllers/git_server.go b/controllers/git_server.go
@@ -8,6 +8,7 @@ package controllers
 import (
 	_ "embed"
 	"fmt"
+	"maps"
 	"slices"
 	"strconv"
 	"strings"
@@ -272,7 +273,6 @@ func (r *SFController) DeployGitServer() bool {
 
 	annotations := map[string]string{
 		"config-hash": utils.Checksum([]byte(preInitScript)),
-		"image":       base.GitServerImage(),
 		"fqdn":        r.cr.Spec.FQDN,
 		"serial":      "3",
 	}
@@ -292,6 +292,7 @@ func (r *SFController) DeployGitServer() bool {
 	// Create the statefulset
 	storage := r.getStorageConfOrDefault(r.cr.Spec.GitServer.Storage)
 	sts := r.mkStatefulSet(GitServerIdent, base.GitServerImage(), storage, apiv1.ReadWriteOnce, r.cr.Spec.ExtraLabels, r.isOpenShift)
+	maps.Copy(annotations, ImagesAnnotationsFromSpec(sts.Spec.Template.Spec.Containers))
 	sts.Spec.Template.ObjectMeta.Annotations = annotations
 	GSVolumeMountsRO := []apiv1.VolumeMount{
 		{
diff --git a/controllers/hound-search.go b/controllers/hound-search.go
@@ -13,6 +13,7 @@ import (
 	apiv1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"maps"
 )
 
 const houndSearchIdent = "hound-search"
@@ -104,10 +105,12 @@ func (r *SFController) DeployHoundSearch() bool {
 	annotations := map[string]string{
 		"config-hash":                utils.Checksum([]byte(r.configBaseURL + r.cr.Spec.ConfigRepositoryLocation.Name)),
 		"corporate-ca-certs-version": getCMVersion(corporateCM, corporateCMExists),
-		"image":                      houndSearchImage,
 		"serial":                     "1",
 		"config-scripts":             utils.Checksum([]byte(houndSearchRender + houndSearchInit + houndSearchConfig)),
 	}
+
+	maps.Copy(annotations, ImagesAnnotationsFromSpec(sts.Spec.Template.Spec.Containers))
+
 	limits := v1.LimitsSpec{
 		CPU:    resource.MustParse("500m"),
 		Memory: resource.MustParse("2Gi"),
@@ -123,6 +126,7 @@ func (r *SFController) DeployHoundSearch() bool {
 	sts.Spec.Template.Spec.HostAliases = base.CreateHostAliases(r.cr.Spec.HostAliases)
 
 	sts.Spec.Template.ObjectMeta.Annotations = annotations
+
 	current, stsUpdated := r.ensureStatefulset(storage.StorageClassName, sts)
 
 	if stsUpdated {
diff --git a/controllers/logjuicer.go b/controllers/logjuicer.go
@@ -8,6 +8,7 @@ import (
 	"github.com/softwarefactory-project/sf-operator/controllers/libs/utils"
 	appsv1 "k8s.io/api/apps/v1"
 	apiv1 "k8s.io/api/core/v1"
+	"maps"
 )
 
 func (r *SFController) AddCorporateCA(spec *apiv1.PodSpec) string {
@@ -77,11 +78,11 @@ func (r *SFController) EnsureLogJuicer() bool {
 	}
 
 	dep.Spec.Template.ObjectMeta.Annotations = map[string]string{
-		"image":       base.LogJuicerImage(),
 		"config-hash": utils.Checksum([]byte(config)),
 		"serial":      "1",
 		"certs":       r.AddCorporateCA(&dep.Spec.Template.Spec),
 	}
+	maps.Copy(dep.Spec.Template.ObjectMeta.Annotations, ImagesAnnotationsFromSpec(dep.Spec.Template.Spec.Containers))
 	dep.Spec.Template.Spec.HostAliases = base.CreateHostAliases(r.cr.Spec.HostAliases)
 
 	// Reconcile deployment
diff --git a/controllers/logserver.go b/controllers/logserver.go
@@ -8,11 +8,11 @@ package controllers
 import (
 	_ "embed"
 	"encoding/base64"
+	"maps"
 	"strconv"
 
 	"k8s.io/utils/ptr"
 
-	"golang.org/x/exp/maps"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -296,11 +296,10 @@ func (r *SFController) DeployLogserver() bool {
 		"config-hash": utils.Checksum([]byte(logserverConf)),
 		"purgeLogConfig": "retentionDays:" + strconv.Itoa(r.cr.Spec.Logserver.RetentionDays) +
 			" loopDelay:" + strconv.Itoa(r.cr.Spec.Logserver.LoopDelay),
-		"httpd-image":     base.HTTPDImage(),
-		"purgelogs-image": base.PurgelogsImage(),
-		"sshd-image":      base.SSHDImage(),
-		"authorized-key":  utils.Checksum(pubKey),
+		"authorized-key": utils.Checksum(pubKey),
 	}
+	maps.Copy(sts.Spec.Template.ObjectMeta.Annotations, ImagesAnnotationsFromSpec(sts.Spec.Template.Spec.Containers))
+
 	sts.Spec.Template.Spec.HostAliases = base.CreateHostAliases(r.cr.Spec.HostAliases)
 
 	current, stsUpdated := r.ensureStatefulset(storage.StorageClassName, sts)
diff --git a/controllers/mariadb.go b/controllers/mariadb.go
@@ -8,6 +8,7 @@ package controllers
 import (
 	_ "embed"
 	"fmt"
+	"maps"
 	"strconv"
 
 	"github.com/go-sql-driver/mysql"
@@ -264,7 +265,7 @@ GRANT ALL ON *.* TO root@'%%' WITH GRANT OPTION;`,
 
 	annotations := map[string]string{
 		"serial": "6",
-		"image":  base.MariaDBImage(),
+
 		"limits": limitstr,
 	}
 	if r.cr.Spec.FluentBitLogForwarding != nil {
@@ -276,6 +277,7 @@ GRANT ALL ON *.* TO root@'%%' WITH GRANT OPTION;`,
 	statsExporter := sfmonitoring.MkNodeExporterSideCarContainer(MariaDBIdent, volumeMountsStatsExporter, r.isOpenShift)
 	sts.Spec.Template.Spec.Containers = append(sts.Spec.Template.Spec.Containers, statsExporter)
 
+	maps.Copy(annotations, ImagesAnnotationsFromSpec(sts.Spec.Template.Spec.Containers))
 	sts.Spec.Template.ObjectMeta.Annotations = annotations
 
 	sts.Spec.Template.Spec.HostAliases = base.CreateHostAliases(r.cr.Spec.HostAliases)
diff --git a/controllers/nodepool.go b/controllers/nodepool.go
@@ -6,6 +6,7 @@ package controllers
 
 import (
 	_ "embed"
+	"maps"
 	"strconv"
 
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
@@ -124,7 +125,6 @@ func createImageBuildLogForwarderSidecar(r *SFController, annotations map[string
 	sidecar, storageEmptyDir := logging.CreateFluentBitSideCarContainer("diskimage-builder", builderFluentBitLabels, volumeMounts, r.isOpenShift)
 	annotations["dib-fluent-bit.conf"] = utils.Checksum([]byte(fbForwarderConfig["fluent-bit.conf"]))
 	annotations["dib-fluent-bit-parser"] = utils.Checksum([]byte(fbForwarderConfig["parsers.conf"]))
-	annotations["dib-fluent-bit-image"] = sidecar.Image
 	return []apiv1.Volume{volume, storageEmptyDir}, sidecar
 
 }
@@ -518,7 +518,6 @@ func (r *SFController) DeployNodepoolBuilder(statsdExporterVolume apiv1.Volume,
 		"ssh_config":                 utils.Checksum([]byte(builderSSHConfig)),
 		"buildlogs_httpd_config":     utils.Checksum([]byte(httpdBuildLogsDirConfig)),
 		"statsd_mapping":             utils.Checksum([]byte(nodepoolStatsdMappingConfig)),
-		"image":                      base.NodepoolBuilderImage(),
 		"nodepool-providers-secrets": getSecretsVersion(providersSecrets, providerSecretsExists),
 		"serial":                     "18",
 		"corporate-ca-certs-version": getCMVersion(corporateCM, corporateCMExists),
@@ -585,6 +584,7 @@ func (r *SFController) DeployNodepoolBuilder(statsdExporterVolume apiv1.Volume,
 		nb.Spec.Template.Spec.Volumes = append(nb.Spec.Template.Spec.Volumes, fbVolumes...)
 	}
 
+	maps.Copy(annotations, ImagesAnnotationsFromSpec(nb.Spec.Template.Spec.Containers))
 	nb.Spec.Template.ObjectMeta.Annotations = annotations
 
 	// Append statsd exporter sidecar
@@ -715,7 +715,6 @@ func (r *SFController) DeployNodepoolLauncher(statsdExporterVolume apiv1.Volume,
 		"statsd_mapping":        utils.Checksum([]byte(nodepoolStatsdMappingConfig)),
 		"serial":                "12",
 		// When the Secret ResourceVersion field change (when edited) we force a nodepool-launcher restart
-		"image":                      base.NodepoolLauncherImage(),
 		"nodepool-providers-secrets": getSecretsVersion(providersSecrets, providerSecretsExists),
 		"corporate-ca-certs-version": getCMVersion(corporateCM, corporateCMExists),
 	}
@@ -778,6 +777,7 @@ func (r *SFController) DeployNodepoolLauncher(statsdExporterVolume apiv1.Volume,
 	nl.Spec.Template.Spec.Containers = []apiv1.Container{
 		container,
 		monitoring.MkStatsdExporterSideCarContainer(shortIdent, "statsd-config", relayAddress, r.isOpenShift)}
+	maps.Copy(annotations, ImagesAnnotationsFromSpec(nl.Spec.Template.Spec.Containers))
 	nl.Spec.Template.ObjectMeta.Annotations = annotations
 	nl.Spec.Template.Spec.Containers[0].ReadinessProbe = base.MkReadinessHTTPProbe("/ready", launcherPort)
 	nl.Spec.Template.Spec.Containers[0].LivenessProbe = base.MkLiveHTTPProbe("/ready", launcherPort)
diff --git a/controllers/utils.go b/controllers/utils.go
@@ -857,3 +857,11 @@ func RunPodCmdRaw(restConfig *rest.Config, kubeClientset *kubernetes.Clientset,
 func (r *SFUtilContext) RunPodCmd(podName string, containerName string, cmdArgs []string) (*bytes.Buffer, error) {
 	return RunPodCmdRaw(r.RESTConfig, r.ClientSet, r.ns, podName, containerName, cmdArgs)
 }
+
+func ImagesAnnotationsFromSpec(containers []apiv1.Container) map[string]string {
+	annotations := map[string]string{}
+	for _, container := range containers {
+		annotations["image/"+container.Name] = container.Image
+	}
+	return annotations
+}
diff --git a/controllers/weeder.go b/controllers/weeder.go
@@ -9,6 +9,7 @@ import (
 	"github.com/softwarefactory-project/sf-operator/controllers/libs/utils"
 	appsv1 "k8s.io/api/apps/v1"
 	apiv1 "k8s.io/api/core/v1"
+	"maps"
 )
 
 func (r *SFController) EnsureZuulWeeder(checksum string) bool {
@@ -23,11 +24,11 @@ func (r *SFController) EnsureZuulWeeder(checksum string) bool {
 	annotations := map[string]string{
 		"config-hash": checksum,
 		"serial":      "2",
-		"image":       base.ZuulWeederImage(),
 	}
 
 	dep := base.MkDeployment(ident, r.ns, base.ZuulWeederImage(), r.cr.Spec.ExtraLabels, r.isOpenShift)
 	dep.Spec.Template.Spec.Containers[0].ImagePullPolicy = "Always"
+	maps.Copy(annotations, ImagesAnnotationsFromSpec(dep.Spec.Template.Spec.Containers))
 	dep.Spec.Template.ObjectMeta.Annotations = annotations
 	dep.Spec.Template.Spec.Volumes = []apiv1.Volume{
 		base.MkEmptyDirVolume("weeder-tmp"),
diff --git a/controllers/zookeeper.go b/controllers/zookeeper.go
@@ -5,6 +5,7 @@ package controllers
 
 import (
 	_ "embed"
+	"maps"
 
 	"github.com/softwarefactory-project/sf-operator/controllers/libs/base"
 	"github.com/softwarefactory-project/sf-operator/controllers/libs/conds"
@@ -75,7 +76,6 @@ func (r *SFController) DeployZookeeper() bool {
 
 	annotations := map[string]string{
 		"config-hash": utils.Checksum([]byte(configChecksumable)),
-		"image":       base.ZookeeperImage(),
 		"serial":      "8",
 	}
 
@@ -170,6 +170,7 @@ func (r *SFController) DeployZookeeper() bool {
 	statsExporter := sfmonitoring.MkNodeExporterSideCarContainer(ZookeeperIdent, volumeMountsStatsExporter, r.isOpenShift)
 	zk.Spec.Template.Spec.Containers = append(zk.Spec.Template.Spec.Containers, statsExporter)
 
+	maps.Copy(annotations, ImagesAnnotationsFromSpec(zk.Spec.Template.Spec.Containers))
 	zk.Spec.Template.ObjectMeta.Annotations = annotations
 
 	zk.Spec.Template.Spec.HostAliases = base.CreateHostAliases(r.cr.Spec.HostAliases)
diff --git a/controllers/zuul.go b/controllers/zuul.go
@@ -7,12 +7,12 @@ import (
 	"bytes"
 	_ "embed"
 	"fmt"
+	"maps"
 	"regexp"
 	"sort"
 	"strconv"
 	"strings"
 
-	"golang.org/x/exp/maps"
 	ini "gopkg.in/ini.v1"
 	appsv1 "k8s.io/api/apps/v1"
 	apiv1 "k8s.io/api/core/v1"
@@ -454,9 +454,6 @@ func (r *SFController) EnsureZuulScheduler(cfg *ini.File) bool {
 	annotations := map[string]string{
 		"zuul-common-config":         utils.IniSectionsChecksum(cfg, commonIniConfigSections),
 		"zuul-component-config":      utils.IniSectionsChecksum(cfg, sections),
-		"image":                      getZuulImage("zuul-scheduler"),
-		"statsd-image":               base.StatsdExporterImage(),
-		"node-exporter-image":        base.NodeExporterImage(),
 		"statsd_mapping":             utils.Checksum([]byte(zuulStatsdMappingConfig)),
 		"serial":                     "12",
 		"zuul-logging":               utils.Checksum([]byte(r.getZuulLoggingString("zuul-scheduler"))),
@@ -534,7 +531,6 @@ func (r *SFController) EnsureZuulScheduler(cfg *ini.File) bool {
 
 	zsStorage := r.getStorageConfOrDefault(r.cr.Spec.Zuul.Scheduler.Storage)
 	zs := r.mkStatefulSet("zuul-scheduler", "", zsStorage, apiv1.ReadWriteOnce, r.cr.Spec.ExtraLabels, r.isOpenShift)
-	zs.Spec.Template.ObjectMeta.Annotations = annotations
 	zs.Spec.Template.Spec.InitContainers = []apiv1.Container{initContainer}
 	zs.Spec.Template.Spec.Containers = zuulContainers
 	zs.Spec.Template.Spec.Volumes = zsVolumes
@@ -550,6 +546,9 @@ func (r *SFController) EnsureZuulScheduler(cfg *ini.File) bool {
 	}
 	zs.Spec.Template.Spec.HostAliases = base.CreateHostAliases(r.cr.Spec.HostAliases)
 
+	maps.Copy(annotations, ImagesAnnotationsFromSpec(zs.Spec.Template.Spec.Containers))
+	zs.Spec.Template.ObjectMeta.Annotations = annotations
+
 	// Mount a local directory in place of the Zuul source from the container image
 	if path, _ := utils.GetEnvVarValue("ZUUL_LOCAL_SOURCE"); path != "" {
 		enableZuulLocalSource(&zs.Spec.Template, path, true, r.isOpenShift)
@@ -581,7 +580,6 @@ func (r *SFController) EnsureZuulExecutor(cfg *ini.File) bool {
 	annotations := map[string]string{
 		"zuul-common-config":         utils.IniSectionsChecksum(cfg, commonIniConfigSections),
 		"zuul-component-config":      utils.IniSectionsChecksum(cfg, sections),
-		"image":                      getZuulImage("zuul-executor"),
 		"serial":                     "11",
 		"zuul-logging":               utils.Checksum([]byte(r.getZuulLoggingString("zuul-executor"))),
 		"zuul-connections":           utils.IniSectionsChecksum(cfg, utils.IniGetSectionNamesByPrefix(cfg, "connection")),
@@ -600,6 +598,7 @@ func (r *SFController) EnsureZuulExecutor(cfg *ini.File) bool {
 	extraLoggingEnvVars := logging.SetupLogForwarding("zuul-executor", r.cr.Spec.FluentBitLogForwarding, zeFluentBitLabels, annotations)
 	ze.Spec.Template.Spec.Containers[0].Env = append(ze.Spec.Template.Spec.Containers[0].Env, extraLoggingEnvVars...)
 
+	maps.Copy(annotations, ImagesAnnotationsFromSpec(ze.Spec.Template.Spec.Containers))
 	ze.Spec.Template.ObjectMeta.Annotations = annotations
 
 	ze.Spec.Template.Spec.Containers[0].ReadinessProbe = base.MkReadinessHTTPProbe("/health/ready", zuulPrometheusPort)
@@ -686,7 +685,6 @@ func (r *SFController) EnsureZuulMerger(cfg *ini.File) bool {
 	annotations := map[string]string{
 		"zuul-common-config":         utils.IniSectionsChecksum(cfg, commonIniConfigSections),
 		"zuul-component-config":      utils.IniSectionsChecksum(cfg, sections),
-		"image":                      getZuulImage(service),
 		"serial":                     "8",
 		"zuul-connections":           utils.IniSectionsChecksum(cfg, utils.IniGetSectionNamesByPrefix(cfg, "connection")),
 		"zuul-logging":               utils.Checksum([]byte(r.getZuulLoggingString("zuul-merger"))),
@@ -714,6 +712,8 @@ func (r *SFController) EnsureZuulMerger(cfg *ini.File) bool {
 		}, r.isOpenShift)
 	zm.Spec.Template.Spec.Containers = append(zm.Spec.Template.Spec.Containers, nodeExporterSidecar)
 
+	maps.Copy(annotations, ImagesAnnotationsFromSpec(zm.Spec.Template.Spec.Containers))
+
 	zm.Spec.Template.ObjectMeta.Annotations = annotations
 
 	if !r.isOpenShift {
@@ -756,7 +756,6 @@ func (r *SFController) EnsureZuulWeb(cfg *ini.File) bool {
 	annotations := map[string]string{
 		"zuul-common-config":         utils.IniSectionsChecksum(cfg, commonIniConfigSections),
 		"zuul-component-config":      utils.IniSectionsChecksum(cfg, sections),
-		"image":                      getZuulImage("zuul-web"),
 		"serial":                     "9",
 		"zuul-logging":               utils.Checksum([]byte(r.getZuulLoggingString("zuul-web"))),
 		"zuul-connections":           utils.IniSectionsChecksum(cfg, utils.IniGetSectionNamesByPrefix(cfg, "connection")),
@@ -773,6 +772,7 @@ func (r *SFController) EnsureZuulWeb(cfg *ini.File) bool {
 	extraLoggingEnvVars := logging.SetupLogForwarding("zuul-web", r.cr.Spec.FluentBitLogForwarding, zwFluentBitLabels, annotations)
 	zw.Spec.Template.Spec.Containers[0].Env = append(zw.Spec.Template.Spec.Containers[0].Env, extraLoggingEnvVars...)
 
+	maps.Copy(annotations, ImagesAnnotationsFromSpec(zw.Spec.Template.Spec.Containers))
 	zw.Spec.Template.ObjectMeta.Annotations = annotations
 
 	if !r.isOpenShift {
@@ -869,7 +869,7 @@ func (r *SFController) EnsureZuulComponents() bool {
 	zuulServices["web"] = r.EnsureZuulWeb(cfg)
 	zuulServices["merger"] = r.EnsureZuulMerger(cfg)
 
-	for _, ready := range maps.Values(zuulServices) {
+	for ready := range maps.Values(zuulServices) {
 		if !ready {
 			return false
 		}

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`"github.com/softwarefactory-project/sf-operator/controllers/libs/utils"`
`9`	`9`	`appsv1 "k8s.io/api/apps/v1"`
`10`	`10`	`apiv1 "k8s.io/api/core/v1"`
	`11`	`+ "maps"`
`11`	`12`	`)`
`12`	`13`
`13`	`14`	`func (r SFController) AddCorporateCA(spec apiv1.PodSpec) string {`
`@@ -77,11 +78,11 @@ func (r *SFController) EnsureLogJuicer() bool {`
`77`	`78`	`}`
`78`	`79`
`79`	`80`	`dep.Spec.Template.ObjectMeta.Annotations = map[string]string{`
`80`		`- "image": base.LogJuicerImage(),`
`81`	`81`	`"config-hash": utils.Checksum([]byte(config)),`
`82`	`82`	`"serial": "1",`
`83`	`83`	`"certs": r.AddCorporateCA(&dep.Spec.Template.Spec),`
`84`	`84`	`}`
	`85`	`+ maps.Copy(dep.Spec.Template.ObjectMeta.Annotations, ImagesAnnotationsFromSpec(dep.Spec.Template.Spec.Containers))`
`85`	`86`	`dep.Spec.Template.Spec.HostAliases = base.CreateHostAliases(r.cr.Spec.HostAliases)`
`86`	`87`
`87`	`88`	`// Reconcile deployment`