Skip to content

Commit 52888e9

Browse files
authored
Merge pull request #72502 from amolnar-rh/OCPBUGS-20226
OCPBUGS-20226: Aligned OCP versions in ClusterVersion examples
2 parents b77ab73 + 20a5333 commit 52888e9

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

modules/cnf-topology-aware-lifecycle-manager-apply-policies.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,10 @@ $ oc get clusterversion
330330
+
331331
.Example output
332332
+
333-
[source,terminal]
333+
[source,terminal,subs="attributes+"]
334334
----
335335
NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
336-
version 4.9.5 True True 43s Working towards 4.9.7: 71 of 735 done (9% complete)
336+
version 4.{product-version}.5 True True 43s Working towards 4.{product-version}.7: 71 of 735 done (9% complete)
337337
----
338338

339339
. Check the Operator subscription by running the following command:

modules/cnf-topology-aware-lifecycle-manager-backup-recovery.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,18 +114,18 @@ $ oc get clusterversion,nodes,clusteroperator
114114
----
115115
+
116116
.Example output
117-
[source,terminal]
117+
[source,terminal,subs="attributes+"]
118118
----
119119
NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
120-
clusterversion.config.openshift.io/version 4.9.23 True False 86d Cluster version is 4.9.23 <1>
120+
clusterversion.config.openshift.io/version 4.{product-version}.23 True False 86d Cluster version is 4.{product-version}.23 <1>
121121
122122
123123
NAME STATUS ROLES AGE VERSION
124124
node/lab-test-spoke1-node-0 Ready master,worker 86d v1.22.3+b93fd35 <2>
125125

126126
NAME VERSION AVAILABLE PROGRESSING DEGRADED SINCE MESSAGE
127-
clusteroperator.config.openshift.io/authentication 4.9.23 True False False 2d7h <3>
128-
clusteroperator.config.openshift.io/baremetal 4.9.23 True False False 86d
127+
clusteroperator.config.openshift.io/authentication 4.{product-version}.23 True False False 2d7h <3>
128+
clusteroperator.config.openshift.io/baremetal 4.{product-version}.23 True False False 86d
129129

130130

131131
..............

snippets/cnf-example-upgrade-policy.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
apiVersion: policy.open-cluster-management.io/v1
66
kind: Policy
77
metadata:
8-
name: ocp-4.9.4
8+
name: ocp-4.{product-version}.4
99
namespace: platform-upgrade
1010
spec:
1111
disabled: false
@@ -29,14 +29,14 @@ spec:
2929
metadata:
3030
name: version
3131
spec:
32-
channel: stable-4.9
32+
channel: stable-{product-version}
3333
desiredUpdate:
34-
version: 4.9.4
34+
version: 4.{product-version}.4
3535
upstream: https://api.openshift.com/api/upgrades_info/v1/graph
3636
status:
3737
history:
3838
- state: Completed
39-
version: 4.9.4
39+
version: 4.{product-version}.4
4040
remediationAction: inform
4141
severity: low
4242
remediationAction: inform

0 commit comments

Comments
 (0)