diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index c68b8fba6cd..8fbe2673c26 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -472,14 +472,6 @@ const ( // Enables the dynamic configuration of Service IP ranges MultiCIDRServiceAllocator featuregate.Feature = "MultiCIDRServiceAllocator" - // owner: @jsafrane - // kep: https://kep.k8s.io/3756 - // alpha: v1.25 (as part of SELinuxMountReadWriteOncePod) - // beta: v1.27 - // GA: v1.30 - // Robust VolumeManager reconstruction after kubelet restart. - NewVolumeManagerReconstruction featuregate.Feature = "NewVolumeManagerReconstruction" - // owner: @danwinship // kep: https://kep.k8s.io/3866 // alpha: v1.29 diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go index 21cbdb2a3e0..048474947c6 100644 --- a/pkg/features/versioned_kube_features.go +++ b/pkg/features/versioned_kube_features.go @@ -212,12 +212,6 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate {Version: version.MustParse("1.27"), Default: false, PreRelease: featuregate.Alpha}, {Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Beta}, }, - NewVolumeManagerReconstruction: { - {Version: version.MustParse("1.25"), Default: false, PreRelease: featuregate.Alpha}, - {Version: version.MustParse("1.27"), Default: false, PreRelease: featuregate.Beta}, - {Version: version.MustParse("1.28"), Default: true, PreRelease: featuregate.Beta}, - {Version: version.MustParse("1.30"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32 - }, NFTablesProxyMode: { {Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha}, {Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.Beta}, diff --git a/pkg/kubelet/volumemanager/cache/actual_state_of_world.go b/pkg/kubelet/volumemanager/cache/actual_state_of_world.go index d4627326726..0d3cdedae75 100644 --- a/pkg/kubelet/volumemanager/cache/actual_state_of_world.go +++ b/pkg/kubelet/volumemanager/cache/actual_state_of_world.go @@ -738,7 +738,7 @@ func (asw *actualStateOfWorld) AddPodToVolume(markVolumeOpts operationexecutor.M // Update uncertain volumes - the new markVolumeOpts may have updated information. // Especially reconstructed volumes (marked as uncertain during reconstruction) need // an update. - updateUncertainVolume = utilfeature.DefaultFeatureGate.Enabled(features.NewVolumeManagerReconstruction) && podObj.volumeMountStateForPod == operationexecutor.VolumeMountUncertain + updateUncertainVolume = podObj.volumeMountStateForPod == operationexecutor.VolumeMountUncertain } if !podExists || updateUncertainVolume { // Add new mountedPod or update existing one. diff --git a/test/featuregates_linter/test_data/versioned_feature_list.yaml b/test/featuregates_linter/test_data/versioned_feature_list.yaml index a0a9f6b4bbb..e0dc157f936 100644 --- a/test/featuregates_linter/test_data/versioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/versioned_feature_list.yaml @@ -488,24 +488,6 @@ lockToDefault: false preRelease: Beta version: "1.31" -- name: NewVolumeManagerReconstruction - versionedSpecs: - - default: false - lockToDefault: false - preRelease: Alpha - version: "1.25" - - default: false - lockToDefault: false - preRelease: Beta - version: "1.27" - - default: true - lockToDefault: false - preRelease: Beta - version: "1.28" - - default: true - lockToDefault: true - preRelease: GA - version: "1.30" - name: NFTablesProxyMode versionedSpecs: - default: false