diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 7306ac60175..ec96a027879 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -1239,10 +1239,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS genericfeatures.SeparateCacheWatchRPC: {Default: true, PreRelease: featuregate.Beta}, - genericfeatures.ServerSideApply: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.29 - - genericfeatures.ServerSideFieldValidation: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.29 - genericfeatures.StorageVersionAPI: {Default: false, PreRelease: featuregate.Alpha}, genericfeatures.StorageVersionHash: {Default: true, PreRelease: featuregate.Beta}, 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 1fd3b8e0003..d45158cdcad 100644 --- a/staging/src/k8s.io/apiserver/pkg/features/kube_features.go +++ b/staging/src/k8s.io/apiserver/pkg/features/kube_features.go @@ -166,22 +166,6 @@ const ( // This prevents watch cache from being starved by other watches. SeparateCacheWatchRPC featuregate.Feature = "SeparateCacheWatchRPC" - // owner: @apelisse, @lavalamp - // alpha: v1.14 - // beta: v1.16 - // stable: v1.22 - // - // Server-side apply. Merging happens on the server. - ServerSideApply featuregate.Feature = "ServerSideApply" - - // owner: @kevindelgado - // kep: https://kep.k8s.io/2885 - // alpha: v1.23 - // beta: v1.24 - // - // Enables server-side field validation. - ServerSideFieldValidation featuregate.Feature = "ServerSideFieldValidation" - // owner: @enj // beta: v1.29 // @@ -361,10 +345,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS SeparateCacheWatchRPC: {Default: true, PreRelease: featuregate.Beta}, - ServerSideApply: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.29 - - ServerSideFieldValidation: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.29 - StorageVersionAPI: {Default: false, PreRelease: featuregate.Alpha}, StorageVersionHash: {Default: true, PreRelease: featuregate.Beta}, diff --git a/test/featuregates_linter/test_data/unversioned_feature_list.yaml b/test/featuregates_linter/test_data/unversioned_feature_list.yaml index 49c54e051e6..7c33fa0ce7b 100644 --- a/test/featuregates_linter/test_data/unversioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/unversioned_feature_list.yaml @@ -688,18 +688,6 @@ lockToDefault: false preRelease: Beta version: "" -- name: ServerSideApply - versionedSpecs: - - default: true - lockToDefault: true - preRelease: GA - version: "" -- name: ServerSideFieldValidation - versionedSpecs: - - default: true - lockToDefault: true - preRelease: GA - version: "" - name: ServiceAccountTokenJTI versionedSpecs: - default: true