Skip to content

[enterprise-4.8] modules: Drop 'upstream' from ClusterVersion examples#38889

Merged
kalexand-rh merged 1 commit intoopenshift:enterprise-4.8from
wking:drop-explicit-ClusterVersion-upstream-examples
Nov 18, 2021
Merged

[enterprise-4.8] modules: Drop 'upstream' from ClusterVersion examples#38889
kalexand-rh merged 1 commit intoopenshift:enterprise-4.8from
wking:drop-explicit-ClusterVersion-upstream-examples

Conversation

@wking
Copy link
Member

@wking wking commented Nov 17, 2021

Manually backporting #35567 to 4.8.

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.
@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 17, 2021
@netlify
Copy link

netlify bot commented Nov 17, 2021

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: e67b5dd

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/61957aa2faa7260007515355

😎 Browse the preview: https://deploy-preview-38889--osdocs.netlify.app

@kalexand-rh kalexand-rh changed the title modules: Drop 'upstream' from ClusterVersion examples [enterprise-4.8] modules: Drop 'upstream' from ClusterVersion examples Nov 18, 2021
@kalexand-rh kalexand-rh merged commit 68147c7 into openshift:enterprise-4.8 Nov 18, 2021
@kalexand-rh
Copy link
Contributor

/cherrypick enterprise-4.7

@openshift-cherrypick-robot

@kalexand-rh: #38889 failed to apply on top of branch "enterprise-4.7":

Applying: modules: Drop 'upstream' from ClusterVersion examples
Using index info to reconstruct a base tree...
M	modules/update-upgrading-cli.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/update-upgrading-cli.adoc
CONFLICT (content): Merge conflict in modules/update-upgrading-cli.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 modules: Drop 'upstream' from ClusterVersion examples
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherrypick enterprise-4.7

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.

@wking wking deleted the drop-explicit-ClusterVersion-upstream-examples branch November 18, 2021 17:04
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