Skip to content

K
k3s
Unverified Commit 0603ce88 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #60254 from rramkumar1/patch-2

Automatic merge from submit-queue (batch tested with PRs 60196, 59844, 60255, 60254, 60251). 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>. Remove k8s prefix from gcr.io/k8s-ingress-gce-image-push repo **What this PR does / why we need it**: Was causing e2e tests to fail. **Release note**: ```release-note None ``` /assign @MrHohn
parents 5381ae31 938dcfd1
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
test/e2e/framework/nodes_util.go
View file @ 0603ce88
...@@ -82,7 +82,7 @@ func ingressUpgradeGCE(isUpgrade bool) error { ...@@ -82,7 +82,7 @@ func ingressUpgradeGCE(isUpgrade bool) error {
command = fmt.Sprintf("sudo sed -i -re 's|(image:)(.*)|\\1 %s|' /etc/kubernetes/manifests/glbc.manifest", targetImage) command = fmt.Sprintf("sudo sed -i -re 's|(image:)(.*)|\\1 %s|' /etc/kubernetes/manifests/glbc.manifest", targetImage)
} else { } else {
// Upgrade to latest HEAD image. // Upgrade to latest HEAD image.
command = "sudo sed -i -re 's/(image:)(.*)/\\1 k8s.gcr.io\\/k8s-ingress-image-push\\/ingress-gce-e2e-glbc-amd64:latest/' /etc/kubernetes/manifests/glbc.manifest" command = "sudo sed -i -re 's/(image:)(.*)/\\1 gcr.io\\/k8s-ingress-image-push\\/ingress-gce-e2e-glbc-amd64:latest/' /etc/kubernetes/manifests/glbc.manifest"
} }
} else { } else {
// Downgrade to latest release image. // Downgrade to latest release image.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment