From e52a888814e96b61ec003b43b813246eca0790aa Mon Sep 17 00:00:00 2001 From: George Kraft Date: Mon, 5 Jun 2017 13:32:43 -0500 Subject: [PATCH] Remove initializers from juju admission-control for 1.6 and earlier --- .../layers/kubernetes-master/reactive/kubernetes_master.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index 226a12d7382..3508658b483 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -802,6 +802,9 @@ def configure_master_services(): if get_version('kube-apiserver') < (1, 6): hookenv.log('Removing DefaultTolerationSeconds from admission-control') admission_control.remove('DefaultTolerationSeconds') + if get_version('kube-apiserver') < (1, 7): + hookenv.log('Removing Initializers from admission-control') + admission_control.remove('Initializers') api_opts.add('admission-control', ','.join(admission_control), strict=True) # Default to 3 minute resync. TODO: Make this configureable?