Skip to content

Commit 80d752e

Browse files
authored
Merge pull request #109367 from fmcdonal/OSDOCS-17889
[OSDOCS-17889] CQA jobs fixing all errors and warnings for OSD upgrading
2 parents 174d5d4 + a15658c commit 80d752e

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

modules/.vale.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ Vale.Avoid = YES
4444
[asciidoctor]
4545
temp-ifdef = YES
4646
temp-ifndef = NO
47-
temp-ifeval = temp
47+
temp-ifeval = temp

modules/osd-lifecycle-policy.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
[role="_abstract"]
1111
To plan an upgrade, review the _{product-title} update life cycle_ guide in the "Additional resources" section. The life cycle page includes release definitions, support and upgrade requirements, installation policy information, and life cycle dates.
1212

13-
You can use update channels to decide which Red Hat OpenShift Container Platform minor version to update your clusters to. {product-title} supports updates only through the `stable` channel. To learn more about OpenShift update channels and releases, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html/updating_clusters/understanding-openshift-updates-1#understanding-update-channels-releases[Understanding update channels and releases].
13+
You can use update channels to decide which Red Hat {OCP} minor version to update your clusters to. {product-title} supports updates only through the `stable` channel. To learn more about OpenShift update channels and releases, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/latest/html/updating_clusters/understanding-openshift-updates-1#understanding-update-channels-releases[Understanding update channels and releases].

modules/upgrade-auto.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ You can use {cluster-manager} to schedule recurring, automatic upgrades for z-st
1919

2020
. To schedule recurring upgrades, select *Recurring updates*.
2121

22-
. Provide an administrators acknowledgment and click *Approve and continue*. {cluster-manager} does not start scheduled y-stream updates for minor versions without receiving an administrators acknowledgment.
22+
. Provide an administrator's acknowledgment and click *Approve and continue*. {cluster-manager} does not start scheduled y-stream updates for minor versions without receiving an administrator's acknowledgment.
2323
+
2424
[IMPORTANT]
2525
====

modules/upgrade-manual.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ Before upgrading a Workload Identity Federation (WIF)-enabled {product-title} on
5353

5454
[WARNING]
5555
====
56-
In the event that a CVE or other critical issue to {product-title} is found, all clusters are upgraded within 48 hours of the fix being released. You are notified when the fix is available and informed that the cluster will be automatically upgraded at your latest preferred start time before the 48 hour window closes. You can also upgrade manually at any time before the recurring upgrade starts.
56+
If a Common Vulnerabilities and Exposures (CVE) or other critical issue to {product-title} is found, all clusters are upgraded within 48 hours of the fix being released. You are notified when the fix is available and informed that the cluster will be automatically upgraded at your latest preferred start time before the 48 hour window closes. You can also upgrade manually at any time before the recurring upgrade starts.
5757
====

modules/upgrade.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ You can also set a grace period for how long `PodDisruptionBudget` protected wor
2121

2222
[NOTE]
2323
====
24-
All Kubernetes objects and PVs in each {product-title} cluster are backed up as part of the {product-title} service. Application and application data backups are not a part of the {product-title} service. Ensure you have a backup policy in place for your applications and application data prior to scheduling upgrades.
24+
All Kubernetes objects and Persistent Volumes (PVs) in each {product-title} cluster are backed up as part of the {product-title} service. Application and application data backups are not a part of the {product-title} service. Ensure you have a backup policy in place for your applications and application data before scheduling upgrades.
2525
====
2626

2727
[NOTE]
@@ -34,7 +34,7 @@ When following a scheduled upgrade policy, there might be a delay of an hour or
3434

3535
Upgrades can be scheduled to occur automatically on a day and time specified by the cluster owner or administrator. Upgrades occur on a weekly basis, unless an upgrade is unavailable for that week.
3636

37-
If you select recurring updates for your cluster, you must provide an administrators acknowledgment. {cluster-manager} does not start scheduled y-stream updates for minor versions without receiving an administrators acknowledgment.
37+
If you select recurring updates for your cluster, you must provide an administrator's acknowledgment. {cluster-manager} does not start scheduled y-stream updates for minor versions without receiving an administrator's acknowledgment.
3838

3939
[NOTE]
4040
====
@@ -44,9 +44,9 @@ Recurring upgrade policies are optional and if they are not set, the upgrade pol
4444
[id="upgrade-manual_upgrades_{context}"]
4545
== Individual upgrades
4646

47-
If you opt for individual upgrades, you are responsible for updating your cluster. If you select an update version that requires approval, you must provide an administrators acknowledgment.
47+
If you opt for individual upgrades, you are responsible for updating your cluster. If you select an update version that requires approval, you must provide an administrator's acknowledgment.
4848

49-
If your cluster version becomes outdated, it will transition to a limited support status. For more information on OpenShift life cycle policies, see xref:../osd_architecture/osd_policy/osd-life-cycle.adoc#osd-life-cycle[{product-title} update life cycle].
49+
If your cluster version becomes outdated, it changes to a limited support status.
5050

5151
[id="upgrade-notifications_{context}"]
5252
== Upgrade notifications
@@ -71,7 +71,7 @@ For recurring upgrades, you will also receive email notifications before the upg
7171

7272
[id="wif-upgrades_{context}"]
7373
== Cluster upgrades with Workload Identity Federation (WIF)
74-
Before upgrading an {product-title} on {GCP} cluster with WIF authentication type to a newer y-stream version, you must update the WIF configuration to that version as well. Failure to do so before attempting to upgrade the cluster version will result in an error.
74+
Before upgrading an {product-title} on {GCP} cluster with WIF authentication type to a newer y-stream version, you must update the WIF configuration to that version. Failure to do so before attempting to upgrade the cluster version will result in an error.
7575
For more information on how to update a WIF configuration, see the _Additional resources_ section.
7676

7777
[NOTE]

0 commit comments

Comments
 (0)