From 428a63e9a1832cf4ff74f01d697a41422d8b5d2d Mon Sep 17 00:00:00 2001 From: Kevin W Monroe Date: Mon, 25 Jun 2018 15:06:06 -0500 Subject: [PATCH 1/2] lint fixes for goal state checks --- .../layers/kubernetes-master/reactive/kubernetes_master.py | 4 ++-- .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index 2f95b077593..aee8438efb7 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -402,7 +402,7 @@ def set_final_status(): goal_state = {} if not is_state('kube-api-endpoint.available'): - if 'relations' in goal_state and 'kube-api-endpoint' in goal_state['relations']: + if 'kube-api-endpoint' in goal_state.get('relations', {}): status = 'waiting' else: status = 'blocked' @@ -410,7 +410,7 @@ def set_final_status(): return if not is_state('kube-control.connected'): - if 'relations' in goal_state and 'kube-control' in goal_state['relations']: + if 'kube-control' in goal_state.get('relations', {}): status = 'waiting' else: status = 'blocked' diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index e1ce3963359..f898d8fa6f2 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -403,8 +403,8 @@ def sdn_changed(): @when('kubernetes-worker.config.created') @when_not('kubernetes-worker.ingress.available') def render_and_launch_ingress(): - ''' If configuration has ingress daemon set enabled, launch the ingress load - balancer and default http backend. Otherwise attempt deletion. ''' + ''' If configuration has ingress daemon set enabled, launch the ingress + load balancer and default http backend. Otherwise attempt deletion. ''' config = hookenv.config() # If ingress is enabled, launch the ingress controller if config.get('ingress'): @@ -1016,7 +1016,7 @@ def missing_kube_control(): except NotImplementedError: goal_state = {} - if 'relations' in goal_state and 'kube-control' in goal_state['relations']: + if 'kube-control' in goal_state.get('relations', {}): hookenv.status_set( 'waiting', 'Waiting for kubernetes-master to become ready') From 0eeb34382bb1f1239efdf4b671950a601f0f6552 Mon Sep 17 00:00:00 2001 From: Kevin W Monroe Date: Mon, 25 Jun 2018 15:14:49 -0500 Subject: [PATCH 2/2] one more lint fix for sshl_chain_completion --- .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 3 ++- 1 file changed, 2 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 f898d8fa6f2..45d49c8b0f1 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -743,7 +743,8 @@ def launch_default_ingress_controller(): return # Render the ingress daemon set controller manifest - context['ssl_chain_completion'] = config.get('ingress-ssl-chain-completion') + context['ssl_chain_completion'] = config.get( + 'ingress-ssl-chain-completion') context['ingress_image'] = config.get('nginx-image') if context['ingress_image'] == "" or context['ingress_image'] == "auto": images = {'amd64': 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.15.0', # noqa