Merge pull request #1778 from jcantrill/log3386

LOG-3386: Remove operator from stable channel
openshift · Dec 9, 2022 · 6a28b1f · 6a28b1f
2 parents 412a734 + 9a994b9
commit 6a28b1f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -248,8 +248,8 @@ OPENSHIFT_VERSIONS?="v4.7"
 # Generate bundle manifests and metadata, then validate generated files.
 BUNDLE_VERSION?=$(LOGGING_VERSION).0
 # Options for 'bundle-build'
-BUNDLE_CHANNELS := --channels=stable,stable-${LOGGING_VERSION}
-BUNDLE_DEFAULT_CHANNEL := --default-channel=stable
+BUNDLE_CHANNELS := --channels=stable-${LOGGING_VERSION}
+BUNDLE_DEFAULT_CHANNEL := --default-channel=stable-${LOGGING_VERSION}
 BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 
 # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command

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=cluster-logging
-LABEL operators.operatorframework.io.bundle.channels.v1=stable,stable-5.5
-LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
+LABEL operators.operatorframework.io.bundle.channels.v1=stable-5.5
+LABEL operators.operatorframework.io.bundle.channel.default.v1=stable-5.5
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-unknown
 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: cluster-logging
-  operators.operatorframework.io.bundle.channels.v1: stable,stable-5.5
-  operators.operatorframework.io.bundle.channel.default.v1: stable
+  operators.operatorframework.io.bundle.channels.v1: stable-5.5
+  operators.operatorframework.io.bundle.channel.default.v1: stable-5.5
   operators.operatorframework.io.metrics.builder: operator-sdk-unknown
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3