Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion _unused_topics/upgrade-cluster-version-definition.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ spec:
channel: stable-4.3 <1>
overrides: "" <2>
clusterID: 0b1cf91f-c3fb-4f9e-aa02-e0d70c71f6e6
upstream: https://api.openshift.com/api/upgrades_info/v1/graph
status: <3>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this is an indent issue, because status is a sibling of spec, not a child of spec. But orthogonal to this PR's effort, and this is in _unused_topics anyway, so punting for now.

availableUpdates: null <4>
conditions: <5>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ $ oc get clusterversion -o jsonpath='{.items[0].spec}{"\n"}'
.Example output
[source,terminal]
----
{"channel":"stable-4.6","clusterID":"245539c1-72a3-41aa-9cec-72ed8cf25c5c","upstream":"https://api.openshift.com/api/upgrades_info/v1/graph"}
{"channel":"stable-4.6","clusterID":"245539c1-72a3-41aa-9cec-72ed8cf25c5c"}
----

. Review the available cluster updates:
Expand Down
3 changes: 2 additions & 1 deletion modules/update-upgrading-cli.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $ oc get clusterversion -o json|jq ".items[0].spec"
----
{
"channel": "stable-4.9",
"clusterID": "990f7ab8-109b-4c95-8480-2bd1deec55ff",
"clusterID": "990f7ab8-109b-4c95-8480-2bd1deec55ff"
}
----
+
Expand Down Expand Up @@ -111,6 +111,7 @@ $ oc get clusterversion -o json|jq ".items[0].spec"
"force": false,
"image": "quay.io/openshift-release-dev/ocp-release@sha256:9c5f0df8b192a0d7b46cd5f6a4da2289c155fd5302dec7954f8f06c878160b8b",
"version": "4.9.0" <1>
}
}
----
<1> If the `version` number in the `desiredUpdate` stanza matches the value that
Expand Down