diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index d45158cdc..5b6fb58df 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -18,6 +18,7 @@ package features import ( "k8s.io/apimachinery/pkg/util/runtime" + "k8s.io/apimachinery/pkg/util/version" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/component-base/featuregate" ) @@ -55,6 +56,7 @@ const ( // owner: @vinayakankugoyal // kep: https://kep.k8s.io/4633 // alpha: v1.31 + // beta: v1.32 // // Allows us to enable anonymous auth for only certain apiserver endpoints. AnonymousAuthConfigurableEndpoints featuregate.Feature = "AnonymousAuthConfigurableEndpoints" @@ -297,11 +299,19 @@ func init() { // defaultVersionedKubernetesFeatureGates consists of all known Kubernetes-specific feature keys with VersionedSpecs. // To add a new feature, define a key for it above and add it here. The features will be // available throughout Kubernetes binaries. +// +// Entries are alphabetized and separated from each other with blank lines to avoid sweeping gofmt changes +// when adding or removing one entry. var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate.VersionedSpecs{ // Example: // EmulationVersion: { // {Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Alpha}, // }, + + AnonymousAuthConfigurableEndpoints: { + {Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Alpha}, + {Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Beta}, + }, } // defaultKubernetesFeatureGates consists of all known Kubernetes-specific feature keys. @@ -309,8 +319,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate // available throughout Kubernetes binaries. var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{ - AnonymousAuthConfigurableEndpoints: {Default: false, PreRelease: featuregate.Alpha}, - AggregatedDiscoveryEndpoint: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.33 AdmissionWebhookMatchConditions: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.33