🐛 fix feature gate merges in ConvertToFeatureGateAPI #446
Conversation
This file contains 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
mikeshng
approved these changes
Jul 3, 2024
There was a problem hiding this comment.
/lgtm
Thank you for your fix and detailed PR explannation.
Your fixes makes sense to me.
/assign @qiujian16
The original idea is to let user set additional feature gate in addition to default ones. |
Signed-off-by: Tyler Gillson <[email protected]>
TylerGillson
force-pushed
the
fix/feature-gate-conversion
branch
from
ff00aa1 to
75245d1
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mikeshng, qiujian16, TylerGillson The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-merge-bot
bot
merged commit 76e9b28
into
open-cluster-management-io:main
8 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Prior to this PR, ConvertToFeatureGateAPI was incorrectly merging feature gates specified via the
--feature-gatescommand line flag with the default feature flag sets.The unit tests added in this PR fail against main as follows:
Running tool: /opt/homebrew/bin/go test -timeout 30s -run ^TestConvertToFeatureGateAPI$ open-cluster-management.io/clusteradm/pkg/genericclioptions -v === RUN TestConvertToFeatureGateAPI === RUN TestConvertToFeatureGateAPI/disable_default_feature_gate /Users/tylergillson/spectrocloud/repos/oss/ocm/clusteradm/pkg/genericclioptions/feature_gates_test.go:89: expected [], got [{AddonManagement Disable}] === RUN TestConvertToFeatureGateAPI/enable_default_feature_gate /Users/tylergillson/spectrocloud/repos/oss/ocm/clusteradm/pkg/genericclioptions/feature_gates_test.go:89: expected [{AddonManagement Enable}], got [] === RUN TestConvertToFeatureGateAPI/enable_non-default_feature_gate === RUN TestConvertToFeatureGateAPI/enable_non-default_feature_gate,_ensure_default_feature_gates_remain_enabled /Users/tylergillson/spectrocloud/repos/oss/ocm/clusteradm/pkg/genericclioptions/feature_gates_test.go:89: expected [{AddonManagement Enable} {ClusterClaim Enable} {MultipleHubs Enable}], got [{MultipleHubs Enable}] --- FAIL: TestConvertToFeatureGateAPI (0.00s) --- FAIL: TestConvertToFeatureGateAPI/disable_default_feature_gate (0.00s) --- FAIL: TestConvertToFeatureGateAPI/enable_default_feature_gate (0.00s) --- PASS: TestConvertToFeatureGateAPI/enable_non-default_feature_gate (0.00s) --- FAIL: TestConvertToFeatureGateAPI/enable_non-default_feature_gate,_ensure_default_feature_gates_remain_enabled (0.00s) FAIL FAIL open-cluster-management.io/clusteradm/pkg/genericclioptions 0.730sNow all flags are enabled, whether user-specified or enabled-by-default. Any disabled flags are simply not specified.
However, the original intention of the ConvertToFeatureGateAPI was unclear. Perhaps users should have to manually specify all desired flags instead of merging the two sets?
Related issue(s)
Fixes #