Merge pull request #351 from sthaha/fix-bundle-os-4.15

fix: Ensure bundle can be installed from alpha channel on openshift 4.15
sustainable-computing-io · Jan 25, 2024 · fb3c316 · fb3c316
2 parents 837d5aa + db852c0
commit fb3c316
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -288,7 +288,7 @@ escapes_detect: mod-tidy
 	@go build -tags $(GO_BUILD_TAGS) -gcflags="-m -l" ./... 2>&1 | grep "escapes to heap" || true
 
 
-CHANNELS ?=alpha,dev-preview
+CHANNELS ?=alpha
 
 ##@ OLM bundle
 #

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -5,7 +5,7 @@ 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=kepler-operator
-LABEL operators.operatorframework.io.bundle.channels.v1=alpha,dev-preview
+LABEL operators.operatorframework.io.bundle.channels.v1=alpha
 LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.27.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1

diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -4,7 +4,7 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: kepler-operator
-  operators.operatorframework.io.bundle.channels.v1: alpha,dev-preview
+  operators.operatorframework.io.bundle.channels.v1: alpha
   operators.operatorframework.io.bundle.channel.default.v1: alpha
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.27.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
@@ -14,4 +14,4 @@ annotations:
   operators.operatorframework.io.test.mediatype.v1: scorecard+v1
   operators.operatorframework.io.test.config.v1: tests/scorecard/
 # Annotations for OpenShift version
-  com.redhat.openshift.versions: "v4.11-v4.14"
+  com.redhat.openshift.versions: "v4.12-v4.17"
diff --git a/hack/bundle.sh b/hack/bundle.sh
@@ -95,7 +95,7 @@ main() {
 	info "Adding additional metadata annotations"
 	cat <<-EOF >>bundle/metadata/annotations.yaml
 		# Annotations for OpenShift version
-		  com.redhat.openshift.versions: "v4.11-v4.14"
+		  com.redhat.openshift.versions: "v4.12-v4.17"
 	EOF
 
 	run operator-sdk bundle validate ./bundle \