From ec0bedbf43360e29be32fc0e538a20678f6c3fe0 Mon Sep 17 00:00:00 2001 From: Mike Wilson Date: Wed, 31 Jan 2018 10:26:23 -0500 Subject: [PATCH 1/2] Fixing issue with capitalization causing odd behaviors for allow-privileged configuration option. --- .../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 1a4fa1641dd..d8c01915653 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -810,7 +810,7 @@ def set_privileged(): """Update the allow-privileged flag for kubelet. """ - privileged = hookenv.config('allow-privileged') + privileged = hookenv.config('allow-privileged').lower() if privileged == 'auto': gpu_enabled = is_state('kubernetes-worker.gpu.enabled') privileged = 'true' if gpu_enabled else 'false' From 33dac2d0f3fb6a97fc5742091b0a449d41ad1af0 Mon Sep 17 00:00:00 2001 From: Mike Wilson Date: Wed, 31 Jan 2018 12:20:37 -0500 Subject: [PATCH 2/2] Adding lower() to kubernetes master's usage of allow-privileged. --- .../layers/kubernetes-master/reactive/kubernetes_master.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index 5c3dc18f53c..c5becf00c9f 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -838,7 +838,7 @@ def is_privileged(): """Return boolean indicating whether or not to set allow-privileged=true. """ - privileged = hookenv.config('allow-privileged') + privileged = hookenv.config('allow-privileged').lower() if privileged == 'auto': return is_state('kubernetes-master.gpu.enabled') else: @@ -886,7 +886,7 @@ def on_gpu_available(kube_control): """ config = hookenv.config() - if config['allow-privileged'] == "false": + if config['allow-privileged'].lower() == "false": hookenv.status_set( 'active', 'GPUs available. Set allow-privileged="auto" to enable.'