From efebfe9e3a5aba82c1c3b23711cc24d8fe457d78 Mon Sep 17 00:00:00 2001
From: Anish Ramasekar <anish.ramasekar@gmail.com>
Date: Tue, 13 May 2025 16:06:37 -0700
Subject: [PATCH] Set StructuredAuthenticationConfiguration feature gate to GA
 in v1.34

Signed-off-by: Anish Ramasekar <anish.ramasekar@gmail.com>
---
 pkg/features/kube_features.go                                 | 1 +
 staging/src/k8s.io/apiserver/pkg/features/kube_features.go    | 1 +
 .../reference/versioned_feature_list.yaml                     | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
index d6f16b73f50..6f28fc38873 100644
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -1298,6 +1298,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
 	genericfeatures.StructuredAuthenticationConfiguration: {
 		{Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha},
 		{Version: version.MustParse("1.30"), Default: true, PreRelease: featuregate.Beta},
+		{Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // GA and LockToDefault in 1.34, remove in 1.37
 	},
 
 	genericfeatures.StructuredAuthorizationConfiguration: {
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 9cddc819b17..fd4a9255676 100644
--- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go
+++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go
@@ -392,6 +392,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
 	StructuredAuthenticationConfiguration: {
 		{Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha},
 		{Version: version.MustParse("1.30"), Default: true, PreRelease: featuregate.Beta},
+		{Version: version.MustParse("1.34"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // GA and LockToDefault in 1.34, remove in 1.37
 	},
 
 	StructuredAuthorizationConfiguration: {
diff --git a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml
index ed0c71dbdf8..5b7e7ee9430 100644
--- a/test/compatibility_lifecycle/reference/versioned_feature_list.yaml
+++ b/test/compatibility_lifecycle/reference/versioned_feature_list.yaml
@@ -1527,6 +1527,10 @@
     lockToDefault: false
     preRelease: Beta
     version: "1.30"
+  - default: true
+    lockToDefault: true
+    preRelease: GA
+    version: "1.34"
 - name: StructuredAuthorizationConfiguration
   versionedSpecs:
   - default: false