Update supported OCP version 4.15-4.16. Set 4.17 for compatibility-mo…

…de version.
IBM · Aug 26, 2024 · 528f54f · 528f54f
1 parent 1fe223b
commit 528f54f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/bundle.Dockerfile b/bundle.Dockerfile
@@ -19,5 +19,5 @@ LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
 COPY bundle/manifests /manifests/
 COPY bundle/metadata /metadata/
 COPY bundle/tests/scorecard /tests/scorecard/
-LABEL com.redhat.openshift.versions="v4.15"
+LABEL com.redhat.openshift.versions="v4.15-v4.16"
 LABEL com.redhat.delivery.operator.bundle=true
diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -15,4 +15,4 @@ annotations:
   operators.operatorframework.io.test.config.v1: tests/scorecard/
 
   # OpenShift annotations:
-  com.redhat.openshift.versions: =v4.15
+  com.redhat.openshift.versions: "v4.15-v4.16"
diff --git a/console/console.go b/console/console.go
@@ -121,7 +121,7 @@ func RemoveConsole(client client.Client, namespace string) error {
 	return nil
 }
 func GetBasePath(clusterVersion string) string {
-	if strings.Contains(clusterVersion, "4.15") {
+	if strings.Contains(clusterVersion, "4.17") {
 		return CompatibilityBasePath
 	}
 

diff --git a/hack/bundle-manifests.sh b/hack/bundle-manifests.sh
@@ -67,5 +67,5 @@ echo "Updating the olm.skipRange for new release version ${RELEASE_VERSION}..."
 ${YQ_BIN} eval -i ".metadata.annotations.\"olm.skipRange\" = \">=0.0.1 <${RELEASE_VERSION}\"" "${CSV_PATH}"
 
 echo "add certification required labels to bundle.Dockerfile"
-echo "LABEL com.redhat.openshift.versions=\"v4.15\"" >> ./bundle.Dockerfile
+echo "LABEL com.redhat.openshift.versions=\"v4.15-v4.16\"" >> ./bundle.Dockerfile
 echo "LABEL com.redhat.delivery.operator.bundle=true" >> ./bundle.Dockerfile