Skip to content

Commit 8f80e01

Browse files
authored
Merge pull request kubernetes#123719 from enj/enj/f/authn_config_beta
Mark StructuredAuthenticationConfiguration feature gate as beta
2 parents 09093f2 + bc7aa13 commit 8f80e01

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

pkg/features/kube_features.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1297,7 +1297,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
12971297

12981298
genericfeatures.StorageVersionHash: {Default: true, PreRelease: featuregate.Beta},
12991299

1300-
genericfeatures.StructuredAuthenticationConfiguration: {Default: false, PreRelease: featuregate.Alpha},
1300+
genericfeatures.StructuredAuthenticationConfiguration: {Default: true, PreRelease: featuregate.Beta},
13011301

13021302
genericfeatures.StructuredAuthorizationConfiguration: {Default: true, PreRelease: featuregate.Beta},
13031303

pkg/kubeapiserver/options/authentication_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@ func TestAuthenticationValidate(t *testing.T) {
214214
expectErr: "number of webhook retry attempts must be greater than 0, but is: 0",
215215
},
216216
{
217-
name: "test when authentication config file is set without feature gate",
217+
name: "test when authentication config file is set (feature gate enabled by default)",
218218
testAuthenticationConfigFile: "configfile",
219-
expectErr: "set --feature-gates=StructuredAuthenticationConfiguration=true to use authentication-config file",
219+
expectErr: "",
220220
},
221221
{
222222
name: "test when authentication config file and oidc-* flags are set",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ const (
237237
// owner: @aramase, @enj, @nabokihms
238238
// kep: https://kep.k8s.io/3331
239239
// alpha: v1.29
240+
// beta: v1.30
240241
//
241242
// Enables Structured Authentication Configuration
242243
StructuredAuthenticationConfiguration featuregate.Feature = "StructuredAuthenticationConfiguration"
@@ -340,7 +341,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
340341

341342
StorageVersionHash: {Default: true, PreRelease: featuregate.Beta},
342343

343-
StructuredAuthenticationConfiguration: {Default: false, PreRelease: featuregate.Alpha},
344+
StructuredAuthenticationConfiguration: {Default: true, PreRelease: featuregate.Beta},
344345

345346
StructuredAuthorizationConfiguration: {Default: true, PreRelease: featuregate.Beta},
346347

0 commit comments

Comments
 (0)