From 1109469633e264326b7c7ae45d8666030651243a Mon Sep 17 00:00:00 2001
From: Jacob See <5027680+jacobsee@users.noreply.github.com>
Date: Wed, 14 May 2025 14:19:53 -0700
Subject: [PATCH 1/2] Add upgrade gate for the removal of
 admissionregistration.k8s.io/v1beta1 between 4.18 and 4.20.

---
 ...00_00_cluster-version-operator_01_admingate_configmap.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install/0000_00_cluster-version-operator_01_admingate_configmap.yaml b/install/0000_00_cluster-version-operator_01_admingate_configmap.yaml
index b22fa21ce..493a89d97 100644
--- a/install/0000_00_cluster-version-operator_01_admingate_configmap.yaml
+++ b/install/0000_00_cluster-version-operator_01_admingate_configmap.yaml
@@ -10,4 +10,6 @@ metadata:
     include.release.openshift.io/self-managed-high-availability: "true"
 data:
   ack-4.18-kube-1.32-api-removals-in-4.19: |-
-      Kubernetes 1.32 and therefore OpenShift 4.19 remove several APIs which require admin consideration. Please see the knowledge article https://access.redhat.com/articles/7112216 for details and instructions.
+    Kubernetes 1.32 and therefore OpenShift 4.19 remove several APIs which require admin consideration. Please see the knowledge article https://access.redhat.com/articles/7112216 for details and instructions.
+  ack-4.18-admissionregistration-v1beta1-api-removals-in-4.20: |-
+    The admissionregistration.k8s.io/v1beta1 API version is deprecated in 4.18 and will be removed in 4.20. The admissionregistration.k8s.io/v1 API versions of these resources are available for use in 4.18, and it is recommended to migrate to them before upgrading to 4.20.

From 132f0567ada51a4098c08d35e254d246ce088318 Mon Sep 17 00:00:00 2001
From: Jacob See <5027680+jacobsee@users.noreply.github.com>
Date: Wed, 14 May 2025 16:20:33 -0700
Subject: [PATCH 2/2] Strengthen language for recommendation

---
 ...0000_00_cluster-version-operator_01_admingate_configmap.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/0000_00_cluster-version-operator_01_admingate_configmap.yaml b/install/0000_00_cluster-version-operator_01_admingate_configmap.yaml
index 493a89d97..cd6b756b9 100644
--- a/install/0000_00_cluster-version-operator_01_admingate_configmap.yaml
+++ b/install/0000_00_cluster-version-operator_01_admingate_configmap.yaml
@@ -12,4 +12,4 @@ data:
   ack-4.18-kube-1.32-api-removals-in-4.19: |-
     Kubernetes 1.32 and therefore OpenShift 4.19 remove several APIs which require admin consideration. Please see the knowledge article https://access.redhat.com/articles/7112216 for details and instructions.
   ack-4.18-admissionregistration-v1beta1-api-removals-in-4.20: |-
-    The admissionregistration.k8s.io/v1beta1 API version is deprecated in 4.18 and will be removed in 4.20. The admissionregistration.k8s.io/v1 API versions of these resources are available for use in 4.18, and it is recommended to migrate to them before upgrading to 4.20.
+    The admissionregistration.k8s.io/v1beta1 group version is deprecated in 4.18 and will be removed in 4.20. The admissionregistration.k8s.io/v1 group version is available for use in 4.18, and resources must be migrated to it before upgrading to 4.20.