Merge pull request kubernetes#93225 from hasheddan/storage-panic

k8s-ci-robot · web-flow · commit a1a2f8c5f854 · 2020-07-21T09:15:15.000-07:00
Return error instead of panic if container index outside bounds
diff --git a/test/e2e/storage/testsuites/subpath.go b/test/e2e/storage/testsuites/subpath.go
@@ -1059,6 +1059,9 @@ func formatVolume(f *framework.Framework, pod *v1.Pod) {
 }
 
 func podContainerExec(pod *v1.Pod, containerIndex int, command string) (string, error) {
+	if containerIndex > len(pod.Spec.Containers)-1 {
+		return "", fmt.Errorf("container not found in pod: index %d", containerIndex)
+	}
 	var shell string
 	var option string
 	if framework.NodeOSDistroIs("windows") {

Original file line number	Diff line number	Diff line change
`@@ -1059,6 +1059,9 @@ func formatVolume(f framework.Framework, pod v1.Pod) {`
`1059`	`1059`	`}`
`1060`	`1060`
`1061`	`1061`	`func podContainerExec(pod *v1.Pod, containerIndex int, command string) (string, error) {`
	`1062`	`+ if containerIndex > len(pod.Spec.Containers)-1 {`
	`1063`	`+ return "", fmt.Errorf("container not found in pod: index %d", containerIndex)`
	`1064`	`+ }`
`1062`	`1065`	`var shell string`
`1063`	`1066`	`var option string`
`1064`	`1067`	`if framework.NodeOSDistroIs("windows") {`