Merge pull request #259 from appuio/dep/update-openshift-version

Update documentation for Openshift 4.12
appuio · Jun 29, 2023 · fe35564 · fe35564
2 parents ff2e073 + 989917b
commit fe35564
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 deletions.
diff --git a/docs/modules/ROOT/pages/how-tos/cloudscale/install.adoc b/docs/modules/ROOT/pages/how-tos/cloudscale/install.adoc
@@ -1,7 +1,7 @@
 = Install OpenShift 4 on cloudscale.ch
-:ocp-minor-version: 4.11
-:k8s-minor-version: 1.24
-:ocp-patch-version: {ocp-minor-version}.9
+:ocp-minor-version: 4.12
+:k8s-minor-version: 1.25
+:ocp-patch-version: {ocp-minor-version}.17
 :provider: cloudscale
 
 [abstract]

diff --git a/docs/modules/ROOT/pages/how-tos/exoscale/install.adoc b/docs/modules/ROOT/pages/how-tos/exoscale/install.adoc
@@ -1,7 +1,7 @@
 = Installation on Exoscale
-:ocp-minor-version: 4.11
-:k8s-minor-version: 1.24
-:ocp-patch-version: {ocp-minor-version}.9
+:ocp-minor-version: 4.12
+:k8s-minor-version: 1.25
+:ocp-patch-version: {ocp-minor-version}.17
 :provider: exoscale
 :kubectl_extra_args:
 

diff --git a/docs/modules/ROOT/pages/how-tos/update_maintenance.adoc b/docs/modules/ROOT/pages/how-tos/update_maintenance.adoc
@@ -5,7 +5,7 @@ In practice, this means that there is no difference between "updating the operat
 
 [IMPORTANT]
 ====
-For an upgrade to `4.9`, see xref:oc4:ROOT:how-tos/update_maintenance/v_4_9.adoc[Upgrade to OpenShift 4.9] first.
+For an upgrade to `4.12`, see xref:oc4:ROOT:how-tos/update_maintenance/v_4_12.adoc[Upgrade to OpenShift 4.12] first.
 ====
 
 . Get list of available updates:

diff --git a/...ges/how-tos/update_maintenance/v_4_9.adoc → ...es/how-tos/update_maintenance/v_4_12.adoc b/...ges/how-tos/update_maintenance/v_4_9.adoc → ...es/how-tos/update_maintenance/v_4_12.adoc
@@ -1,11 +1,12 @@
-= Upgrade to OpenShift 4.9 / Administrator Acknowledgment
+= Upgrade to OpenShift 4.12 / Administrator Acknowledgment
+:page-aliases: how-tos/update_maintenance/v_4_9.adoc
 
-OpenShift Container Platform 4.9 uses Kubernetes 1.22, which removed a significant number of deprecated `v1beta1` APIs.
-A manual acknowledgment must be provided before the cluster can be upgraded to 4.9.
+OpenShift Container Platform 4.12 uses Kubernetes 1.25, which removed a significant number of deprecated `v1beta1` APIs.
+A manual acknowledgment must be provided before the cluster can be upgraded to 4.12.
 
-More information can be found in https://access.redhat.com/articles/6329921.
+More information can be found in https://access.redhat.com/articles/6955381.
 
-== Upgrade to 4.9
+== Upgrade to 4.12
 
 . Check requests to removed APIs
 +
@@ -21,9 +22,9 @@ The last column is requests in the last 24 hours.
 +
 [source,bash]
 ----
-1.22	customresourcedefinitions.v1beta1.apiextensions.k8s.io	15
-1.22	ingresses.v1beta1.extensions	619
-1.22	ingresses.v1beta1.networking.k8s.io	0
+1.25    cronjobs.v1beta1.batch  0
+1.25    poddisruptionbudgets.v1beta1.policy     0
+1.25    podsecuritypolicies.v1beta1.policy      462
 ----
 +
 If you see counts `> 0` you can check from whom the API calls are originating.
@@ -49,7 +50,7 @@ More advanced query: Show only resources with create and update requests.
 kubectl --as=cluster-admin get apirequestcount -ojson | jq '
     .items[] |
         select(
-            .status.removedInRelease == "1.22" and .status.requestCount > 0
+            .status.removedInRelease == "1.25" and .status.requestCount > 0
         ) |
         {
             resource: .metadata.name,
@@ -79,7 +80,7 @@ kubectl --as=cluster-admin get apirequestcount -ojson | jq '
 kubectl patch cm admin-acks \
   --as=cluster-admin \
   -n openshift-config \
-  --patch '{"data":{"ack-4.8-kube-1.22-api-removals-in-4.9":"true"}}' \
+  --patch '{"data":{"ack-4.11-kube-1.25-api-removals-in-4.12":"true"}}' \
   --type=merge
 ----
 

diff --git a/docs/modules/ROOT/partials/install/install-config-cloudscale-exoscale.adoc b/docs/modules/ROOT/partials/install/install-config-cloudscale-exoscale.adoc
@@ -16,6 +16,6 @@ pullSecret: |
   ${PULL_SECRET}
 sshKey: "$(cat $SSH_PUBLIC_KEY)"
 capabilities:
-  baselineCapabilitySet: v4.11
+  baselineCapabilitySet: v4.12
 EOF
 ----
diff --git a/docs/modules/ROOT/partials/nav.adoc b/docs/modules/ROOT/partials/nav.adoc
@@ -84,7 +84,7 @@
 ** xref:oc4:ROOT:how-tos/update_maintenance.adoc[Update/Maintenance]
 ** xref:oc4:ROOT:how-tos/update_maintenance/automated-upgrades-at-vshn.adoc[]
 ** xref:oc4:ROOT:how-tos/new_minor.adoc[Get ready for new minor]
-** xref:oc4:ROOT:how-tos/update_maintenance/v_4_9.adoc[Upgrade to OCP4.9]
+** xref:oc4:ROOT:how-tos/update_maintenance/v_4_12.adoc[Upgrade to OCP4.12]
 ** xref:oc4:ROOT:references/architecture/upgrade_controller.adoc[Upgrade Controller]
 
 // Support