[release-1.26] Set stable OLM channels and image tags (#828)

Signed-off-by: Filip Brychta <[email protected]>

Author: FilipB

.github/workflows/release.yaml

@@ -9,7 +9,7 @@ on:
       bundle_channels:
         description: "Bundle channels"
         required: true
-        default: dev-1.26
+        default: stable,stable-1.26
       is_draft_release:
         description: "Draft release"
         type: boolean

Makefile.core.mk

@@ -67,8 +67,8 @@ endif
 
 # Image hub to use
 HUB ?= quay.io/sail-dev
-# Image tag to use
-TAG ?= ${MINOR_VERSION}-latest
+# Image tag to use. On release branches this should be the VERSION.
+TAG ?= ${VERSION}
 # Image base to use
 IMAGE_BASE ?= sail-operator
 # Image URL to use all building/pushing image targets
@@ -95,9 +95,10 @@ GINKGO_FLAGS ?= $(if $(VERBOSE),-v) $(if $(CI),--no-color) $(if $(COVERAGE),-cov
 # To re-generate a bundle for other specific channels without changing the standard setup, you can:
 # - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable)
 # - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable")
-CHANNEL_PREFIX := dev
+CHANNEL_PREFIX := stable
+DEFAULT_CHANNEL := stable
 
-CHANNELS ?= $(CHANNEL_PREFIX)-$(MINOR_VERSION)
+CHANNELS := $(DEFAULT_CHANNEL),$(CHANNEL_PREFIX)-$(MINOR_VERSION)
 ifneq ($(origin CHANNELS), undefined)
 BUNDLE_CHANNELS = --channels=\"$(CHANNELS)\"
 endif

bundle.Dockerfile

@@ -5,7 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=sailoperator
-LABEL operators.operatorframework.io.bundle.channels.v1="dev-1.26"
+LABEL operators.operatorframework.io.bundle.channels.v1="stable,stable-1.26"
+LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.39.2
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4

bundle/manifests/sailoperator.clusterserviceversion.yaml

@@ -33,8 +33,8 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     categories: OpenShift Optional, Integration & Delivery, Networking, Security
-    containerImage: quay.io/sail-dev/sail-operator:1.26-latest
-    createdAt: "2025-05-16T15:47:48Z"
+    containerImage: quay.io/sail-dev/sail-operator:1.26.0
+    createdAt: "2025-05-20T14:15:14Z"
     description: Experimental operator for installing Istio service mesh
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "true"
@@ -760,7 +760,7 @@ spec:
                 - --zap-log-level=info
                 command:
                 - /sail-operator
-                image: quay.io/sail-dev/sail-operator:1.26-latest
+                image: quay.io/sail-dev/sail-operator:1.26.0
                 livenessProbe:
                   httpGet:
                     path: /healthz

bundle/metadata/annotations.yaml

@@ -4,7 +4,8 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: sailoperator
-  operators.operatorframework.io.bundle.channels.v1: "dev-1.26"
+  operators.operatorframework.io.bundle.channels.v1: "stable,stable-1.26"
+  operators.operatorframework.io.bundle.channel.default.v1: stable
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.39.2
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4

chart/values.yaml

@@ -61,7 +61,7 @@ csv:
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "true"
     features.operators.openshift.io/csi: "false"
-image: quay.io/sail-dev/sail-operator:1.26-latest
+image: quay.io/sail-dev/sail-operator:1.26.0
 # We're commenting out the imagePullPolicy to use k8s defaults
 # imagePullPolicy: Always
 operator: