Skip to content

Commit 0b0a193

Browse files
authored
Merge pull request #90952 from bergerhoffer/OSDOCS-12040
OSDOCS#12040: Adding admin-ack for updating from 4.18 to 4.19
2 parents c92db7b + 9360b0d commit 0b0a193

6 files changed

+20
-25
lines changed

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} {ocp-nminus1} to {product-version}.
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.
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.15-kube-1.29-api-removals-in-4.18":"true"}}' --type=merge
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
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.v1beta2.flowcontrol.apiserver.k8s.io -o yaml
28+
$ oc get apirequestcounts flowschemas.v1beta3.flowcontrol.apiserver.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.v1beta2.flowcontrol.apiserver.k8s.io \
35+
$ oc get apirequestcounts flowschemas.v1beta3.flowcontrol.apiserver.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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ $ oc get apirequestcounts
2626
----
2727
NAME REMOVEDINRELEASE REQUESTSINCURRENTHOUR REQUESTSINLAST24H
2828
...
29-
flowschemas.v1beta2.flowcontrol.apiserver.k8s.io 1.29 0 3
29+
flowschemas.v1beta3.flowcontrol.apiserver.k8s.io 1.32 0 3
3030
...
31-
prioritylevelconfigurations.v1beta2.flowcontrol.apiserver.k8s.io 1.29 0 1
31+
prioritylevelconfigurations.v1beta3.flowcontrol.apiserver.k8s.io 1.32 0 1
3232
...
3333
----
3434
+
@@ -50,6 +50,6 @@ $ oc get apirequestcounts -o jsonpath='{range .items[?(@.status.removedInRelease
5050
.Example output
5151
[source,terminal]
5252
----
53-
1.29 flowschemas.v1beta2.flowcontrol.apiserver.k8s.io
54-
1.29 prioritylevelconfigurations.v1beta2.flowcontrol.apiserver.k8s.io
53+
1.32 flowschemas.v1beta3.flowcontrol.apiserver.k8s.io
54+
1.32 prioritylevelconfigurations.v1beta3.flowcontrol.apiserver.k8s.io
5555
----

modules/update-preparing-list.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@
55
[id="update-preparing-list_{context}"]
66
= Removed Kubernetes APIs
77

8-
{product-title} 4.16 uses Kubernetes 1.29, 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-29[Kubernetes documentation].
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].
99

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

1515
|`FlowSchema`
16-
|`flowcontrol.apiserver.k8s.io/v1beta2`
17-
|`flowcontrol.apiserver.k8s.io/v1` or `flowcontrol.apiserver.k8s.io/v1beta3`
16+
|`flowcontrol.apiserver.k8s.io/v1beta3`
17+
|`flowcontrol.apiserver.k8s.io/v1`
1818
|No
1919

2020
|`PriorityLevelConfiguration`
21-
|`flowcontrol.apiserver.k8s.io/v1beta2`
22-
|`flowcontrol.apiserver.k8s.io/v1` or `flowcontrol.apiserver.k8s.io/v1beta3`
23-
|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#flowcontrol-resources-v129[Yes]
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]
2424

2525
|===

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-29[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/#v1-32[Deprecated API Migration Guide] in the Kubernetes documentation.

updating/preparing_for_updates/updating-cluster-prepare.adoc

Lines changed: 4 additions & 9 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.18
3+
= Preparing to update to {product-title} 4.19
44
include::_attributes/common-attributes.adoc[]
55
:context: updating-cluster-prepare
66

@@ -17,15 +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-
There are no Kubernetes API removals in {product-title} 4.18.
20+
{product-title} 4.19 uses Kubernetes 1.32, which removed several deprecated Kubernetes APIs.
2121

22-
// Commenting out this section because there are no APIs being removed in OCP 4.17 / Kube 1.30. But we'll need this section again for OCP 4.19 / Kube 1.32
23-
////
24-
{product-title} 4.16 uses Kubernetes 1.29, which removed several deprecated APIs.
25-
26-
A cluster administrator must provide a manual acknowledgment before the cluster can be updated from {product-title} 4.15 to 4.16. This is to help prevent issues after upgrading to {product-title} 4.16, 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.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.
2723

28-
Before you can update your {product-title} 4.15 cluster to 4.16, you must provide the administrator acknowledgment.
24+
Before you can update your {product-title} 4.18 cluster to 4.19, you must provide the administrator acknowledgment.
2925

3026
// Removed Kubernetes APIs
3127
include::modules/update-preparing-list.adoc[leveloffset=+2]
@@ -49,7 +45,6 @@ include::modules/update-preparing-migrate.adoc[leveloffset=+2]
4945

5046
// Providing the administrator acknowledgment
5147
include::modules/update-preparing-ack.adoc[leveloffset=+2]
52-
////
5348

5449
// Assessing the risk of conditional updates
5550
include::modules/update-preparing-conditional.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)