Skip to content

Commit 8b664fd

Browse files
authored
Merge pull request kubernetes#127009 from vinayakankugoyal/kep4633
KEP-4633: Graduate to BETA.
2 parents bb3b6c8 + 8a4e23e commit 8b664fd

File tree

5 files changed

+28
-11
lines changed

5 files changed

+28
-11
lines changed

pkg/features/kube_features.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,8 +1206,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
12061206

12071207
genericfeatures.AggregatedDiscoveryEndpoint: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.33
12081208

1209-
genericfeatures.AnonymousAuthConfigurableEndpoints: {Default: false, PreRelease: featuregate.Alpha},
1210-
12111209
genericfeatures.APIListChunking: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32
12121210

12131211
genericfeatures.APIResponseCompression: {Default: true, PreRelease: featuregate.Beta},

pkg/features/versioned_kube_features.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,26 @@ package features
1818

1919
import (
2020
"k8s.io/apimachinery/pkg/util/version"
21+
genericfeatures "k8s.io/apiserver/pkg/features"
2122
"k8s.io/component-base/featuregate"
2223
)
2324

2425
// defaultVersionedKubernetesFeatureGates consists of all known Kubernetes-specific feature keys with VersionedSpecs.
2526
// To add a new feature, define a key for it and add it here. The features will be
2627
// available throughout Kubernetes binaries.
2728
//
28-
// Entries are separated from each other with blank lines to avoid sweeping gofmt changes
29+
// Entries are alphabetized and separated from each other with blank lines to avoid sweeping gofmt changes
2930
// when adding or removing one entry.
3031
var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate.VersionedSpecs{
32+
genericfeatures.AnonymousAuthConfigurableEndpoints: {
33+
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Alpha},
34+
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Beta},
35+
},
36+
3137
RelaxedEnvironmentVariableValidation: {
3238
{Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Alpha},
3339
},
40+
3441
VolumeAttributesClass: {
3542
{Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha},
3643
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Beta},

staging/src/k8s.io/apiserver/pkg/features/kube_features.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package features
1818

1919
import (
2020
"k8s.io/apimachinery/pkg/util/runtime"
21+
"k8s.io/apimachinery/pkg/util/version"
2122
utilfeature "k8s.io/apiserver/pkg/util/feature"
2223
"k8s.io/component-base/featuregate"
2324
)
@@ -55,6 +56,7 @@ const (
5556
// owner: @vinayakankugoyal
5657
// kep: https://kep.k8s.io/4633
5758
// alpha: v1.31
59+
// beta: v1.32
5860
//
5961
// Allows us to enable anonymous auth for only certain apiserver endpoints.
6062
AnonymousAuthConfigurableEndpoints featuregate.Feature = "AnonymousAuthConfigurableEndpoints"
@@ -297,20 +299,26 @@ func init() {
297299
// defaultVersionedKubernetesFeatureGates consists of all known Kubernetes-specific feature keys with VersionedSpecs.
298300
// To add a new feature, define a key for it above and add it here. The features will be
299301
// available throughout Kubernetes binaries.
302+
//
303+
// Entries are alphabetized and separated from each other with blank lines to avoid sweeping gofmt changes
304+
// when adding or removing one entry.
300305
var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate.VersionedSpecs{
301306
// Example:
302307
// EmulationVersion: {
303308
// {Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Alpha},
304309
// },
310+
311+
AnonymousAuthConfigurableEndpoints: {
312+
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Alpha},
313+
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Beta},
314+
},
305315
}
306316

307317
// defaultKubernetesFeatureGates consists of all known Kubernetes-specific feature keys.
308318
// To add a new feature, define a key for it above and add it here. The features will be
309319
// available throughout Kubernetes binaries.
310320
var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
311321

312-
AnonymousAuthConfigurableEndpoints: {Default: false, PreRelease: featuregate.Alpha},
313-
314322
AggregatedDiscoveryEndpoint: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.33
315323

316324
AdmissionWebhookMatchConditions: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.33

test/featuregates_linter/test_data/unversioned_feature_list.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@
2222
lockToDefault: false
2323
preRelease: Deprecated
2424
version: ""
25-
- name: AnonymousAuthConfigurableEndpoints
26-
versionedSpecs:
27-
- default: false
28-
lockToDefault: false
29-
preRelease: Alpha
30-
version: ""
3125
- name: AnyVolumeDataSource
3226
versionedSpecs:
3327
- default: true

test/featuregates_linter/test_data/versioned_feature_list.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
- name: AnonymousAuthConfigurableEndpoints
2+
versionedSpecs:
3+
- default: false
4+
lockToDefault: false
5+
preRelease: Alpha
6+
version: "1.31"
7+
- default: true
8+
lockToDefault: false
9+
preRelease: Beta
10+
version: "1.32"
111
- name: RelaxedEnvironmentVariableValidation
212
versionedSpecs:
313
- default: false

0 commit comments

Comments
 (0)