From 97eddc8f65795b63b19576ce3affd48e6276c47f Mon Sep 17 00:00:00 2001 From: Hemant Kumar Date: Wed, 14 Aug 2024 12:46:00 -0400 Subject: [PATCH] commiting uncommited changes on 2024-08-14 12:46:00 -0400 --- pkg/kubelet/volumemanager/cache/actual_state_of_world.go | 2 +- .../volumemanager/populator/desired_state_of_world_populator.go | 2 +- pkg/volume/util/operationexecutor/node_expander.go | 2 +- pkg/volume/util/operationexecutor/operation_generator.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/volumemanager/cache/actual_state_of_world.go b/pkg/kubelet/volumemanager/cache/actual_state_of_world.go index 62dcefe6731..d4627326726 100644 --- a/pkg/kubelet/volumemanager/cache/actual_state_of_world.go +++ b/pkg/kubelet/volumemanager/cache/actual_state_of_world.go @@ -960,7 +960,7 @@ func (asw *actualStateOfWorld) volumeNeedsExpansion(volumeObj attachedVolume, de return currentSize, false } - klog.V(5).Infof("NodeExpandVolume checking size, actual size %s, desired size %s, for volume %s", volumeObj.persistentVolumeSize.String(), desiredVolumeSize.String(), volumeObj.volumeName) + klog.V(5).InfoS("NodeExpandVolume checking size", "actualSize", volumeObj.persistentVolumeSize.String(), "desiredSize", desiredVolumeSize.String(), "volume", volumeObj.volumeName) if desiredVolumeSize.Cmp(*volumeObj.persistentVolumeSize) > 0 { volumePlugin, err := asw.volumePluginMgr.FindNodeExpandablePluginBySpec(volumeObj.spec) diff --git a/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go index cb9cf9d67ae..5d0504dddbb 100644 --- a/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go +++ b/pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go @@ -384,7 +384,7 @@ func (dswp *desiredStateOfWorldPopulator) checkVolumeFSResize( pvCap := volumeSpec.PersistentVolume.Spec.Capacity.Storage() pvcStatusCap := pvc.Status.Capacity.Storage() dswp.desiredStateOfWorld.UpdatePersistentVolumeSize(uniqueVolumeName, pvCap) - klog.V(5).Infof("NodeExpandVolume updating size, actual size %s, desired size %s, for volume %s", pvcStatusCap.String(), pvCap.String(), uniqueVolumeName) + klog.V(5).InfoS("NodeExpandVolume updating size", "actualSize", pvcStatusCap.String(), "desiredSize", pvCap.String(), "volumeName", uniqueVolumeName) // in case the actualStateOfWorld was rebuild after kubelet restart ensure that claimSize is set to accurate value dswp.actualStateOfWorld.InitializeClaimSize(klog.TODO(), uniqueVolumeName, pvcStatusCap) } diff --git a/pkg/volume/util/operationexecutor/node_expander.go b/pkg/volume/util/operationexecutor/node_expander.go index a33fafc7b98..d20ef6e9cd5 100644 --- a/pkg/volume/util/operationexecutor/node_expander.go +++ b/pkg/volume/util/operationexecutor/node_expander.go @@ -175,7 +175,7 @@ func (ne *NodeExpander) expandOnPlugin() (bool, resource.Quantity, error, testRe // File system resize succeeded, now update the PVC's Capacity to match the PV's ne.pvc, err = util.MarkFSResizeFinished(ne.pvc, ne.pluginResizeOpts.NewSize, ne.kubeClient) if err != nil { - return true, ne.pluginResizeOpts.NewSize, fmt.Errorf("mountVolume.NodeExpandVolume update pvc status failed: %v", err), testResponseData{true, true} + return true, ne.pluginResizeOpts.NewSize, fmt.Errorf("mountVolume.NodeExpandVolume update pvc status failed: %w", err), testResponseData{true, true} } return true, ne.pluginResizeOpts.NewSize, nil, testResponseData{true, true} } diff --git a/pkg/volume/util/operationexecutor/operation_generator.go b/pkg/volume/util/operationexecutor/operation_generator.go index 9fda17f9547..69e6af2c58d 100644 --- a/pkg/volume/util/operationexecutor/operation_generator.go +++ b/pkg/volume/util/operationexecutor/operation_generator.go @@ -2056,7 +2056,7 @@ func (og *operationGenerator) nodeExpandVolume( currentSize := pvc.Status.Capacity.Storage() if err != nil { // Return error rather than leave the file system un-resized, caller will log and retry - return false, *currentSize, fmt.Errorf("mountVolume.NodeExpandVolume get PVC failed : %v", err) + return false, *currentSize, fmt.Errorf("mountVolume.NodeExpandVolume get PVC failed : %w", err) } if volumeToMount.VolumeSpec.ReadOnly {