Skip to content

Commit 8d32f22

Browse files
committed
cleanup after NewVolumeManagerReconstruction is GA
1 parent bce499c commit 8d32f22

File tree

4 files changed

+1
-33
lines changed

4 files changed

+1
-33
lines changed

pkg/features/kube_features.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -481,14 +481,6 @@ const (
481481
// Enables the dynamic configuration of Service IP ranges
482482
MultiCIDRServiceAllocator featuregate.Feature = "MultiCIDRServiceAllocator"
483483

484-
// owner: @jsafrane
485-
// kep: https://kep.k8s.io/3756
486-
// alpha: v1.25 (as part of SELinuxMountReadWriteOncePod)
487-
// beta: v1.27
488-
// GA: v1.30
489-
// Robust VolumeManager reconstruction after kubelet restart.
490-
NewVolumeManagerReconstruction featuregate.Feature = "NewVolumeManagerReconstruction"
491-
492484
// owner: @danwinship
493485
// kep: https://kep.k8s.io/3866
494486
// alpha: v1.29

pkg/features/versioned_kube_features.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
218218
{Version: version.MustParse("1.27"), Default: false, PreRelease: featuregate.Alpha},
219219
{Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Beta},
220220
},
221-
NewVolumeManagerReconstruction: {
222-
{Version: version.MustParse("1.25"), Default: false, PreRelease: featuregate.Alpha},
223-
{Version: version.MustParse("1.27"), Default: false, PreRelease: featuregate.Beta},
224-
{Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.Beta},
225-
{Version: version.MustParse("1.30"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32
226-
},
227221
NFTablesProxyMode: {
228222
{Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha},
229223
{Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.Beta},

pkg/kubelet/volumemanager/cache/actual_state_of_world.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ func (asw *actualStateOfWorld) AddPodToVolume(markVolumeOpts operationexecutor.M
738738
// Update uncertain volumes - the new markVolumeOpts may have updated information.
739739
// Especially reconstructed volumes (marked as uncertain during reconstruction) need
740740
// an update.
741-
updateUncertainVolume = utilfeature.DefaultFeatureGate.Enabled(features.NewVolumeManagerReconstruction) && podObj.volumeMountStateForPod == operationexecutor.VolumeMountUncertain
741+
updateUncertainVolume = podObj.volumeMountStateForPod == operationexecutor.VolumeMountUncertain
742742
}
743743
if !podExists || updateUncertainVolume {
744744
// Add new mountedPod or update existing one.

test/featuregates_linter/test_data/versioned_feature_list.yaml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -500,24 +500,6 @@
500500
lockToDefault: false
501501
preRelease: Beta
502502
version: "1.31"
503-
- name: NewVolumeManagerReconstruction
504-
versionedSpecs:
505-
- default: false
506-
lockToDefault: false
507-
preRelease: Alpha
508-
version: "1.25"
509-
- default: false
510-
lockToDefault: false
511-
preRelease: Beta
512-
version: "1.27"
513-
- default: true
514-
lockToDefault: false
515-
preRelease: Beta
516-
version: "1.28"
517-
- default: true
518-
lockToDefault: true
519-
preRelease: GA
520-
version: "1.30"
521503
- name: NFTablesProxyMode
522504
versionedSpecs:
523505
- default: false

0 commit comments

Comments
 (0)