Skip to content

Commit a7937f5

Browse files
committed
Remove WatchBookmark feature gate
1 parent 728a4d2 commit a7937f5

File tree

4 files changed

+4
-36
lines changed

4 files changed

+4
-36
lines changed

pkg/features/versioned_kube_features.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -368,12 +368,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
368368
{Version: version.MustParse("1.29"), Default: true, PreRelease: featuregate.Beta},
369369
},
370370

371-
genericfeatures.WatchBookmark: {
372-
{Version: version.MustParse("1.15"), Default: false, PreRelease: featuregate.Alpha},
373-
{Version: version.MustParse("1.16"), Default: true, PreRelease: featuregate.Beta},
374-
{Version: version.MustParse("1.17"), Default: true, PreRelease: featuregate.GA, LockToDefault: true},
375-
},
376-
377371
genericfeatures.WatchCacheInitializationPostStartHook: {
378372
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Beta},
379373
},

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,6 @@ const (
234234
// Enables Structured Authorization Configuration
235235
StructuredAuthorizationConfiguration featuregate.Feature = "StructuredAuthorizationConfiguration"
236236

237-
// owner: @wojtek-t
238-
//
239-
// Enables support for watch bookmark events.
240-
WatchBookmark featuregate.Feature = "WatchBookmark"
241-
242237
// owner: @wojtek-t
243238
//
244239
// Enables post-start-hook for storage readiness
@@ -429,12 +424,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
429424
{Version: version.MustParse("1.29"), Default: true, PreRelease: featuregate.Beta},
430425
},
431426

432-
WatchBookmark: {
433-
{Version: version.MustParse("1.15"), Default: false, PreRelease: featuregate.Alpha},
434-
{Version: version.MustParse("1.16"), Default: true, PreRelease: featuregate.Beta},
435-
{Version: version.MustParse("1.17"), Default: true, PreRelease: featuregate.GA, LockToDefault: true},
436-
},
437-
438427
WatchCacheInitializationPostStartHook: {
439428
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Beta},
440429
},

staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1240,7 +1240,6 @@ func (e *Store) DeleteCollection(ctx context.Context, deleteValidation rest.Vali
12401240

12411241
var items []runtime.Object
12421242

1243-
// TODO(wojtek-t): Decide if we don't want to start workers more opportunistically.
12441243
workersNumber := e.DeleteCollectionWorkers
12451244
if workersNumber < 1 {
12461245
workersNumber = 1

test/featuregates_linter/test_data/versioned_feature_list.yaml

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -964,10 +964,10 @@
964964
version: "1.32"
965965
- name: PodLogsQuerySplitStreams
966966
versionedSpecs:
967-
- default: false
968-
lockToDefault: false
969-
preRelease: Alpha
970-
version: "1.32"
967+
- default: false
968+
lockToDefault: false
969+
preRelease: Alpha
970+
version: "1.32"
971971
- name: PodReadyToStartContainersCondition
972972
versionedSpecs:
973973
- default: false
@@ -1482,20 +1482,6 @@
14821482
lockToDefault: false
14831483
preRelease: Alpha
14841484
version: "1.21"
1485-
- name: WatchBookmark
1486-
versionedSpecs:
1487-
- default: false
1488-
lockToDefault: false
1489-
preRelease: Alpha
1490-
version: "1.15"
1491-
- default: true
1492-
lockToDefault: false
1493-
preRelease: Beta
1494-
version: "1.16"
1495-
- default: true
1496-
lockToDefault: true
1497-
preRelease: GA
1498-
version: "1.17"
14991485
- name: WatchCacheInitializationPostStartHook
15001486
versionedSpecs:
15011487
- default: false

0 commit comments

Comments
 (0)