From 92c36f59b1e02fa2acd4bb9bedd7dcdcba0f736f Mon Sep 17 00:00:00 2001 From: Jefftree Date: Wed, 4 Sep 2024 14:37:34 +0000 Subject: [PATCH] fix feature gate version introduced --- pkg/features/kube_features.go | 4 +-- pkg/features/versioned_kube_features.go | 14 +++++--- .../test_data/unversioned_feature_list.yaml | 6 ---- .../test_data/versioned_feature_list.yaml | 36 ++++++++++++++++--- 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 32563b7e2d0..130a4821342 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -574,7 +574,7 @@ const ( PodIndexLabel featuregate.Feature = "PodIndexLabel" // owner: @ddebroy, @kannon92 - // alpha: v1.25 + // alpha: v1.28 // beta: v1.29 // // Enables reporting of PodReadyToStartContainersCondition condition in pod status after pod @@ -912,7 +912,7 @@ const ( ImageMaximumGCAge featuregate.Feature = "ImageMaximumGCAge" // owner: @saschagrunert - // alpha: v1.28 + // alpha: v1.29 // // Enables user namespace support for Pod Security Standards. Enabling this // feature will modify all Pod Security Standard rules to allow setting: diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go index ce54c8fc615..ec9d0034bd1 100644 --- a/pkg/features/versioned_kube_features.go +++ b/pkg/features/versioned_kube_features.go @@ -220,7 +220,8 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate }, NewVolumeManagerReconstruction: { {Version: version.MustParse("1.25"), Default: false, PreRelease: featuregate.Alpha}, - {Version: version.MustParse("1.27"), Default: true, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.27"), Default: false, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.Beta}, {Version: version.MustParse("1.30"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32 }, NFTablesProxyMode: { @@ -267,7 +268,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate {Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.Beta}, }, PodReadyToStartContainersCondition: { - {Version: version.MustParse("1.25"), Default: false, PreRelease: featuregate.Alpha}, + {Version: version.MustParse("1.28"), Default: false, PreRelease: featuregate.Alpha}, {Version: version.MustParse("1.29"), Default: true, PreRelease: featuregate.Beta}, }, PodHostIPs: { @@ -324,6 +325,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate {Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // GA in 1.31, remove in 1.32 }, SchedulerQueueingHints: { + {Version: version.MustParse("1.27"), Default: true, PreRelease: featuregate.Beta}, {Version: version.MustParse("1.28"), Default: false, PreRelease: featuregate.Beta}, }, SeparateTaintEvictionController: { @@ -378,7 +380,8 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate {Version: version.MustParse("1.26"), Default: false, PreRelease: featuregate.Alpha}, }, TopologyManagerPolicyBetaOptions: { - {Version: version.MustParse("1.26"), Default: true, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.26"), Default: false, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.Beta}, }, TopologyManagerPolicyOptions: { {Version: version.MustParse("1.26"), Default: true, PreRelease: featuregate.Beta}, @@ -417,7 +420,8 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate }, SELinuxMountReadWriteOncePod: { {Version: version.MustParse("1.25"), Default: false, PreRelease: featuregate.Alpha}, - {Version: version.MustParse("1.27"), Default: true, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.27"), Default: false, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.Beta}, }, LoadBalancerIPMode: { {Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha}, @@ -428,7 +432,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate {Version: version.MustParse("1.30"), Default: true, PreRelease: featuregate.Beta}, }, UserNamespacesPodSecurityStandards: { - {Version: version.MustParse("1.28"), Default: false, PreRelease: featuregate.Alpha}, + {Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha}, }, SELinuxMount: { {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 beeb5d1f1ff..ab64d8e6f7e 100644 --- a/test/featuregates_linter/test_data/unversioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/unversioned_feature_list.yaml @@ -22,12 +22,6 @@ lockToDefault: false preRelease: Deprecated version: "" -- name: AnonymousAuthConfigurableEndpoints - versionedSpecs: - - default: false - lockToDefault: false - preRelease: Alpha - version: "" - name: APIListChunking 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 337c81bcf4c..06ac0efdf5c 100644 --- a/test/featuregates_linter/test_data/versioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/versioned_feature_list.yaml @@ -1,3 +1,13 @@ +- name: AnonymousAuthConfigurableEndpoints + versionedSpecs: + - default: false + lockToDefault: false + preRelease: Alpha + version: "1.31" + - default: true + lockToDefault: false + preRelease: Beta + version: "1.32" - name: AnyVolumeDataSource versionedSpecs: - default: false @@ -496,10 +506,14 @@ lockToDefault: false preRelease: Alpha version: "1.25" - - default: true + - default: false lockToDefault: false preRelease: Beta version: "1.27" + - default: true + lockToDefault: false + preRelease: Beta + version: "1.28" - default: true lockToDefault: true preRelease: GA @@ -655,7 +669,7 @@ - default: false lockToDefault: false preRelease: Alpha - version: "1.25" + version: "1.28" - default: true lockToDefault: false preRelease: Beta @@ -742,6 +756,10 @@ version: "1.29" - name: SchedulerQueueingHints versionedSpecs: + - default: true + lockToDefault: false + preRelease: Beta + version: "1.27" - default: false lockToDefault: false preRelease: Beta @@ -758,10 +776,14 @@ lockToDefault: false preRelease: Alpha version: "1.25" - - default: true + - default: false lockToDefault: false preRelease: Beta version: "1.27" + - default: true + lockToDefault: false + preRelease: Beta + version: "1.28" - name: SeparateTaintEvictionController versionedSpecs: - default: true @@ -896,10 +918,14 @@ version: "1.26" - name: TopologyManagerPolicyBetaOptions versionedSpecs: - - default: true + - default: false lockToDefault: false preRelease: Beta version: "1.26" + - default: true + lockToDefault: false + preRelease: Beta + version: "1.28" - name: TopologyManagerPolicyOptions versionedSpecs: - default: true @@ -927,7 +953,7 @@ - default: false lockToDefault: false preRelease: Alpha - version: "1.28" + version: "1.29" - name: UserNamespacesSupport versionedSpecs: - default: false