Bug 1966602: Only do the feature-gate override for dual-stack on 4.6 and 4.7#1242
Merged
openshift-merge-robot merged 1 commit intoopenshift-metal3:masterfrom Jun 1, 2021
Merged
Conversation
Member
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: stbenjam The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
lgtm
Member
|
Feel free to remove the hold when you're ready (i.e. MCO change is close to landing) |
Member
|
We enabled a test on dualstack that's now failing without this, so no sense in holding this pending the MCO PR. /hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
danwinship
changed the title
Member
|
/test e2e-metal-ipi |
Member
|
/test e2e-metal-ipi-ovn-ipv6 |
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
3 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.
On 4.8 and later we don't need to override the default feature gates, and so we shouldn't.
(Currently MCO is assuming that we will, and so it hacks the bootstrap-time kubelet config to include the feature gate, which will then cause problems if you didn't manually set the feature gate, so effectively 4.8 still requires people to manually override the feature gate.)
MCO fix: openshift/machine-config-operator#2580
Whichever one merges first will break dual-stack CI. There is no good way to avoid this.