Skip to content

Commit 33ee2fe

Browse files
bergerhofferbergerhoffer
authored
Merge pull request #55224 from bergerhoffer/OSDOCS-4277
OSDOCS-4277: Updating upgrading admin-ack for 4.13
2 parents 7c8496e + a1aedce commit 33ee2fe

9 files changed

+36
-71
lines changed

‎_topic_maps/_topic_map.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,10 +585,10 @@ Topics:
585585
File: understanding-upgrade-channels-release
586586
- Name: Understanding OpenShift update duration
587587
File: understanding-openshift-update-duration
588-
- Name: Preparing to update to OpenShift Container Platform 4.12
588+
- Name: Preparing to update to OpenShift Container Platform 4.13
589589
File: updating-cluster-prepare
590590
Distros: openshift-enterprise
591-
- Name: Preparing to update to OKD 4.12
591+
- Name: Preparing to update to OKD 4.13
592592
File: updating-cluster-prepare
593593
Distros: openshift-origin
594594
- Name: Preparing to perform an EUS-to-EUS update

‎modules/update-preparing-ack.adoc

Lines changed: 3 additions & 3 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.11 to 4.12.
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.12 to 4.13.
1010

1111
[WARNING]
1212
====
@@ -19,9 +19,9 @@ Be aware that all responsibility falls on the administrator to ensure that all u
1919
2020
.Procedure
2121

22-
* Run the following command to acknowledge that you have completed the evaluation and your cluster is ready for the Kubernetes API removals in {product-title} 4.12:
22+
* Run the following command to acknowledge that you have completed the evaluation and your cluster is ready for the Kubernetes API removals in {product-title} 4.13:
2323
+
2424
[source,terminal]
2525
----
26-
$ oc -n openshift-config patch cm admin-acks --patch '{"data":{"ack-4.11-kube-1.25-api-removals-in-4.12":"true"}}' --type=merge
26+
$ oc -n openshift-config patch cm admin-acks --patch '{"data":{"ack-4.12-kube-1.26-api-removals-in-4.13":"true"}}' --type=merge
2727
----

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ For example:
2525
+
2626
[source,terminal]
2727
----
28-
$ oc get apirequestcounts poddisruptionbudgets.v1beta1.policy -o yaml
28+
$ oc get apirequestcounts flowschemas.v1beta1.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 poddisruptionbudgets.v1beta1.policy \
35+
$ oc get apirequestcounts flowschemas.v1beta1.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
----
3939
+
4040
.Example output
4141
[source,terminal]
4242
----
43-
VERBS USERNAME USERAGENT
44-
watch system:serviceaccount:openshift-operators:3scale-operator manager/v0.0.0
45-
watch system:serviceaccount:openshift-operators:datadog-operator-controller-manager manager/v0.0.0
43+
VERBS USERNAME USERAGENT
44+
get system:serviceaccount:openshift-cluster-version:default cluster-version-operator/v0.0.0
45+
watch system:serviceaccount:openshift-oauth-apiserver:oauth-apiserver-sa oauth-apiserver/v0.0.0
4646
----

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

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,13 @@ $ oc get apirequestcounts
2626
----
2727
NAME REMOVEDINRELEASE REQUESTSINCURRENTHOUR REQUESTSINLAST24H
2828
...
29-
poddisruptionbudgets.v1.policy 391 8114
30-
poddisruptionbudgets.v1beta1.policy 1.25 2 23
31-
podmonitors.v1.monitoring.coreos.com 3 70
32-
podnetworkconnectivitychecks.v1alpha1.controlplane.operator.openshift.io 612 11748
33-
pods.v1 1531 38634
34-
podsecuritypolicies.v1beta1.policy 1.25 3 39
35-
podtemplates.v1 2 79
36-
preprovisioningimages.v1alpha1.metal3.io 2 39
37-
priorityclasses.v1.scheduling.k8s.io 12 248
38-
prioritylevelconfigurations.v1beta1.flowcontrol.apiserver.k8s.io 1.26 3 86
29+
flowschemas.v1beta1.flowcontrol.apiserver.k8s.io 1.26 0 16
30+
flowschemas.v1beta2.flowcontrol.apiserver.k8s.io 101 857
31+
groups.v1.user.openshift.io 22 201
32+
hardwaredata.v1alpha1.metal3.io 3 33
33+
helmchartrepositories.v1beta1.helm.openshift.io 142 628
34+
horizontalpodautoscalers.v2.autoscaling 11 103
35+
horizontalpodautoscalers.v2beta2.autoscaling 1.26 0 15
3936
...
4037
----
4138
+
@@ -59,7 +56,4 @@ $ oc get apirequestcounts -o jsonpath='{range .items[?(@.status.removedInRelease
5956
----
6057
1.26 flowschemas.v1beta1.flowcontrol.apiserver.k8s.io
6158
1.26 horizontalpodautoscalers.v2beta2.autoscaling
62-
1.25 poddisruptionbudgets.v1beta1.policy
63-
1.25 podsecuritypolicies.v1beta1.policy
64-
1.26 prioritylevelconfigurations.v1beta1.flowcontrol.apiserver.k8s.io
6559
----

‎modules/update-preparing-list.adoc

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

8-
{product-title} 4.12 uses Kubernetes 1.25, 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-25[Kubernetes documentation].
8+
{product-title} 4.13 uses Kubernetes 1.26, 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-26[Kubernetes documentation].
99

10-
.APIs removed from Kubernetes 1.25
11-
[cols="2,2,2,1",options="header",]
10+
.APIs removed from Kubernetes 1.26
11+
[cols="2,2,2",options="header",]
1212
|===
13-
|Resource |Removed API |Migrate to |Notable changes
13+
|Resource |Removed API |Migrate to
1414

15-
|`CronJob`
16-
|`batch/v1beta1`
17-
|`batch/v1`
18-
|No
19-
20-
|`EndpointSlice`
21-
|`discovery.k8s.io/v1beta1`
22-
|`discovery.k8s.io/v1`
23-
|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#endpointslice-v125[Yes]
24-
25-
|`Event`
26-
|`events.k8s.io/v1beta1`
27-
|`events.k8s.io/v1`
28-
|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#event-v125[Yes]
15+
|`FlowSchema`
16+
|`flowcontrol.apiserver.k8s.io/v1beta1`
17+
|`flowcontrol.apiserver.k8s.io/v1beta3`
2918

3019
|`HorizontalPodAutoscaler`
31-
|`autoscaling/v2beta1`
20+
|`autoscaling/v2beta2`
3221
|`autoscaling/v2`
33-
|No
34-
35-
|`PodDisruptionBudget`
36-
|`policy/v1beta1`
37-
|`policy/v1`
38-
|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#poddisruptionbudget-v125[Yes]
39-
40-
|`PodSecurityPolicy`
41-
|`policy/v1beta1`
42-
|link:https://kubernetes.io/docs/concepts/security/pod-security-admission/[Pod Security Admission] ^[1]^
43-
|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#psp-v125[Yes]
4422

45-
|`RuntimeClass`
46-
|`node.k8s.io/v1beta1`
47-
|`node.k8s.io/v1`
48-
|No
23+
|`PriorityLevelConfiguration`
24+
|`flowcontrol.apiserver.k8s.io/v1beta1`
25+
|`flowcontrol.apiserver.k8s.io/v1beta3`
4926

5027
|===
51-
[.small]
52-
1. For more information about pod security admission in {product-title}, see _Understanding and managing pod security admission_.
28+
// Removed the "Notable changes" column since they were all "No" and table so wide it was causing a scrollbar. Add it back in for the next time there are notable changes (1.29)

‎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-25[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-26[Deprecated API Migration Guide] in the Kubernetes documentation.

‎updating/updating-cluster-cli.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ See xref:../authentication/using-rbac.adoc[Using RBAC to define and apply permis
2424
* If your cluster uses manually maintained credentials, ensure that the Cloud Credential Operator (CCO) is in an upgradeable state. For more information, see xref:../updating/updating-cluster-cli.adoc#manually-maintained-credentials-upgrade_updating-cluster-cli[Upgrading clusters with manually maintained credentials].
2525
* If your cluster uses manually maintained credentials with the AWS Security Token Service (STS), obtain a copy of the `ccoctl` utility from the release image being updated to and use it to process any updated credentials. For more information, see xref:../authentication/managing_cloud_provider_credentials/cco-mode-sts.adoc#sts-mode-upgrading[Upgrading an OpenShift Container Platform cluster configured for manual mode with STS].
2626
* Ensure that you address all `Upgradeable=False` conditions so the cluster allows an update to the next minor version. An alert displays at the top of the *Cluster Settings* page when you have one or more cluster Operators that cannot be upgraded. You can still update to the next available patch update for the minor release you are currently on.
27-
* Review the list of APIs that were removed in Kubernetes 1.25, migrate any affected components to use the new API version, and provide the administrator acknowledgment. For more information, see xref:../updating/updating-cluster-prepare.adoc#updating-cluster-prepare[Preparing to update to {product-title} 4.12].
27+
* Review the list of APIs that were removed in Kubernetes 1.26, migrate any affected components to use the new API version, and provide the administrator acknowledgment. For more information, see xref:../updating/updating-cluster-prepare.adoc#updating-cluster-prepare[Preparing to update to {product-title} 4.13].
2828
* If you run an Operator or you have configured any application with the pod disruption budget, you might experience an interruption during the upgrade process. If `minAvailable` is set to 1 in `PodDisruptionBudget`, the nodes are drained to apply pending machine configs which might block the eviction process. If several nodes are rebooted, all the pods might run on only one node, and the `PodDisruptionBudget` field can prevent the node drain.
2929

3030
[IMPORTANT]

‎updating/updating-cluster-prepare.adoc

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

77
toc::[]
88

9-
{product-title} 4.12 uses Kubernetes 1.25, which removed several deprecated APIs.
9+
{product-title} 4.13 uses Kubernetes 1.26, which removed several deprecated APIs.
1010

11-
A cluster administrator must provide a manual acknowledgment before the cluster can be updated from {product-title} 4.11 to 4.12. This is to help prevent issues after upgrading to {product-title} 4.12, 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.
11+
A cluster administrator must provide a manual acknowledgment before the cluster can be updated from {product-title} 4.12 to 4.13. This is to help prevent issues after upgrading to {product-title} 4.13, 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.
1212

13-
Before you can update your {product-title} 4.11 cluster to 4.12, you must provide the administrator acknowledgment.
13+
Before you can update your {product-title} 4.12 cluster to 4.13, you must provide the administrator acknowledgment.
1414

1515
// Removed Kubernetes APIs
1616
include::modules/update-preparing-list.adoc[leveloffset=+1]
1717

18-
[role="_additional-resources"]
19-
.Additional resources
20-
21-
* xref:../authentication/understanding-and-managing-pod-security-admission.adoc#understanding-and-managing-pod-security-admission[Understanding and managing pod security admission]
22-
2318
[id="evaluating-cluster-removed-apis"]
2419
== Evaluating your cluster for removed APIs
2520

‎updating/updating-cluster-within-minor.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ See xref:../authentication/using-rbac.adoc[Using RBAC to define and apply permis
2525
* To accommodate the time it takes to update, you are able to do a partial update by updating the worker or custom pool nodes. You can pause and resume within the progress bar of each pool.
2626
* If your cluster uses manually maintained credentials, ensure that the Cloud Credential Operator (CCO) is in an upgradeable state. For more information, see xref:../updating/updating-cluster-cli.adoc#manually-maintained-credentials-upgrade_updating-cluster-cli[Upgrading clusters with manually maintained credentials].
2727
* If your cluster uses manually maintained credentials with the AWS Security Token Service (STS), obtain a copy of the `ccoctl` utility from the release image being updated to and use it to process any updated credentials. For more information, see xref:../authentication/managing_cloud_provider_credentials/cco-mode-sts.adoc#sts-mode-upgrading[Upgrading an OpenShift Container Platform cluster configured for manual mode with STS].
28-
* Review the list of APIs that were removed in Kubernetes 1.25, migrate any affected components to use the new API version, and provide the administrator acknowledgment. For more information, see xref:../updating/updating-cluster-prepare.adoc#updating-cluster-prepare[Preparing to update to {product-title} 4.12].
28+
* Review the list of APIs that were removed in Kubernetes 1.26, migrate any affected components to use the new API version, and provide the administrator acknowledgment. For more information, see xref:../updating/updating-cluster-prepare.adoc#updating-cluster-prepare[Preparing to update to {product-title} 4.13].
2929
* If you run an Operator or you have configured any application with the pod disruption budget, you might experience an interruption during the upgrade process. If `minAvailable` is set to 1 in `PodDisruptionBudget`, the nodes are drained to apply pending machine configs which might block the eviction process. If several nodes are rebooted, all the pods might run on only one node, and the `PodDisruptionBudget` field can prevent the node drain.
3030

3131
[IMPORTANT]

0 commit comments

Comments
 (0)