[OCPBUGS#9167]: Updated oc adm upgrade output to reflect 4.14 oc client #65618
Merged
skrthomas merged 1 commit intoopenshift:mainfrom Oct 9, 2023
Merged
[OCPBUGS#9167]: Updated oc adm upgrade output to reflect 4.14 oc client #65618skrthomas merged 1 commit intoopenshift:mainfrom
skrthomas merged 1 commit intoopenshift:mainfrom
Conversation
openshift-ci
Bot
added
the
size/S
|
🤖 Updated build preview is available at: Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/27179 |
obrown1205
force-pushed
the
updatingcluster_CLI
branch
2 times, most recently
from
0b11f13 to
51d9c66
Compare
obrown1205
changed the title
wking
reviewed
Oct 5, 2023
| ==== | ||
|
|
||
| . 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. | ||
| . Based on your organization requirements, set the appropriate update channel. For example, you can set your channel to `stable-4.13`, `fast-4.13`, or `eus-4.13`. For more information about channels, refer to _Understanding update channels and releases_ listed in the Additional resources section. |
Member
There was a problem hiding this comment.
There's no eus-4.13, it's only for even releases. So 4.13.z releases will only show up in an eus-4.14 channel, and even that won't happen until 45 to 90 days after 4.14 GAs.
wking
reviewed
Oct 5, 2023
|
|
||
| Upstream is unset, so the cluster will use an appropriate default. | ||
| Channel: stable-4.10 (available channels: candidate-4.10, candidate-4.11, eus-4.10, fast-4.10, fast-4.11, stable-4.10) | ||
| Channel: stable-version (available channels: candidate-version, eus-version, fast-version, stable-version) |
Member
There was a problem hiding this comment.
Down below, you're using <version>. I'm agnostic about whether you want to mark these placeholders or not, but whichever way you go, it's probably worth being consistent.
wking
reviewed
Oct 5, 2023
| ==== | ||
|
|
||
| . 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. | ||
| . Based on your organization requirements, set the appropriate update channel. For example, you can set your channel to `stable-4.13`. For more information about channels, refer to _Understanding update channels and releases_ listed in the Additional resources section. |
Member
There was a problem hiding this comment.
we can keep the reference to fast-4.13 here. It's everything from Channel: ... (available channels: <anything from here>), with the caveat that candidate-4.y channels will not limit you to supported releases.
wking
reviewed
Oct 5, 2023
|
|
||
| Upstream is unset, so the cluster will use an appropriate default. | ||
| Channel: stable-4.10 (available channels: candidate-4.10, candidate-4.11, eus-4.10, fast-4.10, fast-4.11, stable-4.10) | ||
| Channel: stable-<version> (available channels: candidate-<version>, eus-<version>, fast-<version>, <stable-version>) |
Member
There was a problem hiding this comment.
nit: <stable-version> -> stable-<version>.
|
|
||
| Upstream is unset, so the cluster will use an appropriate default. | ||
| Channel: stable-4.10 (available channels: candidate-4.10, candidate-4.11, eus-4.10, fast-4.10, fast-4.11, stable-4.10) | ||
| Channel: stable-<version> (available channels: candidate-<version>, eus-<version>, fast-<version>, stable-<version>) |
There was a problem hiding this comment.
It's the output of oc adm upgrade instead of oc get clusterversion in line https://github.com/openshift/openshift-docs/pull/65618/files#diff-a4543a07ef809868d1b552e88f1c5a5b4dbbc99a3ff5c769ec4ad63cd55d0b4dL120
We can update it to oc adm upgrade
obrown1205
force-pushed
the
updatingcluster_CLI
branch
from
58466be to
bd8b168
Compare
openshift-ci
Bot
added
size/M
obrown1205
force-pushed
the
updatingcluster_CLI
branch
from
bd8b168 to
2c88d0c
Compare
Contributor
Author
|
/label peer-review-needed |
openshift-ci
Bot
added
the
peer-review-needed
bburt-rh
added
peer-review-in-progress
bburt-rh
reviewed
Oct 9, 2023
Contributor
bburt-rh
left a comment
bburt-rh
left a comment
There was a problem hiding this comment.
One tiny nitpick, but otherwise lgtm! Thank you.
| ==== | ||
|
|
||
| . 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. | ||
| . 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. |
Contributor
There was a problem hiding this comment.
Suggested change
| . 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. | |
| . Based on your organization's 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. |
- Per ISG, "If you refer to a smaller piece of work within a larger container such as a chapter within a book or an article in a magazine, use italic font for the larger container and double quotation marks for the smaller piece."
bburt-rh
added
peer-review-done
obrown1205
force-pushed
the
updatingcluster_CLI
branch
from
2c88d0c to
4d90d6d
Compare
obrown1205
force-pushed
the
updatingcluster_CLI
branch
from
4d90d6d to
c041f25
Compare
Contributor
Author
|
/label merge-review-needed |
openshift-ci
Bot
added
the
merge-review-needed
skrthomas
added
merge-review-in-progress
Contributor
|
/cherrypick enterprise-4.14 |
|
@skrthomas: new pull request created: #65964 DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Version(s):
4.14+
Issue:
https://issues.redhat.com/browse/OCPBUGS-9167
Link to docs preview:
https://65618--docspreview.netlify.app/openshift-enterprise/latest/updating/updating_a_cluster/updating-cluster-cli#update-upgrading-cli_updating-cluster-cli
QE review: