From 11bbc0efb984a04a12f436de58a29366536b464f Mon Sep 17 00:00:00 2001 From: Jefftree Date: Tue, 3 Sep 2024 19:20:29 +0000 Subject: [PATCH] update discrepency betwen kube_features and website --- pkg/features/versioned_kube_features.go | 6 ++++-- .../test_data/versioned_feature_list.yaml | 12 ++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go index 1681b832eaf..ce54c8fc615 100644 --- a/pkg/features/versioned_kube_features.go +++ b/pkg/features/versioned_kube_features.go @@ -210,7 +210,8 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate }, MinDomainsInPodTopologySpread: { {Version: version.MustParse("1.24"), Default: false, PreRelease: featuregate.Alpha}, - {Version: version.MustParse("1.25"), Default: true, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.25"), Default: false, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.27"), Default: true, PreRelease: featuregate.Beta}, {Version: version.MustParse("1.30"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32 }, MultiCIDRServiceAllocator: { @@ -370,7 +371,8 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate }, TopologyAwareHints: { {Version: version.MustParse("1.21"), Default: false, PreRelease: featuregate.Alpha}, - {Version: version.MustParse("1.23"), Default: true, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.23"), Default: false, PreRelease: featuregate.Beta}, + {Version: version.MustParse("1.24"), Default: true, PreRelease: featuregate.Beta}, }, TopologyManagerPolicyAlphaOptions: { {Version: version.MustParse("1.26"), Default: false, PreRelease: featuregate.Alpha}, diff --git a/test/featuregates_linter/test_data/versioned_feature_list.yaml b/test/featuregates_linter/test_data/versioned_feature_list.yaml index 76f351a7cac..337c81bcf4c 100644 --- a/test/featuregates_linter/test_data/versioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/versioned_feature_list.yaml @@ -468,10 +468,14 @@ lockToDefault: false preRelease: Alpha version: "1.24" - - default: true + - default: false lockToDefault: false preRelease: Beta version: "1.25" + - default: true + lockToDefault: false + preRelease: Beta + version: "1.27" - default: true lockToDefault: true preRelease: GA @@ -876,10 +880,14 @@ lockToDefault: false preRelease: Alpha version: "1.21" - - default: true + - default: false lockToDefault: false preRelease: Beta version: "1.23" + - default: true + lockToDefault: false + preRelease: Beta + version: "1.24" - name: TopologyManagerPolicyAlphaOptions versionedSpecs: - default: false