Merge pull request #18403 from sjenning/pick-58574

Automatic merge from submit-queue (batch tested with PRs 18401, 18403). UPSTREAM: 58574: fixing array out of bound by checking initContainers instead of containers xref https://bugzilla.redhat.com/show_bug.cgi?id=1540912 @mdshuai @derekwaynecarr
openshift · Feb 2, 2018 · be6e236 · be6e236
2 parents bd6b0ce + 7a1ed13
commit be6e236
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/helpers.go b/vendor/k8s.io/kubernetes/pkg/kubelet/eviction/helpers.go