Merge pull request #61507 from rramkumar1/patch-5

Automatic merge from submit-queue (batch tested with PRs 61378, 60915, 61499, 61507, 61478). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Bump image for ingress downgrade test

**What this PR does / why we need it**:
Bumps the image to the latest released version. This should also fix the failing test.

/assign @bowei 

**Release note**:

```release-note
None
```
pull/8/head
Kubernetes Submit Queue 2018-03-22 07:15:30 -07:00 committed by GitHub
commit 50cd3edefa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -86,7 +86,7 @@ func ingressUpgradeGCE(isUpgrade bool) error {
}
} else {
// Downgrade to latest release image.
command = "sudo sed -i -re 's/(image:)(.*)/\\1 k8s.gcr.io\\/google_containers\\/glbc:0.9.7/' /etc/kubernetes/manifests/glbc.manifest"
command = "sudo sed -i -re 's/(image:)(.*)/\\1 k8s.gcr.io\\/ingress-gce-glbc-amd64:1.0.0/' /etc/kubernetes/manifests/glbc.manifest"
}
// Kubelet should restart glbc automatically.
sshResult, err := NodeExec(GetMasterHost(), command)