Merge pull request #42050 from aledbf/ci-kubernetes-e2e-kops-aws-4559

Automatic merge from submit-queue (batch tested with PRs 42044, 41694, 41927, 42050, 41987) Use existing nginx image in the node **What this PR does / why we need it**: Fixes a test flake: `[k8s.io] Garbage collector should orphan pods created by rc if delete options say so` **Which issue this PR fixes** fixes #35771 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #42050 from aledbf/ci-kubernetes-e2e-kops-aws-4559
25188604 · Kubernetes Submit Queue · GitHub · 15ddc692 · faf4facf · 25188604
Commit 25188604 authored Feb 26, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 26, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

garbage_collector.go test/e2e/garbage_collector.go +1 -1

No files found.
--- a/test/e2e/garbage_collector.go
+++ b/test/e2e/garbage_collector.go
@@ -53,7 +53,7 @@ var podTemplateSpec = v1.PodTemplateSpec{
 		Containers: []v1.Container{
 			{
 				Name:  "nginx",
-				Image: "gcr.io/google_containers/nginx:1.7.9",
+				Image: "gcr.io/google_containers/nginx-slim:0.7",
 			},
 		},
 	},