diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 2312603ef42..7f0f6b38ec5 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -1133,8 +1133,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 d81e6ff8481..26a38849e28 100644 --- a/test/featuregates_linter/test_data/unversioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/unversioned_feature_list.yaml @@ -622,12 +622,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"