Skip to content

Commit 66ce6a6

Browse files
bergerhofferbergerhoffer
authored
Merge pull request #98816 from bergerhoffer/OSDOCS-14987
OSDOCS#14987: Noting Kube APIs removed (again) in OCP 4.20)
2 parents 0d3fc64 + a6d6bb7 commit 66ce6a6

File tree

7 files changed

+34
-27
lines changed

7 files changed

+34
-27
lines changed

‎_topic_maps/_topic_map.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,10 +750,10 @@ Topics:
750750
- Name: Preparing to update a cluster
751751
Dir: preparing_for_updates
752752
Topics:
753-
- Name: Preparing to update to OpenShift Container Platform 4.19
753+
- Name: Preparing to update to OpenShift Container Platform 4.20
754754
File: updating-cluster-prepare
755755
Distros: openshift-enterprise
756-
- Name: Preparing to update to OKD 4.19
756+
- Name: Preparing to update to OKD 4.20
757757
File: updating-cluster-prepare
758758
Distros: openshift-origin
759759
- Name: Preparing to update a cluster with manually maintained credentials

‎modules/update-preparing-ack.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="update-preparing-ack_{context}"]
77
= Providing the administrator acknowledgment
88

9-
After you have evaluated your cluster for any removed APIs and have migrated any removed APIs, you can acknowledge that your cluster is ready to upgrade from {product-title} 4.18 to 4.19.
9+
After you have evaluated your cluster for any removed APIs and have migrated any removed APIs, you can acknowledge that your cluster is ready to upgrade from {product-title} 4.19 to 4.20.
1010

1111
[WARNING]
1212
====
@@ -23,5 +23,5 @@ Be aware that all responsibility falls on the administrator to ensure that all u
2323
+
2424
[source,terminal]
2525
----
26-
$ oc -n openshift-config patch cm admin-acks --patch '{"data":{"ack-4.18-kube-1.32-api-removals-in-4.19":"true"}}' --type=merge
26+
$ oc -n openshift-config patch cm admin-acks --patch '{"data":{"ack-4.19-admissionregistration-v1beta1-api-removals-in-4.20":"true"}}' --type=merge
2727
----

‎modules/update-preparing-evaluate-apirequestcount-workloads.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ For example:
2525
+
2626
[source,terminal]
2727
----
28-
$ oc get apirequestcounts flowschemas.v1beta3.flowcontrol.apiserver.k8s.io -o yaml
28+
$ oc get apirequestcounts mutatingwebhookconfigurations.v1beta1.admissionregistration.k8s.io -o yaml
2929
----
3030
+
3131
You can also use `-o jsonpath` to extract the `username` and `userAgent` values from an `APIRequestCount` resource:
3232
+
3333
[source,terminal]
3434
----
35-
$ oc get apirequestcounts flowschemas.v1beta3.flowcontrol.apiserver.k8s.io \
35+
$ oc get apirequestcounts mutatingwebhookconfigurations.v1beta1.admissionregistration.k8s.io \
3636
-o jsonpath='{range .status.currentHour..byUser[*]}{..byVerb[*].verb}{","}{.username}{","}{.userAgent}{"\n"}{end}' \
3737
| sort -k 2 -t, -u | column -t -s, -NVERBS,USERNAME,USERAGENT
3838
----

‎modules/update-preparing-evaluate-apirequestcount.adoc‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ $ oc get apirequestcounts
2626
----
2727
NAME REMOVEDINRELEASE REQUESTSINCURRENTHOUR REQUESTSINLAST24H
2828
...
29-
flowschemas.v1beta3.flowcontrol.apiserver.k8s.io 1.32 0 3
30-
...
31-
prioritylevelconfigurations.v1beta3.flowcontrol.apiserver.k8s.io 1.32 0 1
29+
mutatingwebhookconfigurations.v1beta1.admissionregistration.k8s.io 1.22 0 3
3230
...
3331
----
3432
+
@@ -50,6 +48,5 @@ $ oc get apirequestcounts -o jsonpath='{range .items[?(@.status.removedInRelease
5048
.Example output
5149
[source,terminal]
5250
----
53-
1.32 flowschemas.v1beta3.flowcontrol.apiserver.k8s.io
54-
1.32 prioritylevelconfigurations.v1beta3.flowcontrol.apiserver.k8s.io
51+
1.22 mutatingwebhookconfigurations.v1beta1.admissionregistration.k8s.io
5552
----

‎modules/update-preparing-list.adoc‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,33 @@
33
// * updating/preparing_for_updates/updating-cluster-prepare.adoc
44

55
[id="update-preparing-list_{context}"]
6-
= Removed Kubernetes APIs
6+
= Removed APIs
77

8-
{product-title} 4.19 uses Kubernetes 1.32, which removed the following deprecated APIs. You must migrate manifests and API clients to use the appropriate API version. For more information about migrating removed APIs, see the link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#v1-32[Kubernetes documentation].
8+
{product-title} 4.20 removed the following Kubernetes APIs. You must migrate manifests and API clients to use the appropriate API version. For more information about migrating removed APIs, see the link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/[Kubernetes documentation].
99

10-
.APIs removed from Kubernetes 1.32
10+
.Kubernetes APIs removed from {product-title} 4.20
1111
[cols="2,2,2,1",options="header",]
1212
|===
1313
|Resource |Removed API |Migrate to |Notable changes
1414

15-
|`FlowSchema`
16-
|`flowcontrol.apiserver.k8s.io/v1beta3`
17-
|`flowcontrol.apiserver.k8s.io/v1`
18-
|No
15+
|`MutatingWebhookConfiguration`
16+
|`admissionregistration.k8s.io/v1beta1`
17+
|`admissionregistration.k8s.io/v1`
18+
|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#webhook-resources-v122[Yes]
1919

20-
|`PriorityLevelConfiguration`
21-
|`flowcontrol.apiserver.k8s.io/v1beta3`
22-
|`flowcontrol.apiserver.k8s.io/v1`
23-
|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#flowcontrol-resources-v132[Yes]
20+
|`ValidatingAdmissionPolicy`
21+
|`admissionregistration.k8s.io/v1beta1`
22+
|`admissionregistration.k8s.io/v1`
23+
|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#webhook-resources-v122[Yes]
24+
25+
|`ValidatingAdmissionPolicyBinding`
26+
|`admissionregistration.k8s.io/v1beta1`
27+
|`admissionregistration.k8s.io/v1`
28+
|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#webhook-resources-v122[Yes]
29+
30+
|`ValidatingWebhookConfiguration`
31+
|`admissionregistration.k8s.io/v1beta1`
32+
|`admissionregistration.k8s.io/v1`
33+
|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#webhook-resources-v122[Yes]
2434

2535
|===

‎modules/update-preparing-migrate.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
[id="update-preparing-migrate_{context}"]
66
= Migrating instances of removed APIs
77

8-
For information about how to migrate removed Kubernetes APIs, see the link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#v1-32[Deprecated API Migration Guide] in the Kubernetes documentation.
8+
For information about how to migrate removed Kubernetes APIs, see the link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/[Deprecated API Migration Guide] in the Kubernetes documentation.

‎updating/preparing_for_updates/updating-cluster-prepare.adoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="updating-cluster-prepare"]
3-
= Preparing to update to {product-title} 4.19
3+
= Preparing to update to {product-title} 4.20
44
include::_attributes/common-attributes.adoc[]
55
:context: updating-cluster-prepare
66

@@ -17,11 +17,11 @@ Learn more about administrative tasks that cluster admins must perform to succes
1717
[id="kube-api-removals_{context}"]
1818
== Kubernetes API removals
1919

20-
{product-title} 4.19 uses Kubernetes 1.32, which removed several deprecated Kubernetes APIs.
20+
In {product-title} 4.17, a previously removed Kubernetes API was inadvertently reintroduced. It has been removed again in {product-title} 4.20.
2121

22-
A cluster administrator must provide a manual acknowledgment before the cluster can be updated from {product-title} 4.18 to 4.19. This is to help prevent issues after upgrading to {product-title} 4.19, where APIs that have been removed are still in use by workloads, tools, or other components running on or interacting with the cluster. Administrators must evaluate their cluster for any APIs in use that will be removed and migrate the affected components to use the appropriate new API version. After this evaluation and migration is complete, the administrator can provide the acknowledgment.
22+
A cluster administrator must provide a manual acknowledgment before the cluster can be updated from {product-title} 4.19 to 4.20. This is to help prevent issues after upgrading to {product-title} 4.20, where APIs that have been removed are still in use by workloads, tools, or other components running on or interacting with the cluster. Administrators must evaluate their cluster for any APIs in use that will be removed and migrate the affected components to use the appropriate new API version. After this evaluation and migration is complete, the administrator can provide the acknowledgment.
2323

24-
Before you can update your {product-title} 4.18 cluster to 4.19, you must provide the administrator acknowledgment.
24+
Before you can update your {product-title} 4.19 cluster to 4.20, you must provide the administrator acknowledgment.
2525

2626
// Removed Kubernetes APIs
2727
include::modules/update-preparing-list.adoc[leveloffset=+2]

0 commit comments

Comments
 (0)