Revert "Merge pull request #80813 from fmcdonal/OSDOCS-11543"

adellape · adellape · commit 560b6917f868 · 2024-09-10T13:44:01.000-06:00
This reverts commit 5287c7c, reversing changes made to eb26fca.
diff --git a/_topic_maps/_topic_map_rosa_hcp.yml b/_topic_maps/_topic_map_rosa_hcp.yml
@@ -677,6 +677,13 @@ Name: Upgrading
 Dir: upgrading
 Distros: openshift-rosa-hcp
 Topics:
+# - Name: Preparing to upgrade ROSA to 4.9
+#   File: rosa-upgrading-cluster-prepare
+#   Distros: openshift-rosa-hcp
+# - Name: Upgrading ROSA with STS
+#   File: rosa-upgrading-sts
+# - Name: Upgrading ROSA
+#   File: rosa-upgrading
 - Name: Upgrading ROSA with HCP
   File: rosa-hcp-upgrading
 # ---
diff --git a/modules/rosa-hcp-upgrading-cli-control-plane.adoc b/modules/rosa-hcp-upgrading-cli-control-plane.adoc
@@ -87,3 +87,8 @@ $ rosa upgrade cluster -c <cluster_name_or_id> --control-plane --schedule-date=<
 ----
 +
 Your hosted control plane is scheduled for an upgrade at the specified time in Coordinated Universal Time (UTC).
+
+ifeval::["{context}" != "rosa-hcp-upgrading-whole-cluster"]
+.Troubleshooting
+* Sometimes a scheduled upgrade does not initiate. See link:https://access.redhat.com/solutions/6648291[Upgrade maintenance canceled] for more information.
+endif::[]
diff --git a/modules/rosa-hcp-upgrading-cli-machinepool.adoc b/modules/rosa-hcp-upgrading-cli-machinepool.adoc
@@ -111,7 +111,7 @@ $ rosa upgrade machinepool -c <cluster_name> <machinepool_name> [--schedule-date
 +
 You can upgrade multiple machine pools concurrently by running this command for each machine pool you want to upgrade.
 
-** To schedule the immediate upgrade of a machine pool, run the following command:
+** To schedule the immediate upgrade of a machine pool:
 +
 [source,terminal]
 ----
@@ -120,11 +120,14 @@ $ rosa upgrade machinepool -c <cluster_name> <machinepool_name> --version <versi
 +
 The machine pool is scheduled for immediate upgrade, which initiates a rolling replacement of all nodes in the specified machine pool.
 
-** To schedule an upgrade to start at a future time, run the following command:
+** To schedule an upgrade to start at a future time:
 +
 [source,terminal]
 ----
 $ rosa upgrade machinepool -c <cluster_name> <machinepool_name> --schedule-date=<yyyy-mm-dd> --schedule-time=<HH:mm> --version <version_number>
 ----
 +
 The machine pool is scheduled to begin an upgrade at the specified time and date in Coordinated Universal Time (UTC). This will initiate a rolling replacement of all nodes in the specified machine pool, beginning at the specified time.
+
+.Troubleshooting
+* Sometimes a scheduled upgrade does not initiate. See link:https://access.redhat.com/solutions/6648291[Upgrade maintenance canceled] for more information.
diff --git a/modules/rosa-hcp-upgrading-cli-tutorial.adoc b/modules/rosa-hcp-upgrading-cli-tutorial.adoc
@@ -91,3 +91,6 @@ $ rosa upgrade machinepool -c <cluster_name> <machinepool_name> [--schedule-date
 ----
 +
 Your machine pool is now scheduled for an upgrade.
+
+.Troubleshooting
+* Sometimes a scheduled upgrade does not initiate. See link:https://access.redhat.com/solutions/6648291[Upgrade maintenance cancelled] for more information.

Original file line number	Diff line number	Diff line change
`@@ -87,3 +87,8 @@ $ rosa upgrade cluster -c <cluster_name_or_id> --control-plane --schedule-date=<`
`87`	`87`	`----`
`88`	`88`	`+`
`89`	`89`	`Your hosted control plane is scheduled for an upgrade at the specified time in Coordinated Universal Time (UTC).`
	`90`	`+`
	`91`	`+ifeval::["{context}" != "rosa-hcp-upgrading-whole-cluster"]`
	`92`	`+.Troubleshooting`
	`93`	`+* Sometimes a scheduled upgrade does not initiate. See link:https://access.redhat.com/solutions/6648291[Upgrade maintenance canceled] for more information.`
	`94`	`+endif::[]`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ $ rosa upgrade machinepool -c <cluster_name> <machinepool_name> [--schedule-date`
`111`	`111`	`+`
`112`	`112`	`You can upgrade multiple machine pools concurrently by running this command for each machine pool you want to upgrade.`
`113`	`113`
`114`		`-** To schedule the immediate upgrade of a machine pool, run the following command:`
	`114`	`+** To schedule the immediate upgrade of a machine pool:`
`115`	`115`	`+`
`116`	`116`	`[source,terminal]`
`117`	`117`	`----`
`@@ -120,11 +120,14 @@ $ rosa upgrade machinepool -c <cluster_name> <machinepool_name> --version <versi`
`120`	`120`	`+`
`121`	`121`	`The machine pool is scheduled for immediate upgrade, which initiates a rolling replacement of all nodes in the specified machine pool.`
`122`	`122`
`123`		`-** To schedule an upgrade to start at a future time, run the following command:`
	`123`	`+** To schedule an upgrade to start at a future time:`
`124`	`124`	`+`
`125`	`125`	`[source,terminal]`
`126`	`126`	`----`
`127`	`127`	`$ rosa upgrade machinepool -c <cluster_name> <machinepool_name> --schedule-date=<yyyy-mm-dd> --schedule-time=<HH:mm> --version <version_number>`
`128`	`128`	`----`
`129`	`129`	`+`
`130`	`130`	`The machine pool is scheduled to begin an upgrade at the specified time and date in Coordinated Universal Time (UTC). This will initiate a rolling replacement of all nodes in the specified machine pool, beginning at the specified time.`
	`131`	`+`
	`132`	`+.Troubleshooting`
	`133`	`+* Sometimes a scheduled upgrade does not initiate. See link:https://access.redhat.com/solutions/6648291[Upgrade maintenance canceled] for more information.`
Original file line number	Diff line number	Diff line change
`@@ -91,3 +91,6 @@ $ rosa upgrade machinepool -c <cluster_name> <machinepool_name> [--schedule-date`
`91`	`91`	`----`
`92`	`92`	`+`
`93`	`93`	`Your machine pool is now scheduled for an upgrade.`
	`94`	`+`
	`95`	`+.Troubleshooting`
	`96`	`+* Sometimes a scheduled upgrade does not initiate. See link:https://access.redhat.com/solutions/6648291[Upgrade maintenance cancelled] for more information.`