github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Updating images for nginx

Browse Source
This commit is contained in:
Mike Wilson 2018-05-24 14:55:02 -04:00
parent f68a4bab6d
commit a3ec55e3df
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View File

@ -740,15 +740,12 @@ def launch_default_ingress_controller():
# Render the ingress daemon set controller manifest # Render the ingress daemon set controller manifest
context['ingress_image'] = config.get('nginx-image') context['ingress_image'] = config.get('nginx-image')
if context['ingress_image'] == "" or context['ingress_image'] == "auto": 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': 'ppcle': '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'] = \
"quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.15.0" $ noqa
if get_version('kubelet') < (1, 9): if get_version('kubelet') < (1, 9):
context['daemonset_api_version'] = 'extensions/v1beta1' context['daemonset_api_version'] = 'extensions/v1beta1'
else: else: