From f68a4bab6d468a836819c25126c110e378957731 Mon Sep 17 00:00:00 2001 From: Mike Wilson Date: Thu, 17 May 2018 13:14:09 -0400 Subject: [PATCH 1/3] Bumping nginx ingress image to latest --- .../juju/layers/kubernetes-worker/reactive/kubernetes_worker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index 82b7d3abca..ac8648a612 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -748,7 +748,7 @@ def launch_default_ingress_controller(): "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 + "quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.15.0" $ noqa if get_version('kubelet') < (1, 9): context['daemonset_api_version'] = 'extensions/v1beta1' else: From a3ec55e3dfb5605761bf9a3f9802cc9ef41f752d Mon Sep 17 00:00:00 2001 From: Mike Wilson Date: Thu, 24 May 2018 14:55:02 -0400 Subject: [PATCH 2/3] Updating images for nginx --- .../reactive/kubernetes_worker.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index ac8648a612..4ff861e7f3 100644 --- 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': - context['ingress_image'] = \ - "docker.io/cdkbot/nginx-ingress-controller-s390x:0.9.0-beta.13" - elif context['arch'] == 'arm64': - context['ingress_image'] = \ - "k8s.gcr.io/nginx-ingress-controller-arm64:0.9.0-beta.15" - else: - context['ingress_image'] = \ - "quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.15.0" $ noqa + images = {'amd64': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.15.0', # noqa + 'arm64': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-arm64:0.15.0', # noqa + 's390x': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-s390x:0.15.0', # noqa + 'ppcle': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-ppc64le:0.15.0', # noqa + } + context['ingress_image'] = images.get(context['arch'], images['amd64']) if get_version('kubelet') < (1, 9): context['daemonset_api_version'] = 'extensions/v1beta1' else: From 41d72697aa8d6a04156021ecd2d6f169e67ff681 Mon Sep 17 00:00:00 2001 From: Mike Wilson Date: Sun, 3 Jun 2018 21:17:18 -0400 Subject: [PATCH 3/3] Fixing ppc arch --- .../juju/layers/kubernetes-worker/reactive/kubernetes_worker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index 4ff861e7f3..5e819f705c 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -743,7 +743,7 @@ def launch_default_ingress_controller(): images = {'amd64': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.15.0', # noqa 'arm64': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-arm64:0.15.0', # noqa 's390x': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-s390x:0.15.0', # noqa - 'ppcle': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-ppc64le:0.15.0', # noqa + 'ppc64el': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller-ppc64le:0.15.0', # noqa } context['ingress_image'] = images.get(context['arch'], images['amd64']) if get_version('kubelet') < (1, 9):