Merge pull request #43447 from NickrenREN/vm-updateStates

Automatic merge from submit-queue (batch tested with PRs 42141, 43447) Fix AddPodToVolume: Change arg to volumeGidValue instead of devicePath **Release note**: ```release-note NONE ```

Merge pull request #43447 from NickrenREN/vm-updateStates
422497b4 · Kubernetes Submit Queue · GitHub · 9602aa9d · 14feb9ab · 422497b4
Commit 422497b4 authored Apr 05, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

reconciler.go pkg/kubelet/volumemanager/reconciler/reconciler.go +2 -2

No files found.
--- a/pkg/kubelet/volumemanager/reconciler/reconciler.go
+++ b/pkg/kubelet/volumemanager/reconciler/reconciler.go
@@ -566,7 +566,7 @@ func (rc *reconciler) updateStates(volumesNeedUpdate map[v1.UniqueVolumeName]*re
 		}
 	}
-	// Get the list of volumes from desired state and update OuterVolumeSpecName if the information is avaiable
+	// Get the list of volumes from desired state and update OuterVolumeSpecName if the information is available
 	volumesToMount := rc.desiredStateOfWorld.GetVolumesToMount()
 	for _, volumeToMount := range volumesToMount {
 		if volume, exists := volumesNeedUpdate[volumeToMount.VolumeName]; exists {
@@ -591,7 +591,7 @@ func (rc *reconciler) updateStates(volumesNeedUpdate map[v1.UniqueVolumeName]*re
 			volume.volumeName,
 			volume.mounter,
 			volume.outerVolumeSpecName,
-			volume.devicePath)
+			volume.volumeGidValue)
 		if err != nil {
 			glog.Errorf("Could not add pod to volume information to actual state of world: %v", err)
 			continue