diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml index 82ccc3f7a62e..9e157212a7c9 100644 --- a/_topic_maps/_topic_map.yml +++ b/_topic_maps/_topic_map.yml @@ -750,10 +750,10 @@ Topics: - Name: Preparing to update a cluster Dir: preparing_for_updates Topics: - - Name: Preparing to update to OpenShift Container Platform 4.19 + - Name: Preparing to update to OpenShift Container Platform 4.20 File: updating-cluster-prepare Distros: openshift-enterprise - - Name: Preparing to update to OKD 4.19 + - Name: Preparing to update to OKD 4.20 File: updating-cluster-prepare Distros: openshift-origin - Name: Preparing to update a cluster with manually maintained credentials diff --git a/modules/update-preparing-ack.adoc b/modules/update-preparing-ack.adoc index 4367580eb43f..78e390a515ec 100644 --- a/modules/update-preparing-ack.adoc +++ b/modules/update-preparing-ack.adoc @@ -6,7 +6,7 @@ [id="update-preparing-ack_{context}"] = Providing the administrator acknowledgment -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. +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. [WARNING] ==== @@ -23,5 +23,5 @@ Be aware that all responsibility falls on the administrator to ensure that all u + [source,terminal] ---- -$ oc -n openshift-config patch cm admin-acks --patch '{"data":{"ack-4.18-kube-1.32-api-removals-in-4.19":"true"}}' --type=merge +$ oc -n openshift-config patch cm admin-acks --patch '{"data":{"ack-4.19-admissionregistration-v1beta1-api-removals-in-4.20":"true"}}' --type=merge ---- diff --git a/modules/update-preparing-evaluate-apirequestcount-workloads.adoc b/modules/update-preparing-evaluate-apirequestcount-workloads.adoc index 9db7b94ef481..7bd662b7f1c2 100644 --- a/modules/update-preparing-evaluate-apirequestcount-workloads.adoc +++ b/modules/update-preparing-evaluate-apirequestcount-workloads.adoc @@ -25,14 +25,14 @@ For example: + [source,terminal] ---- -$ oc get apirequestcounts flowschemas.v1beta3.flowcontrol.apiserver.k8s.io -o yaml +$ oc get apirequestcounts mutatingwebhookconfigurations.v1beta1.admissionregistration.k8s.io -o yaml ---- + You can also use `-o jsonpath` to extract the `username` and `userAgent` values from an `APIRequestCount` resource: + [source,terminal] ---- -$ oc get apirequestcounts flowschemas.v1beta3.flowcontrol.apiserver.k8s.io \ +$ oc get apirequestcounts mutatingwebhookconfigurations.v1beta1.admissionregistration.k8s.io \ -o jsonpath='{range .status.currentHour..byUser[*]}{..byVerb[*].verb}{","}{.username}{","}{.userAgent}{"\n"}{end}' \ | sort -k 2 -t, -u | column -t -s, -NVERBS,USERNAME,USERAGENT ---- diff --git a/modules/update-preparing-evaluate-apirequestcount.adoc b/modules/update-preparing-evaluate-apirequestcount.adoc index 4e65a5cb6281..35399fd2cc51 100644 --- a/modules/update-preparing-evaluate-apirequestcount.adoc +++ b/modules/update-preparing-evaluate-apirequestcount.adoc @@ -26,9 +26,7 @@ $ oc get apirequestcounts ---- NAME REMOVEDINRELEASE REQUESTSINCURRENTHOUR REQUESTSINLAST24H ... -flowschemas.v1beta3.flowcontrol.apiserver.k8s.io 1.32 0 3 -... -prioritylevelconfigurations.v1beta3.flowcontrol.apiserver.k8s.io 1.32 0 1 +mutatingwebhookconfigurations.v1beta1.admissionregistration.k8s.io 1.22 0 3 ... ---- + @@ -50,6 +48,5 @@ $ oc get apirequestcounts -o jsonpath='{range .items[?(@.status.removedInRelease .Example output [source,terminal] ---- -1.32 flowschemas.v1beta3.flowcontrol.apiserver.k8s.io -1.32 prioritylevelconfigurations.v1beta3.flowcontrol.apiserver.k8s.io +1.22 mutatingwebhookconfigurations.v1beta1.admissionregistration.k8s.io ---- diff --git a/modules/update-preparing-list.adoc b/modules/update-preparing-list.adoc index b5d0875246c7..01088551f8e3 100644 --- a/modules/update-preparing-list.adoc +++ b/modules/update-preparing-list.adoc @@ -3,23 +3,33 @@ // * updating/preparing_for_updates/updating-cluster-prepare.adoc [id="update-preparing-list_{context}"] -= Removed Kubernetes APIs += Removed APIs -{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]. +{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]. -.APIs removed from Kubernetes 1.32 +.Kubernetes APIs removed from {product-title} 4.20 [cols="2,2,2,1",options="header",] |=== |Resource |Removed API |Migrate to |Notable changes -|`FlowSchema` -|`flowcontrol.apiserver.k8s.io/v1beta3` -|`flowcontrol.apiserver.k8s.io/v1` -|No +|`MutatingWebhookConfiguration` +|`admissionregistration.k8s.io/v1beta1` +|`admissionregistration.k8s.io/v1` +|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#webhook-resources-v122[Yes] -|`PriorityLevelConfiguration` -|`flowcontrol.apiserver.k8s.io/v1beta3` -|`flowcontrol.apiserver.k8s.io/v1` -|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#flowcontrol-resources-v132[Yes] +|`ValidatingAdmissionPolicy` +|`admissionregistration.k8s.io/v1beta1` +|`admissionregistration.k8s.io/v1` +|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#webhook-resources-v122[Yes] + +|`ValidatingAdmissionPolicyBinding` +|`admissionregistration.k8s.io/v1beta1` +|`admissionregistration.k8s.io/v1` +|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#webhook-resources-v122[Yes] + +|`ValidatingWebhookConfiguration` +|`admissionregistration.k8s.io/v1beta1` +|`admissionregistration.k8s.io/v1` +|link:https://kubernetes.io/docs/reference/using-api/deprecation-guide/#webhook-resources-v122[Yes] |=== diff --git a/modules/update-preparing-migrate.adoc b/modules/update-preparing-migrate.adoc index e080f93e35c3..007afdd536dc 100644 --- a/modules/update-preparing-migrate.adoc +++ b/modules/update-preparing-migrate.adoc @@ -5,4 +5,4 @@ [id="update-preparing-migrate_{context}"] = Migrating instances of removed APIs -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. +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. diff --git a/updating/preparing_for_updates/updating-cluster-prepare.adoc b/updating/preparing_for_updates/updating-cluster-prepare.adoc index c7179ce6d754..3c74b49fda26 100644 --- a/updating/preparing_for_updates/updating-cluster-prepare.adoc +++ b/updating/preparing_for_updates/updating-cluster-prepare.adoc @@ -1,6 +1,6 @@ :_mod-docs-content-type: ASSEMBLY [id="updating-cluster-prepare"] -= Preparing to update to {product-title} 4.19 += Preparing to update to {product-title} 4.20 include::_attributes/common-attributes.adoc[] :context: updating-cluster-prepare @@ -17,11 +17,11 @@ Learn more about administrative tasks that cluster admins must perform to succes [id="kube-api-removals_{context}"] == Kubernetes API removals -{product-title} 4.19 uses Kubernetes 1.32, which removed several deprecated Kubernetes APIs. +In {product-title} 4.17, a previously removed Kubernetes API was inadvertently reintroduced. It has been removed again in {product-title} 4.20. -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. +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. -Before you can update your {product-title} 4.18 cluster to 4.19, you must provide the administrator acknowledgment. +Before you can update your {product-title} 4.19 cluster to 4.20, you must provide the administrator acknowledgment. // Removed Kubernetes APIs include::modules/update-preparing-list.adoc[leveloffset=+2]