From 884d8de8c672cb0ba0236d013e06cc360b3254c2 Mon Sep 17 00:00:00 2001 From: Mike Wilson Date: Wed, 28 Mar 2018 16:46:12 -0400 Subject: [PATCH] Fixing ingress controller daemonset on k8s < 1.9 --- .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 4 ++++ .../kubernetes-worker/templates/ingress-daemon-set.yaml | 2 +- 2 files changed, 5 insertions(+), 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 c3e9ee54323..baff2204ea3 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -746,6 +746,10 @@ def launch_default_ingress_controller(): 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: + context['daemonset_api_version'] = 'apps/v1beta2' context['juju_application'] = hookenv.service_name() manifest = addon_path.format('ingress-daemon-set.yaml') render('ingress-daemon-set.yaml', manifest, context) diff --git a/cluster/juju/layers/kubernetes-worker/templates/ingress-daemon-set.yaml b/cluster/juju/layers/kubernetes-worker/templates/ingress-daemon-set.yaml index 33384fd6b4e..744913cab71 100644 --- a/cluster/juju/layers/kubernetes-worker/templates/ingress-daemon-set.yaml +++ b/cluster/juju/layers/kubernetes-worker/templates/ingress-daemon-set.yaml @@ -127,7 +127,7 @@ kind: ConfigMap metadata: name: nginx-load-balancer-{{ juju_application }}-conf --- -apiVersion: apps/v1beta2 +apiVersion: {{ daemonset_api_version }} kind: DaemonSet metadata: name: nginx-ingress-{{ juju_application }}-controller