Merge pull request kubernetes#124048 from bertinatto/fix-uncertain-reconstruction-gate

k8s-ci-robot · web-flow · commit 03ce04584437 · 2024-03-27T01:54:53.000-07:00
Use the right feature gate when updating uncertain volumes
diff --git a/pkg/kubelet/volumemanager/cache/actual_state_of_world.go b/pkg/kubelet/volumemanager/cache/actual_state_of_world.go
@@ -717,7 +717,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.SELinuxMountReadWriteOncePod) && podObj.volumeMountStateForPod == operationexecutor.VolumeMountUncertain
+		updateUncertainVolume = utilfeature.DefaultFeatureGate.Enabled(features.NewVolumeManagerReconstruction) && podObj.volumeMountStateForPod == operationexecutor.VolumeMountUncertain
 	}
 	if !podExists || updateUncertainVolume {
 		// Add new mountedPod or update existing one.

Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ func (asw *actualStateOfWorld) AddPodToVolume(markVolumeOpts operationexecutor.M`
`717`	`717`	`// Update uncertain volumes - the new markVolumeOpts may have updated information.`
`718`	`718`	`// Especially reconstructed volumes (marked as uncertain during reconstruction) need`
`719`	`719`	`// an update.`
`720`		`- updateUncertainVolume = utilfeature.DefaultFeatureGate.Enabled(features.SELinuxMountReadWriteOncePod) && podObj.volumeMountStateForPod == operationexecutor.VolumeMountUncertain`
	`720`	`+ updateUncertainVolume = utilfeature.DefaultFeatureGate.Enabled(features.NewVolumeManagerReconstruction) && podObj.volumeMountStateForPod == operationexecutor.VolumeMountUncertain`
`721`	`721`	`}`
`722`	`722`	`if !podExists \|\| updateUncertainVolume {`
`723`	`723`	`// Add new mountedPod or update existing one.`