From fa822f3c51bd82d5a469c21cff82640a12c4f56e Mon Sep 17 00:00:00 2001
From: Michelle Au <msau@google.com>
Date: Tue, 20 Aug 2019 11:16:35 -0700
Subject: [PATCH] Use VisitContainers instead of directly accessing pod
 container fields

Change-Id: I354513683e7b5bf4d1837f567ef0e84b17f6e174
---
 pkg/volume/util/util.go | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkg/volume/util/util.go b/pkg/volume/util/util.go
index 89dfb21f045..b4d3739ace7 100644
--- a/pkg/volume/util/util.go
+++ b/pkg/volume/util/util.go
@@ -36,6 +36,7 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
+	podutil "k8s.io/kubernetes/pkg/api/v1/pod"
 	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
 	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/pkg/util/mount"
@@ -555,13 +556,7 @@ func GetPodVolumeNames(pod *v1.Pod) (mounts sets.String, devices sets.String) {
 	mounts = sets.NewString()
 	devices = sets.NewString()
 
-	addContainerVolumes(pod.Spec.Containers, mounts, devices)
-	addContainerVolumes(pod.Spec.InitContainers, mounts, devices)
-	return
-}
-
-func addContainerVolumes(containers []v1.Container, mounts, devices sets.String) {
-	for _, container := range containers {
+	podutil.VisitContainers(&pod.Spec, func(container *v1.Container) bool {
 		if container.VolumeMounts != nil {
 			for _, mount := range container.VolumeMounts {
 				mounts.Insert(mount.Name)
@@ -574,5 +569,7 @@ func addContainerVolumes(containers []v1.Container, mounts, devices sets.String)
 				devices.Insert(device.Name)
 			}
 		}
-	}
+		return true
+	})
+	return
 }