github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

rename SetVolumeSize to InitializeVolumeSize

Browse Source
This commit is contained in:
Hemant Kumar 2022-03-24 12:29:45 -04:00
parent 4d52dbb9f8
commit ed217f4140
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/controller/volume/attachdetach/cache/actual_state_of_world.go vendored
View File

@ -23,10 +23,11 @@ package cache
import ( import (
"fmt" "fmt"
"k8s.io/apimachinery/pkg/api/resource"
"sync" "sync"
"time" "time"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/klog/v2" "k8s.io/klog/v2"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
@ -583,8 +584,8 @@ func (asw *actualStateOfWorld) GetAttachState(
} }
// SetVolumeClaimSize sets size of the volume. But this function should not be used from attach_detach controller. // SetVolumeClaimSize sets size of the volume. But this function should not be used from attach_detach controller.
func (asw *actualStateOfWorld) SetVolumeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity) { func (asw *actualStateOfWorld) InitializeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity) {
klog.V(5).Infof("NO-OP") klog.V(5).Infof("no-op InitializeClaimSize call in attach-detach controller.")
} }
func (asw *actualStateOfWorld) GetAttachedVolumes() []AttachedVolume { func (asw *actualStateOfWorld) GetAttachedVolumes() []AttachedVolume {

2
pkg/kubelet/volumemanager/cache/actual_state_of_world.go vendored
View File

@ -599,7 +599,7 @@ func (asw *actualStateOfWorld) SetDeviceMountState(
return nil return nil
} }
func (asw *actualStateOfWorld) SetVolumeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity) { func (asw *actualStateOfWorld) InitializeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity) {
asw.Lock() asw.Lock()
defer asw.Unlock() defer asw.Unlock()

2
pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go
View File

@ -371,7 +371,7 @@ func (dswp *desiredStateOfWorldPopulator) checkVolumeFSResize(
dswp.desiredStateOfWorld.UpdatePersistentVolumeSize(uniqueVolumeName, pvCap) dswp.desiredStateOfWorld.UpdatePersistentVolumeSize(uniqueVolumeName, pvCap)
// in case the actualStateOfWorld was rebuild after kubelet restart ensure that claimSize is set to accurate value // in case the actualStateOfWorld was rebuild after kubelet restart ensure that claimSize is set to accurate value
dswp.actualStateOfWorld.SetVolumeClaimSize(uniqueVolumeName, pvcStatusCap) dswp.actualStateOfWorld.InitializeClaimSize(uniqueVolumeName, pvcStatusCap)
} }
func getUniqueVolumeName( func getUniqueVolumeName(

4
pkg/volume/util/operationexecutor/operation_executor.go
View File

@ -246,8 +246,8 @@ type ActualStateOfWorldAttacherUpdater interface {
// the node's volumesToReportAsAttached list) // the node's volumesToReportAsAttached list)
AddVolumeToReportAsAttached(volumeName v1.UniqueVolumeName, nodeName types.NodeName) AddVolumeToReportAsAttached(volumeName v1.UniqueVolumeName, nodeName types.NodeName)
// SetVolumeClaimSize sets pvc claim size by reading pvc.Status.Capacity // InitializeClaimSize sets pvc claim size by reading pvc.Status.Capacity
SetVolumeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity) InitializeClaimSize(volumeName v1.UniqueVolumeName, claimSize *resource.Quantity)
} }
// VolumeLogger defines a set of operations for generating volume-related logging and error msgs // VolumeLogger defines a set of operations for generating volume-related logging and error msgs

4
pkg/volume/util/operationexecutor/operation_generator.go
View File

@ -1507,7 +1507,7 @@ func (og *operationGenerator) GenerateVerifyControllerAttachedVolumeFunc(
eventErr, detailedErr := volumeToMount.GenerateError("VerifyControllerAttachedVolume.MarkVolumeAsAttachedByUniqueVolumeName failed", addVolumeNodeErr) eventErr, detailedErr := volumeToMount.GenerateError("VerifyControllerAttachedVolume.MarkVolumeAsAttachedByUniqueVolumeName failed", addVolumeNodeErr)
return volumetypes.NewOperationContext(eventErr, detailedErr, migrated) return volumetypes.NewOperationContext(eventErr, detailedErr, migrated)
} }
actualStateOfWorld.SetVolumeClaimSize(volumeToMount.VolumeName, claimSize) actualStateOfWorld.InitializeClaimSize(volumeToMount.VolumeName, claimSize)
return volumetypes.NewOperationContext(nil, nil, migrated) return volumetypes.NewOperationContext(nil, nil, migrated)
} }
@ -1548,7 +1548,7 @@ func (og *operationGenerator) GenerateVerifyControllerAttachedVolumeFunc(
eventErr, detailedErr := volumeToMount.GenerateError("VerifyControllerAttachedVolume.MarkVolumeAsAttached failed", addVolumeNodeErr) eventErr, detailedErr := volumeToMount.GenerateError("VerifyControllerAttachedVolume.MarkVolumeAsAttached failed", addVolumeNodeErr)
return volumetypes.NewOperationContext(eventErr, detailedErr, migrated) return volumetypes.NewOperationContext(eventErr, detailedErr, migrated)
} }
actualStateOfWorld.SetVolumeClaimSize(volumeToMount.VolumeName, claimSize) actualStateOfWorld.InitializeClaimSize(volumeToMount.VolumeName, claimSize)
return volumetypes.NewOperationContext(nil, nil, migrated) return volumetypes.NewOperationContext(nil, nil, migrated)
} }
} }