From c9095b34518a00af9f9c966068410333a3a58f41 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 28 Aug 2020 09:30:09 -0700 Subject: [PATCH] data/manifests/bootkube/cvo-overrides: Drop the explicit update The cluster-version operator has been falling back to a default URI when the ClusterVersion upstream is empty since way back [1,2], and this behavior is enshrined in the API [3]. Drop the installer-side opinion, so: * There is a single location where we version-control the default upstream (the CVO). * Folks consuming in-cluster ClusterVersion objects have one less property to distract them (unless they want to override the default, in which case it's not distracting). [1]: https://github.com/openshift/cluster-version-operator/blame/2c4931dc283c551938be1a00fee290de0b79d99c/pkg/cvo/availableupdates.go#L27-L31 [2]: https://github.com/openshift/cluster-version-operator/commit/ab4d84a021c38fea5e5973287e1f5580928907c1#diff-78f2af341fa49292dd6930f378018867R24 [3]: https://github.com/openshift/api/blame/0422dc17083e9e8df18d029f3f34322e96e9c326/config/v1/types_cluster_version.go#L56-L57 --- data/data/manifests/bootkube/cvo-overrides.yaml.template | 1 - docs/user/troubleshooting.md | 1 - 2 files changed, 2 deletions(-) diff --git a/data/data/manifests/bootkube/cvo-overrides.yaml.template b/data/data/manifests/bootkube/cvo-overrides.yaml.template index 6ad1202ce7a..77c489d0fe6 100644 --- a/data/data/manifests/bootkube/cvo-overrides.yaml.template +++ b/data/data/manifests/bootkube/cvo-overrides.yaml.template @@ -4,6 +4,5 @@ metadata: namespace: openshift-cluster-version name: version spec: - upstream: https://api.openshift.com/api/upgrades_info/v1/graph channel: stable-4.6 clusterID: {{.CVOClusterID}} diff --git a/docs/user/troubleshooting.md b/docs/user/troubleshooting.md index b94dcbc6f73..5203621aad7 100644 --- a/docs/user/troubleshooting.md +++ b/docs/user/troubleshooting.md @@ -113,7 +113,6 @@ The installer uses the [cluster-version-operator] to create all the components o spec: channel: stable-4.1 clusterID: 5ec312f9-f729-429d-a454-61d4906896ca - upstream: https://api.openshift.com/api/upgrades_info/v1/graph status: availableUpdates: null conditions: