Merge pull request #55584 from zhangxiaoyu-zidif/move-check-pod-forward

Automatic merge from submit-queue (batch tested with PRs 60376, 55584, 60358, 54631, 60291). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. move pod-check forward **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #55584 from zhangxiaoyu-zidif/move-check-pod-forward
907329e2 · Kubernetes Submit Queue · GitHub · 5be121ac · 6e50240c · 907329e2
Unverified Commit 907329e2 authored Feb 28, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 28, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

volume_manager.go pkg/kubelet/volumemanager/volume_manager.go +4 -3

No files found.
--- a/pkg/kubelet/volumemanager/volume_manager.go
+++ b/pkg/kubelet/volumemanager/volume_manager.go
@@ -333,6 +333,10 @@ func (vm *volumeManager) MarkVolumesAsReportedInUse(
 }
 func (vm *volumeManager) WaitForAttachAndMount(pod *v1.Pod) error {
+	if pod == nil {
+		return nil
+	}
 	expectedVolumes := getExpectedVolumes(pod)
 	if len(expectedVolumes) == 0 {
 		// No volumes to verify
@@ -423,9 +427,6 @@ func filterUnmountedVolumes(mountedVolumes sets.String, expectedVolumes []string
 // consider the volume setup step for this pod satisfied.
 func getExpectedVolumes(pod *v1.Pod) []string {
 	expectedVolumes := []string{}
-	if pod == nil {
-		return expectedVolumes
-	}
 	for _, podVolume := range pod.Spec.Volumes {
 		expectedVolumes = append(expectedVolumes, podVolume.Name)