github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2017-02-26 23:16:54 -08:00 committed by GitHub
commit 25188604fa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/garbage_collector.go
View File

@ -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",
},
},
},