Skip to content

Commit 3f26d00

Browse files
authored
Merge pull request kubernetes#129751 from pacoxu/EfficientWatchResumption
remove GAed EfficientWatchResumption
2 parents 7140b49 + 6996431 commit 3f26d00

File tree

3 files changed

+0
-30
lines changed

3 files changed

+0
-30
lines changed

pkg/features/versioned_kube_features.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
288288
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Alpha},
289289
},
290290

291-
genericfeatures.EfficientWatchResumption: {
292-
{Version: version.MustParse("1.20"), Default: false, PreRelease: featuregate.Alpha},
293-
{Version: version.MustParse("1.21"), Default: true, PreRelease: featuregate.Beta},
294-
{Version: version.MustParse("1.24"), Default: true, PreRelease: featuregate.GA, LockToDefault: true},
295-
},
296-
297291
genericfeatures.KMSv1: {
298292
{Version: version.MustParse("1.0"), Default: true, PreRelease: featuregate.GA},
299293
{Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.Deprecated},

staging/src/k8s.io/apiserver/pkg/features/kube_features.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@ const (
116116
// Enables coordinated leader election in the API server
117117
CoordinatedLeaderElection featuregate.Feature = "CoordinatedLeaderElection"
118118

119-
//
120-
// Allows for updating watchcache resource version with progress notify events.
121-
EfficientWatchResumption featuregate.Feature = "EfficientWatchResumption"
122-
123119
// owner: @aramase
124120
// kep: https://kep.k8s.io/3299
125121
// deprecated: v1.28
@@ -331,12 +327,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
331327
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Alpha},
332328
},
333329

334-
EfficientWatchResumption: {
335-
{Version: version.MustParse("1.20"), Default: false, PreRelease: featuregate.Alpha},
336-
{Version: version.MustParse("1.21"), Default: true, PreRelease: featuregate.Beta},
337-
{Version: version.MustParse("1.24"), Default: true, PreRelease: featuregate.GA, LockToDefault: true},
338-
},
339-
340330
KMSv1: {
341331
{Version: version.MustParse("1.0"), Default: true, PreRelease: featuregate.GA},
342332
{Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.Deprecated},

test/featuregates_linter/test_data/versioned_feature_list.yaml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -462,20 +462,6 @@
462462
lockToDefault: false
463463
preRelease: Beta
464464
version: "1.32"
465-
- name: EfficientWatchResumption
466-
versionedSpecs:
467-
- default: false
468-
lockToDefault: false
469-
preRelease: Alpha
470-
version: "1.20"
471-
- default: true
472-
lockToDefault: false
473-
preRelease: Beta
474-
version: "1.21"
475-
- default: true
476-
lockToDefault: true
477-
preRelease: GA
478-
version: "1.24"
479465
- name: ElasticIndexedJob
480466
versionedSpecs:
481467
- default: true

0 commit comments

Comments
 (0)