update the --runtime-config handling to ensure that user preferences always take priority over hardcoded preferences #108029
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
k8s-ci-robot
added
release-note-none
k8s-ci-robot
added
approved
deads2k
commented
Feb 9, 2022
| runtimeConfig: map[string]string{ | ||
| "apps/v1/deployments": "false", | ||
| }, | ||
| defaultResourceConfig: func() *serverstore.ResourceConfig { | ||
| return newFakeAPIResourceConfigSource() | ||
| }, | ||
| expectedAPIConfig: func() *serverstore.ResourceConfig { | ||
| return newFakeAPIResourceConfigSource() | ||
| config := newFakeAPIResourceConfigSource() | ||
| config.DisableResources(appsv1.SchemeGroupVersion.WithResource("deployments")) |
There was a problem hiding this comment.
This is now allowed since we're going to need it to enable particular beta APIs.
deads2k
commented
Feb 9, 2022
| @@ -132,13 +139,16 @@ func TestParseRuntimeConfig(t *testing.T) { | |||
| }, | |||
| expectedAPIConfig: func() *serverstore.ResourceConfig { | |||
| config := newFakeAPIResourceConfigSource() | |||
| config.DisableVersions(appsv1.SchemeGroupVersion) | |||
There was a problem hiding this comment.
this API group/version was added to allow new unit testing below.
liggitt
reviewed
Feb 9, 2022
| continue | ||
| } | ||
|
|
||
| tokens := strings.Split(key, "/") | ||
| if len(tokens) < 2 { | ||
| if len(tokens) < 2 || len(tokens) > 3 { |
There was a problem hiding this comment.
non-blocking: should we warn we're ignoring these keys?
liggitt
reviewed
Feb 9, 2022
liggitt
reviewed
Feb 9, 2022
| for _, versionPreference := range versionPreferences { | ||
| // if a user has expressed a preference about a version, that preference takes priority over the hardcoded resources | ||
| resourceConfig.RemoveMatchingResourcePreferences(resourceMatcherForVersion(versionPreference.groupVersion)) | ||
| if versionPreference.enabled { | ||
| // enable the groupVersion for "group/version=true" and "group/version/resource=true" |
There was a problem hiding this comment.
the and "group/version/resource=true" portion of this comment no longer applies here
liggitt
reviewed
Feb 9, 2022
| } else if len(tokens) == 2 { | ||
| resourceConfig.EnableVersions(versionPreference.groupVersion) | ||
|
|
||
| } else { | ||
| // disable the groupVersion only for "group/version=false", not "group/version/resource=false" |
There was a problem hiding this comment.
the not "group/version/resource=false" portion of this comment no longer applies here
liggitt
reviewed
Feb 9, 2022
…always take priority over hardcoded preferences
deads2k
force-pushed
the
just-runtimeconfig
branch
from
edf68f3
to
58e9567
Compare
k8s-ci-robot
added
size/XL
|
/approve verify failure is legitimate (unused var) and a nit on import order |
liggitt
reviewed
Feb 9, 2022
Comment on lines
23
to
25
| appsv1 "k8s.io/api/apps/v1" | ||
|
|
||
| "k8s.io/apimachinery/pkg/runtime/schema" |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: deads2k, liggitt 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 |
deads2k
force-pushed
the
just-runtimeconfig
branch
from
58e9567
to
41b2662
Compare
|
/kind feature |
k8s-ci-robot
added
kind/feature
|
/priority important-soon |
k8s-ci-robot
added
priority/important-soon
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
/triage accepted |
k8s-ci-robot
added
triage/accepted
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.
This is in preparation for the "beta APIs are off by default" implementation. To support that, we need an order of precedence that looks like
This is done by removing the per-resource preferences specified by the default when a stability level or version is specified by the user that overlaps.