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

Merge pull request #81530 from tedyu/dsow-pop-pod-vol

Browse Source 
Fixing contradictory log messages when AddPodToVolume encounters error
This commit is contained in:
Kubernetes Prow Robot 2019-09-10 22:11:22 -07:00 committed by GitHub
commit 349143ec35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,6 +298,7 @@ func (dswp *desiredStateOfWorldPopulator) processPodVolumes(
allVolumesAdded := true allVolumesAdded := true
mounts, devices := util.GetPodVolumeNames(pod) mounts, devices := util.GetPodVolumeNames(pod)
expandInUsePV := utilfeature.DefaultFeatureGate.Enabled(features.ExpandInUsePersistentVolumes)
// Process volume spec for each volume defined in pod // Process volume spec for each volume defined in pod
for _, podVolume := range pod.Spec.Volumes { for _, podVolume := range pod.Spec.Volumes {
if !mounts.Has(podVolume.Name) && !devices.Has(podVolume.Name) { if !mounts.Has(podVolume.Name) && !devices.Has(podVolume.Name) {
@ -331,15 +332,15 @@ func (dswp *desiredStateOfWorldPopulator) processPodVolumes(
err) err)
dswp.desiredStateOfWorld.AddErrorToPod(uniquePodName, err.Error()) dswp.desiredStateOfWorld.AddErrorToPod(uniquePodName, err.Error())
allVolumesAdded = false allVolumesAdded = false
} } else {
klog.V(4).Infof( klog.V(4).Infof(
"Added volume %q (volSpec=%q) for pod %q to desired state.", "Added volume %q (volSpec=%q) for pod %q to desired state.",
podVolume.Name, podVolume.Name,
volumeSpec.Name(), volumeSpec.Name(),
uniquePodName) uniquePodName)
}
if utilfeature.DefaultFeatureGate.Enabled(features.ExpandInUsePersistentVolumes) { if expandInUsePV {
dswp.checkVolumeFSResize(pod, podVolume, pvc, volumeSpec, dswp.checkVolumeFSResize(pod, podVolume, pvc, volumeSpec,
uniquePodName, mountedVolumesForPod, processedVolumesForFSResize) uniquePodName, mountedVolumesForPod, processedVolumesForFSResize)
} }