Continue using the stable channel but also have Y stream channels

Relates: https://issues.redhat.com/browse/ACM-7906 Signed-off-by: mprahl <[email protected]>
stolostron · Oct 12, 2023 · 393b15f · 393b15f
1 parent eb4ad5a
commit 393b15f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ get-replaces-version:
 # 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")
-CHANNELS ?= 3.11
+CHANNELS ?= stable,3.11
 ifneq ($(origin CHANNELS), undefined)
   BUNDLE_CHANNELS := --channels=$(CHANNELS)
 endif
@@ -39,7 +39,7 @@ endif
 # To re-generate a bundle for any other default channel without changing the default setup, you can:
 # - use the DEFAULT_CHANNEL as arg of the bundle target (e.g make bundle DEFAULT_CHANNEL=stable)
 # - use environment variables to overwrite this value (e.g export DEFAULT_CHANNEL="stable")
-DEFAULT_CHANNEL ?= 3.11
+DEFAULT_CHANNEL ?= stable
 ifneq ($(origin DEFAULT_CHANNEL), undefined)
   BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL)
 endif

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -5,8 +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=gatekeeper-operator
-LABEL operators.operatorframework.io.bundle.channels.v1=3.11
-LABEL operators.operatorframework.io.bundle.channel.default.v1=3.11
+LABEL operators.operatorframework.io.bundle.channels.v1=stable,3.11
+LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.1
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -4,8 +4,8 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: gatekeeper-operator
-  operators.operatorframework.io.bundle.channels.v1: "3.11"
-  operators.operatorframework.io.bundle.channel.default.v1: "3.11"
+  operators.operatorframework.io.bundle.channels.v1: "stable,3.11"
+  operators.operatorframework.io.bundle.channel.default.v1: stable
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.1
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

diff --git a/docs/upgrading-gatekeeper.md b/docs/upgrading-gatekeeper.md
@@ -20,6 +20,7 @@ and skipping `v3.4.Z`.
 GATEKEEPER_PREV_VERSION=$(awk '/^GATEKEEPER_VERSION \?= .*/ {print $3}' Makefile)
 GATEKEEPER_VERSION=<DESIRED_VERSION>
 sed -i "s/GATEKEEPER_VERSION ?= .*/GATEKEEPER_VERSION ?= ${GATEKEEPER_VERSION}/" Makefile
+sed -i "s/CHANNELS ?= .*/CHANNELS ?= stable,$(echo $GATEKEEPER_VERSION | cut -c2- | cut -d '.' -f 1-2)/" Makefile
 git commit -m "Set Gatekeeper version to ${GATEKEEPER_VERSION}" Makefile
 ```