Merge pull request #64285 from hyperbolic2346/mwilson/nginx-image-bump

Automatic merge from submit-queue (batch tested with PRs 64285, 63660, 63661, 63662, 64883). 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>. Mwilson/nginx image bump **What this PR does / why we need it**: Updating default nginx image for CDK **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/576 **Special notes for your reviewer**: **Release note**: ```release-note Updated default image for nginx ingress in CDK to match current Kubernetes docs. ```

Merge pull request #64285 from hyperbolic2346/mwilson/nginx-image-bump
edfffe56 · Kubernetes Submit Queue · GitHub · 332da0a9 · 41d72697 · edfffe56
Unverified Commit edfffe56 authored Jun 21, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 21, 2018
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 9 deletions

kubernetes_worker.py ...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py +6 -9

No files found.
--- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
@@ -740,15 +740,12 @@ def launch_default_ingress_controller():
    # Render the ingress daemon set controller manifest
    context['ingress_image'] = config.get('nginx-image')
    if context['ingress_image'] == "" or context['ingress_image'] == "auto":
-        if context['arch'] == 's390x':
+        images = {'amd64': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.15.0', # noqa
-            context['ingress_image'] = \
+                  'arm64': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-arm64:0.15.0', # noqa
-                "docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13"
+                  's390x': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-s390x:0.15.0', # noqa
-        elif context['arch'] == 'arm64':
+                  'ppc64el': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-ppc64le:0.15.0', # noqa
-            context['ingress_image'] = \
+                  }
-                "k8s.gcr.io/nginx-ingress-controller-arm64:0.9.0-beta.15"
+        context['ingress_image'] = images.get(context['arch'], images['amd64'])
-        else:
-            context['ingress_image'] = \
-                "k8s.gcr.io/nginx-ingress-controller:0.9.0-beta.15"  # noqa
    if get_version('kubelet') < (1, 9):
        context['daemonset_api_version'] = 'extensions/v1beta1'
    else: