From c94560b6a1bb0801d4cf3d1c070c11bcbb611fca Mon Sep 17 00:00:00 2001
From: Stavros Kontopoulos <st.kontopoulos@gmail.com>
Date: Wed, 11 Sep 2024 13:21:45 +0300
Subject: [PATCH] Set min OCP to 4.13

---
 hack/lib/certmanager.bash                    | 16 +---------------
 olm-catalog/serverless-operator/Dockerfile   |  2 +-
 olm-catalog/serverless-operator/project.yaml |  4 ++--
 test/upgrade/installation/openshift.go       |  2 +-
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/hack/lib/certmanager.bash b/hack/lib/certmanager.bash
index 5b970c0a7c..c30a3ca202 100644
--- a/hack/lib/certmanager.bash
+++ b/hack/lib/certmanager.bash
@@ -16,21 +16,7 @@ function deploy_certmanager_operator {
 
   openshift_version=$(oc version -o yaml | yq read - openshiftVersion)
   deployment_namespace="cert-manager"
-  if printf '%s\n4.12\n' "${openshift_version}" | sort --version-sort -C; then
-      # OCP version is older as 4.12 and thus cert-manager-operator is only available as tech-preview in this version (cert-manager-operator GA'ed in OCP 4.12)
-      
-      echo "Running on OpenShift ${openshift_version} which supports cert-manager-operator only in tech-preview"
-
-      yq delete "${certmanager_resources_dir}"/subscription.yaml --doc 1 spec | \
-      yq write - --doc 2 spec.channel tech-preview | \
-      oc apply -f - || return $?
-
-      deployment_namespace="openshift-cert-manager"
-  else
-    echo "Running on OpenShift ${openshift_version} which supports GA'ed cert-manager-operator"
-
-    oc apply -f "${certmanager_resources_dir}"/subscription.yaml || return $?
-  fi
+  oc apply -f "${certmanager_resources_dir}"/subscription.yaml || return $?
 
   logger.info "Waiting until cert manager operator is available"
 
diff --git a/olm-catalog/serverless-operator/Dockerfile b/olm-catalog/serverless-operator/Dockerfile
index d0f46fb5a0..7899732ba3 100644
--- a/olm-catalog/serverless-operator/Dockerfile
+++ b/olm-catalog/serverless-operator/Dockerfile
@@ -18,6 +18,6 @@ LABEL \
       maintainer="serverless-support@redhat.com" \
       description="Red Hat OpenShift Serverless Bundle" \
       io.k8s.display-name="Red Hat OpenShift Serverless Bundle" \
-      com.redhat.openshift.versions="v4.12" \
+      com.redhat.openshift.versions="v4.13" \
       com.redhat.delivery.operator.bundle=true \
       com.redhat.delivery.backport=false
diff --git a/olm-catalog/serverless-operator/project.yaml b/olm-catalog/serverless-operator/project.yaml
index 33abbf23f9..678bb8a8e7 100644
--- a/olm-catalog/serverless-operator/project.yaml
+++ b/olm-catalog/serverless-operator/project.yaml
@@ -22,9 +22,9 @@ requirements:
     golang: '1.22'
     nodejs: 20.x
     ocpVersion:
-        min: '4.12'
+        min: '4.13'
         max: '4.15'
-        label: 'v4.12'
+        label: 'v4.13'
 dependencies:
     serving: knative-v1.14
     # serving midstream branch name
diff --git a/test/upgrade/installation/openshift.go b/test/upgrade/installation/openshift.go
index de3890a5d9..3e20aaccd3 100644
--- a/test/upgrade/installation/openshift.go
+++ b/test/upgrade/installation/openshift.go
@@ -24,7 +24,7 @@ var (
 	// adminAcks includes admin acks for cluster upgrades.
 	// See https://access.redhat.com/articles/6955381 for more details.
 	adminAcks = []string{
-		"ack-4.11-kube-1.25-api-removals-in-4.12",
+		"ack-4.12-kube-1.26-api-removals-in-4.13",
 		"ack-4.13-kube-1.27-api-removals-in-4.14",
 	}
 )