From a67de3139d94c4a0e806a43b4bdc6ca8c92f454c Mon Sep 17 00:00:00 2001
From: Aaron Prindle <aprindle@google.com>
Date: Thu, 22 Aug 2024 20:45:45 +0000
Subject: [PATCH] chore: migrate kube feature
 RelaxedEnvironmentVariableValidation to new versioned kube feature file and
 syntax

---
 pkg/features/kube_features.go                             | 2 --
 pkg/features/versioned_kube_features.go                   | 8 ++++----
 .../test_data/unversioned_feature_list.yaml               | 6 ------
 .../test_data/versioned_feature_list.yaml                 | 7 ++++++-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go
index 261760d6aae..81758e94ada 100644
--- a/pkg/features/kube_features.go
+++ b/pkg/features/kube_features.go
@@ -1144,8 +1144,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
 
 	RecoverVolumeExpansionFailure: {Default: false, PreRelease: featuregate.Alpha},
 
-	RelaxedEnvironmentVariableValidation: {Default: false, PreRelease: featuregate.Alpha},
-
 	ReloadKubeletServerCertificateFile: {Default: true, PreRelease: featuregate.Beta},
 
 	ResourceHealthStatus: {Default: false, PreRelease: featuregate.Alpha},
diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go
index 7ef53861822..50cd4742913 100644
--- a/pkg/features/versioned_kube_features.go
+++ b/pkg/features/versioned_kube_features.go
@@ -17,6 +17,7 @@ limitations under the License.
 package features
 
 import (
+	"k8s.io/apimachinery/pkg/util/version"
 	"k8s.io/component-base/featuregate"
 )
 
@@ -27,8 +28,7 @@ import (
 // Entries are 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:
-	// genericfeatures.EmulationVersion: {
-	// 	{Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Alpha},
-	// },
+	RelaxedEnvironmentVariableValidation: {
+		{Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Alpha},
+	},
 }
diff --git a/test/featuregates_linter/test_data/unversioned_feature_list.yaml b/test/featuregates_linter/test_data/unversioned_feature_list.yaml
index 7a5e85770b2..91e14a79a57 100644
--- a/test/featuregates_linter/test_data/unversioned_feature_list.yaml
+++ b/test/featuregates_linter/test_data/unversioned_feature_list.yaml
@@ -628,12 +628,6 @@
     lockToDefault: false
     preRelease: Beta
     version: ""
-- name: RelaxedEnvironmentVariableValidation
-  versionedSpecs:
-  - default: false
-    lockToDefault: false
-    preRelease: Alpha
-    version: ""
 - name: ReloadKubeletServerCertificateFile
   versionedSpecs:
   - default: true
diff --git a/test/featuregates_linter/test_data/versioned_feature_list.yaml b/test/featuregates_linter/test_data/versioned_feature_list.yaml
index fe51488c706..58468345aac 100644
--- a/test/featuregates_linter/test_data/versioned_feature_list.yaml
+++ b/test/featuregates_linter/test_data/versioned_feature_list.yaml
@@ -1 +1,6 @@
-[]
+- name: RelaxedEnvironmentVariableValidation
+  versionedSpecs:
+  - default: false
+    lockToDefault: false
+    preRelease: Alpha
+    version: "1.30"