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
```
This commit is contained in:
Kubernetes Submit Queue
2017-04-05 22:31:23 -07:00
committed by GitHub

View File

@@ -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