From 6e50240ce131795bd66d6a13685853b58acf843b Mon Sep 17 00:00:00 2001 From: zhangxiaoyu-zidif Date: Mon, 13 Nov 2017 15:46:23 +0800 Subject: [PATCH] move pod-check forward --- pkg/kubelet/volumemanager/volume_manager.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/volumemanager/volume_manager.go b/pkg/kubelet/volumemanager/volume_manager.go index d48266f52a3..f8c0b281393 100644 --- a/pkg/kubelet/volumemanager/volume_manager.go +++ b/pkg/kubelet/volumemanager/volume_manager.go @@ -328,6 +328,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 @@ -402,9 +406,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)