From bc7aa13bf793148b0c6b3b51fd9a8e17bb412712 Mon Sep 17 00:00:00 2001 From: Monis Khan Date: Tue, 5 Mar 2024 10:39:44 -0500 Subject: [PATCH] Mark StructuredAuthenticationConfiguration feature gate as beta Signed-off-by: Monis Khan --- pkg/features/kube_features.go | 2 +- pkg/kubeapiserver/options/authentication_test.go | 4 ++-- staging/src/k8s.io/apiserver/pkg/features/kube_features.go | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 865e7903ac2..05e31df98dc 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -1243,7 +1243,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS genericfeatures.StorageVersionHash: {Default: true, PreRelease: featuregate.Beta}, - genericfeatures.StructuredAuthenticationConfiguration: {Default: false, PreRelease: featuregate.Alpha}, + genericfeatures.StructuredAuthenticationConfiguration: {Default: true, PreRelease: featuregate.Beta}, genericfeatures.StructuredAuthorizationConfiguration: {Default: true, PreRelease: featuregate.Beta}, diff --git a/pkg/kubeapiserver/options/authentication_test.go b/pkg/kubeapiserver/options/authentication_test.go index 6726a4d08ad..eccf3bdbcd1 100644 --- a/pkg/kubeapiserver/options/authentication_test.go +++ b/pkg/kubeapiserver/options/authentication_test.go @@ -214,9 +214,9 @@ func TestAuthenticationValidate(t *testing.T) { expectErr: "number of webhook retry attempts must be greater than 0, but is: 0", }, { - name: "test when authentication config file is set without feature gate", + name: "test when authentication config file is set (feature gate enabled by default)", testAuthenticationConfigFile: "configfile", - expectErr: "set --feature-gates=StructuredAuthenticationConfiguration=true to use authentication-config file", + expectErr: "", }, { name: "test when authentication config file and oidc-* flags are set", diff --git a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go index 0c1ad42c7a9..a18e8a85d0e 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -234,6 +234,7 @@ const ( // owner: @aramase, @enj, @nabokihms // kep: https://kep.k8s.io/3331 // alpha: v1.29 + // beta: v1.30 // // Enables Structured Authentication Configuration StructuredAuthenticationConfiguration featuregate.Feature = "StructuredAuthenticationConfiguration" @@ -337,7 +338,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS StorageVersionHash: {Default: true, PreRelease: featuregate.Beta}, - StructuredAuthenticationConfiguration: {Default: false, PreRelease: featuregate.Alpha}, + StructuredAuthenticationConfiguration: {Default: true, PreRelease: featuregate.Beta}, StructuredAuthorizationConfiguration: {Default: true, PreRelease: featuregate.Beta},