Skip to content

[enterprise-4.9] modules: Drop 'upstream' from ClusterVersion examples#38887

Merged
kalexand-rh merged 1 commit intoopenshift:enterprise-4.9from
openshift-cherrypick-robot:cherry-pick-35567-to-enterprise-4.9
Jan 13, 2022
Merged

[enterprise-4.9] modules: Drop 'upstream' from ClusterVersion examples#38887
kalexand-rh merged 1 commit intoopenshift:enterprise-4.9from
openshift-cherrypick-robot:cherry-pick-35567-to-enterprise-4.9

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #35567

/assign kalexand-rh

In 4.1, the installer used to explicitly set upstream to our default
URI.  But in openshift/installer#c9095b34518a0
(data/manifests/bootkube/cvo-overrides: Drop the explicit update,
2020-08-28, openshift/installer#4112), which landed in 4.7 and was not
backported, I'd stopped doing that.  In clusters born in 4.7 and
later, the installer will leave upstream unset, and the
cluster-version operator will default to making a reasonable choice.

We still need to talk about explicit upstreams in the case where folks
are pointing their cluster at a local OpenShift Update Service, but
this commit drops the properties where we were incidentally pointing
at the default, Red-Hat-hosted location, because explicitly setting
that value is an anti-pattern that makes it harder for clusters to
adapt if we try to move our default location elsewhere in the future.

Also restore a closing brace and dangling comma to clean up after
c0fc03d (osdocs-2368: updating 4.8 references to 4.9, 2021-10-01, openshift#36974),
which also removed some of the stale 'upstream' references.
@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 17, 2021
@kalexand-rh kalexand-rh merged commit ee48dd2 into openshift:enterprise-4.9 Jan 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants