From 1b3ab3a7618445f41b9b6adfd805e33d98fb763d Mon Sep 17 00:00:00 2001 From: Alexandra Molnar Date: Wed, 11 Sep 2024 14:14:06 +0100 Subject: [PATCH] OCPBUGS-31380: Add prerequisite to IBU rollback to check for expired certs --- .../image_based_upgrade/cnf-image-based-upgrade-base.adoc | 5 +++++ .../image_based_upgrade/ztp-image-based-upgrade.adoc | 5 +++++ modules/cnf-image-based-upgrade-rollback.adoc | 1 + modules/ztp-image-based-upgrade-rollback.adoc | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc b/edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc index ef3d831ec0aa..bd0b98174100 100644 --- a/edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc +++ b/edge_computing/image_based_upgrade/cnf-image-based-upgrade-base.adoc @@ -29,4 +29,9 @@ include::modules/cnf-image-based-upgrade-with-backup.adoc[leveloffset=+1] include::modules/cnf-image-based-upgrade-rollback.adoc[leveloffset=+1] +[role="_additional-resources"] +.Additional resources + +* xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-3-expired-certs.adoc#dr-scenario-3-recovering-expired-certs_dr-recovering-expired-certs[Recovering from expired control plane certificates] + include::modules/cnf-image-based-upgrade-troubleshooting.adoc[leveloffset=+1] \ No newline at end of file diff --git a/edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc b/edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc index 16094610bcab..1adf9aaa91bc 100644 --- a/edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc +++ b/edge_computing/image_based_upgrade/ztp-image-based-upgrade.adoc @@ -41,4 +41,9 @@ include::modules/ztp-image-based-upgrade-upgrade.adoc[leveloffset=+1] include::modules/ztp-image-based-upgrade-rollback.adoc[leveloffset=+1] +[role="_additional-resources"] +.Additional resources + +* xref:../../backup_and_restore/control_plane_backup_and_restore/disaster_recovery/scenario-3-expired-certs.adoc#dr-scenario-3-recovering-expired-certs_dr-recovering-expired-certs[Recovering from expired control plane certificates] + include::modules/cnf-image-based-upgrade-troubleshooting.adoc[leveloffset=+1] \ No newline at end of file diff --git a/modules/cnf-image-based-upgrade-rollback.adoc b/modules/cnf-image-based-upgrade-rollback.adoc index 085f99f0125f..0f8523de0fc1 100644 --- a/modules/cnf-image-based-upgrade-rollback.adoc +++ b/modules/cnf-image-based-upgrade-rollback.adoc @@ -30,6 +30,7 @@ You can manually roll back the changes if you encounter unresolvable issues afte .Prerequisites * Log in to the hub cluster as a user with `cluster-admin` privileges. +* Ensure that the control plane certificates on the original stateroot are valid. If the certificates expired, see "Recovering from expired control plane certificates". .Procedure diff --git a/modules/ztp-image-based-upgrade-rollback.adoc b/modules/ztp-image-based-upgrade-rollback.adoc index 54e5aa8347cf..79c60a053615 100644 --- a/modules/ztp-image-based-upgrade-rollback.adoc +++ b/modules/ztp-image-based-upgrade-rollback.adoc @@ -7,6 +7,10 @@ If you encounter an issue after upgrade, you can start a manual rollback. +.Prerequisites + +* Ensure that the control plane certificates on the original stateroot are valid. If the certificates expired, see "Recovering from expired control plane certificates". + .Procedure . Revert the `du-profile` or the corresponding policy-binding label to the original platform version in the `SiteConfig` CR: