From 9d10b1f799408ce315260973816dc833b656c54b Mon Sep 17 00:00:00 2001 From: xigang Date: Fri, 19 Sep 2025 20:27:17 +0800 Subject: [PATCH] refactor: remove unused desiredStateOfWorld parameter from DetermineVolumeAction Signed-off-by: xigang --- pkg/controller/volume/attachdetach/attach_detach_controller.go | 3 --- .../attachdetach/populator/desired_state_of_world_populator.go | 1 - pkg/controller/volume/attachdetach/util/util.go | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/controller/volume/attachdetach/attach_detach_controller.go b/pkg/controller/volume/attachdetach/attach_detach_controller.go index 9a15c63ed42..63f381ba109 100644 --- a/pkg/controller/volume/attachdetach/attach_detach_controller.go +++ b/pkg/controller/volume/attachdetach/attach_detach_controller.go @@ -508,7 +508,6 @@ func (adc *attachDetachController) podAdd(logger klog.Logger, obj interface{}) { volumeActionFlag := util.DetermineVolumeAction( pod, - adc.desiredStateOfWorld, true /* default volume action */) util.ProcessPodVolumes(logger, pod, volumeActionFlag, /* addVolumes */ @@ -532,7 +531,6 @@ func (adc *attachDetachController) podUpdate(logger klog.Logger, oldObj, newObj volumeActionFlag := util.DetermineVolumeAction( pod, - adc.desiredStateOfWorld, true /* default volume action */) util.ProcessPodVolumes(logger, pod, volumeActionFlag, /* addVolumes */ @@ -668,7 +666,6 @@ func (adc *attachDetachController) syncPVCByKey(logger klog.Logger, key string) } volumeActionFlag := util.DetermineVolumeAction( pod, - adc.desiredStateOfWorld, true /* default volume action */) util.ProcessPodVolumes(logger, pod, volumeActionFlag, /* addVolumes */ diff --git a/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go b/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go index 620abaa0a4b..b74d58ec032 100644 --- a/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go +++ b/pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go @@ -140,7 +140,6 @@ func (dswp *desiredStateOfWorldPopulator) findAndRemoveDeletedPods(logger klog.L default: volumeActionFlag := util.DetermineVolumeAction( informerPod, - dswp.desiredStateOfWorld, true /* default volume action */) if volumeActionFlag { diff --git a/pkg/controller/volume/attachdetach/util/util.go b/pkg/controller/volume/attachdetach/util/util.go index b08f41135bd..5baddc8bfea 100644 --- a/pkg/controller/volume/attachdetach/util/util.go +++ b/pkg/controller/volume/attachdetach/util/util.go @@ -178,7 +178,7 @@ func getPVSpecFromCache(name string, pvcReadOnly bool, expectedClaimUID types.UI // DetermineVolumeAction returns true if volume and pod needs to be added to dswp // and it returns false if volume and pod needs to be removed from dswp -func DetermineVolumeAction(pod *v1.Pod, desiredStateOfWorld cache.DesiredStateOfWorld, defaultAction bool) bool { +func DetermineVolumeAction(pod *v1.Pod, defaultAction bool) bool { if pod == nil || len(pod.Spec.Volumes) <= 0 { return defaultAction }