Merge pull request #63007 from Cynerva/gkk/update-gcr-url

Automatic merge from submit-queue (batch tested with PRs 63007, 62919, 62669, 62860). 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>. juju: Use k8s.gcr.io url for arm64 ingress image **What this PR does / why we need it**: This updates the kubernetes-worker charm to point to k8s.gcr.io for the nginx-ingress-controller-arm64 image. This should have no impact on functionality today, but as I understand it, we're all standardizing on k8s.gcr.io to allow for future changes. **Release note**: ```release-note NONE ```

Merge pull request #63007 from Cynerva/gkk/update-gcr-url
6726844c · Kubernetes Submit Queue · GitHub · a0f94123 · 408c2c30 · 6726844c
Unverified Commit 6726844c authored Apr 23, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

kubernetes_worker.py ...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py +1 -1

No files found.
--- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
@@ -735,7 +735,7 @@ def launch_default_ingress_controller():
                "docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13"
        elif context['arch'] == 'arm64':
            context['ingress_image'] = \
-                "gcr.io/google-containers/nginx-ingress-controller-arm64:0.9.0-beta.15" # noqa
+                "k8s.gcr.io/nginx-ingress-controller-arm64:0.9.0-beta.15"
        else:
            context['ingress_image'] = \
                "k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.15" # noqa