Skip to content

Commit d6bad27

Browse files
committed
DRA apiserver: allow DRAAdminAccess feature without DynamicResourceAllocation
This makes a configuration with --feature-gates=AllAlpha=true valid again. Without this change, that flag enabled DRAAdminAccess without DynamicResourceAllocation being enabled (default off!) and the kube-apiserver refused to start. While DRAAdminAccess isn't usable without DynamicResourceAllocation, it's also not really wrong to allow it - it simply won't matter.
1 parent a1b8e9d commit d6bad27

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

pkg/controlplane/apiserver/options/validation.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,6 @@ func validateNodeSelectorAuthorizationFeature() []error {
7777
return nil
7878
}
7979

80-
func validateDRAAdminAccessFeature() []error {
81-
if utilfeature.DefaultFeatureGate.Enabled(features.DRAAdminAccess) && !utilfeature.DefaultFeatureGate.Enabled(features.DynamicResourceAllocation) {
82-
return []error{fmt.Errorf("DRAAdminAccess feature requires DynamicResourceAllocation feature to be enabled")}
83-
}
84-
return nil
85-
}
86-
8780
func validateUnknownVersionInteroperabilityProxyFeature() []error {
8881
if utilfeature.DefaultFeatureGate.Enabled(features.UnknownVersionInteroperabilityProxy) {
8982
if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.StorageVersionAPI) {
@@ -128,7 +121,6 @@ func (s *Options) Validate() []error {
128121
errs = append(errs, validateUnknownVersionInteroperabilityProxyFeature()...)
129122
errs = append(errs, validateUnknownVersionInteroperabilityProxyFlags(s)...)
130123
errs = append(errs, validateNodeSelectorAuthorizationFeature()...)
131-
errs = append(errs, validateDRAAdminAccessFeature()...)
132124

133125
return errs
134126
}

0 commit comments

Comments
 (0)