Skip to content

Commit f6cba4d

Browse files
authored
Merge pull request #65618 from obrown1205/updatingcluster_CLI
[OCPBUGS#9167]: Updated oc adm upgrade output to reflect 4.14 oc client
2 parents 4407caf + c041f25 commit f6cba4d

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

modules/update-upgrading-cli.adoc

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,19 @@ $ oc adm upgrade
3434
.Example output
3535
[source,terminal]
3636
----
37-
Cluster version is 4.9.23
37+
$ oc adm upgrade
38+
Cluster version is 4.13.10
3839
3940
Upstream is unset, so the cluster will use an appropriate default.
40-
Channel: stable-4.9 (available channels: candidate-4.10, candidate-4.9, fast-4.10, fast-4.9, stable-4.10, stable-4.9, eus-4.10)
41+
Channel: stable-4.13 (available channels: candidate-4.13, candidate-4.14, fast-4.13, stable-4.13)
4142
4243
Recommended updates:
4344
44-
VERSION IMAGE
45-
4.9.24 quay.io/openshift-release-dev/ocp-release@sha256:6a899c54dda6b844bb12a247e324a0f6cde367e880b73ba110c056df6d018032
46-
4.9.25 quay.io/openshift-release-dev/ocp-release@sha256:2eafde815e543b92f70839972f585cc52aa7c37aa72d5f3c8bc886b0fd45707a
47-
4.9.26 quay.io/openshift-release-dev/ocp-release@sha256:3ccd09dd08c303f27a543351f787d09b83979cd31cf0b4c6ff56cd68814ef6c8
48-
4.9.27 quay.io/openshift-release-dev/ocp-release@sha256:1c7db78eec0cf05df2cead44f69c0e4b2c3234d5635c88a41e1b922c3bedae16
49-
4.9.28 quay.io/openshift-release-dev/ocp-release@sha256:4084d94969b186e20189649b5affba7da59f7d1943e4e5bc7ef78b981eafb7a8
50-
4.9.29 quay.io/openshift-release-dev/ocp-release@sha256:b04ca01d116f0134a102a57f86c67e5b1a3b5da1c4a580af91d521b8fa0aa6ec
51-
4.9.31 quay.io/openshift-release-dev/ocp-release@sha256:2a28b8ebb53d67dd80594421c39e36d9896b1e65cb54af81fbb86ea9ac3bf2d7
52-
4.9.32 quay.io/openshift-release-dev/ocp-release@sha256:ecdb6d0df547b857eaf0edb5574ddd64ca6d9aff1fa61fd1ac6fb641203bedfa
53-
45+
VERSION IMAGE
46+
4.13.14 quay.io/openshift-release-dev/ocp-release@sha256:406fcc160c097f61080412afcfa7fd65284ac8741ac7ad5b480e304aba73674b
47+
4.13.13 quay.io/openshift-release-dev/ocp-release@sha256:d62495768e335c79a215ba56771ff5ae97e3cbb2bf49ed8fb3f6cefabcdc0f17
48+
4.13.12 quay.io/openshift-release-dev/ocp-release@sha256:73946971c03b43a0dc6f7b0946b26a177c2f3c9d37105441315b4e3359373a55
49+
4.13.11 quay.io/openshift-release-dev/ocp-release@sha256:e1c2377fdae1d063aaddc753b99acf25972b6997ab9a0b7e80cfef627b9ef3dd
5450
----
5551
+
5652
[NOTE]
@@ -59,7 +55,9 @@ For details and information on how to perform an `EUS-to-EUS` channel update, pl
5955
_Preparing to perform an EUS-to-EUS upgrade_ page, listed in the Additional resources section.
6056
====
6157

62-
. Based on your organization requirements, set the appropriate update channel. For example, you can set your channel to `stable-4.12`, `fast-4.12`, or `eus-4.12`. For more information about channels, refer to _Understanding update channels and releases_ listed in the Additional resources section.
58+
. Based on your organization requirements, set the appropriate update channel. For example, you can set your channel to `stable-4.13` or `fast-4.13`. For more information about channels, refer to _Understanding update channels and releases_ listed in the Additional resources section.
59+
//this example will need to be updated per eus release to reflect options available
60+
6361
+
6462
[source,terminal]
6563
----
@@ -117,17 +115,16 @@ updated to the new version:
117115
+
118116
[source,terminal]
119117
----
120-
$ oc get clusterversion
118+
$ oc adm upgrade
121119
----
122120
+
123121
.Example output
124122
[source,terminal]
125123
----
126-
127124
Cluster version is <version>
128125
129126
Upstream is unset, so the cluster will use an appropriate default.
130-
Channel: stable-4.10 (available channels: candidate-4.10, candidate-4.11, eus-4.10, fast-4.10, fast-4.11, stable-4.10)
127+
Channel: stable-<version> (available channels: candidate-<version>, eus-<version>, fast-<version>, stable-<version>)
131128
132129
No updates available. You may force an update to a specific release image, but doing so might not be supported and might result in downtime or data loss.
133130
----
@@ -138,7 +135,7 @@ If the `oc get clusterversion` command displays the following error while the `P
138135
[source,terminal]
139136
----
140137
NAME VERSION AVAILABLE PROGRESSING SINCE STATUS
141-
version 4.10.26 True True 24m Unable to apply 4.11.0-rc.7: an unknown error has occurred: MultipleErrors
138+
version <version> True True 24m Unable to apply <version>: an unknown error has occurred: MultipleErrors
142139
----
143140
====
144141
. If you are updating your cluster to the next minor version, such as version X.y to X.(y+1), it is recommended to confirm that your nodes are updated before deploying workloads that rely on a new feature:

0 commit comments

Comments
 (0)