From bb79c29dd51f46003e0d35cd3d3683a2338448b1 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Mon, 3 Mar 2025 10:45:39 +0800 Subject: [PATCH] remove feature gate RemainingItemCount that was GAed in v1.29 --- pkg/features/versioned_kube_features.go | 6 ------ .../k8s.io/apiserver/pkg/features/kube_features.go | 13 ------------- .../test_data/versioned_feature_list.yaml | 14 -------------- 3 files changed, 33 deletions(-) diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go index cd204bacd96..9a9e1e7cd0b 100644 --- a/pkg/features/versioned_kube_features.go +++ b/pkg/features/versioned_kube_features.go @@ -288,12 +288,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate {Version: version.MustParse("1.24"), Default: true, PreRelease: featuregate.Beta}, }, - genericfeatures.RemainingItemCount: { - {Version: version.MustParse("1.15"), Default: false, PreRelease: featuregate.Alpha}, - {Version: version.MustParse("1.16"), Default: true, PreRelease: featuregate.Beta}, - {Version: version.MustParse("1.29"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - }, - genericfeatures.RemoteRequestHeaderUID: { {Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Alpha}, }, 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 8e4153d1014..4b731f1d256 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -142,13 +142,6 @@ const ( // in the spec returned from kube-apiserver. OpenAPIEnums featuregate.Feature = "OpenAPIEnums" - // owner: @caesarxuchao - // stable: 1.29 - // - // Allow apiservers to show a count of remaining items in the response - // to a chunking list request. - RemainingItemCount featuregate.Feature = "RemainingItemCount" - // owner: @stlaz // // Enable kube-apiserver to accept UIDs via request header authentication. @@ -357,12 +350,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate {Version: version.MustParse("1.24"), Default: true, PreRelease: featuregate.Beta}, }, - RemainingItemCount: { - {Version: version.MustParse("1.15"), Default: false, PreRelease: featuregate.Alpha}, - {Version: version.MustParse("1.16"), Default: true, PreRelease: featuregate.Beta}, - {Version: version.MustParse("1.29"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - }, - RemoteRequestHeaderUID: { {Version: version.MustParse("1.32"), 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 7ea158e9531..5206476a42e 100644 --- a/test/featuregates_linter/test_data/versioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/versioned_feature_list.yaml @@ -1034,20 +1034,6 @@ lockToDefault: false preRelease: Beta version: "1.31" -- name: RemainingItemCount - versionedSpecs: - - default: false - lockToDefault: false - preRelease: Alpha - version: "1.15" - - default: true - lockToDefault: false - preRelease: Beta - version: "1.16" - - default: true - lockToDefault: true - preRelease: GA - version: "1.29" - name: RemoteRequestHeaderUID versionedSpecs: - default: false