github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

move pod-check forward

Browse Source
This commit is contained in:
zhangxiaoyu-zidif 2017-11-13 15:46:23 +08:00
parent d6cabaf706
commit 6e50240ce1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/kubelet/volumemanager/volume_manager.go
View File

@ -328,6 +328,10 @@ func (vm *volumeManager) MarkVolumesAsReportedInUse(
} }
func (vm *volumeManager) WaitForAttachAndMount(pod *v1.Pod) error { func (vm *volumeManager) WaitForAttachAndMount(pod *v1.Pod) error {
if pod == nil {
return nil
}
expectedVolumes := getExpectedVolumes(pod) expectedVolumes := getExpectedVolumes(pod)
if len(expectedVolumes) == 0 { if len(expectedVolumes) == 0 {
// No volumes to verify // No volumes to verify
@ -402,9 +406,6 @@ func filterUnmountedVolumes(mountedVolumes sets.String, expectedVolumes []string
// consider the volume setup step for this pod satisfied. // consider the volume setup step for this pod satisfied.
func getExpectedVolumes(pod *v1.Pod) []string { func getExpectedVolumes(pod *v1.Pod) []string {
expectedVolumes := []string{} expectedVolumes := []string{}
if pod == nil {
return expectedVolumes
}
for _, podVolume := range pod.Spec.Volumes { for _, podVolume := range pod.Spec.Volumes {
expectedVolumes = append(expectedVolumes, podVolume.Name) expectedVolumes = append(expectedVolumes, podVolume.Name)