From ce8ad1bcd133186351ee89bed157f12bc54d7f8c Mon Sep 17 00:00:00 2001 From: Jacob See <5027680+jacobsee@users.noreply.github.com> Date: Wed, 14 May 2025 12:55:12 -0700 Subject: [PATCH 1/4] Add upgrade gate for the removal of admissionregistration.k8s.io/v1beta1 between 4.19 and 4.20. --- ...000_00_cluster-version-operator_01_admingate_configmap.yaml | 3 +++ 1 file changed, 3 insertions(+) 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 aaae17f9a..c728ebe5c 100644 --- a/install/0000_00_cluster-version-operator_01_admingate_configmap.yaml +++ b/install/0000_00_cluster-version-operator_01_admingate_configmap.yaml @@ -8,3 +8,6 @@ metadata: include.release.openshift.io/hypershift: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" +data: + ack-4.19-admissionregistration-v1beta1-api-removals-in-4.20: |- + The admissionregistration.k8s.io/v1beta1 API group is deprecated in 4.19 and will be removed in 4.20. The admissionregistration.k8s.io/v1 API versions of these resources are available for use in 4.19, and it is recommended to migrate to them before upgrading to 4.20. From 92f05f9d66a688f562d6666490cd6020cb90c896 Mon Sep 17 00:00:00 2001 From: Jacob See <5027680+jacobsee@users.noreply.github.com> Date: Wed, 14 May 2025 12:57:00 -0700 Subject: [PATCH 2/4] group -> version --- ...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 c728ebe5c..63ea57d07 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,4 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" data: ack-4.19-admissionregistration-v1beta1-api-removals-in-4.20: |- - The admissionregistration.k8s.io/v1beta1 API group is deprecated in 4.19 and will be removed in 4.20. The admissionregistration.k8s.io/v1 API versions of these resources are available for use in 4.19, and it is recommended to migrate to them before upgrading to 4.20. + The admissionregistration.k8s.io/v1beta1 API version is deprecated in 4.19 and will be removed in 4.20. The admissionregistration.k8s.io/v1 API versions of these resources are available for use in 4.19, and it is recommended to migrate to them before upgrading to 4.20. From e849cadc80684170e08ef91bc05218739d098315 Mon Sep 17 00:00:00 2001 From: Jacob See <5027680+jacobsee@users.noreply.github.com> Date: Wed, 14 May 2025 16:21:28 -0700 Subject: [PATCH 3/4] 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 63ea57d07..f53c49925 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,4 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" data: ack-4.19-admissionregistration-v1beta1-api-removals-in-4.20: |- - The admissionregistration.k8s.io/v1beta1 API version is deprecated in 4.19 and will be removed in 4.20. The admissionregistration.k8s.io/v1 API versions of these resources are available for use in 4.19, and it is recommended to migrate to them before upgrading to 4.20. + The admissionregistration.k8s.io/v1beta1 group version is deprecated in 4.19 and will be removed in 4.20. The admissionregistration.k8s.io/v1 group version is available for use in 4.19, and resources must be migrated to it before upgrading to 4.20. From 9930d86db1d703912f205d6c95fb271156e27fd9 Mon Sep 17 00:00:00 2001 From: Jacob See <5027680+jacobsee@users.noreply.github.com> Date: Wed, 2 Jul 2025 11:59:06 -0700 Subject: [PATCH 4/4] Phrasing update from "migrate" to "update" --- ...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 f53c49925..4a4c5630f 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,4 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" data: ack-4.19-admissionregistration-v1beta1-api-removals-in-4.20: |- - The admissionregistration.k8s.io/v1beta1 group version is deprecated in 4.19 and will be removed in 4.20. The admissionregistration.k8s.io/v1 group version is available for use in 4.19, and resources must be migrated to it before upgrading to 4.20. + The admissionregistration.k8s.io/v1beta1 group version is deprecated in 4.19 and will be removed in 4.20. Any clients using the v1beta1 version of these resources must be updated to use the corresponding v1 version instead.