From c21b305fe9b111923a36312ab9caa78153819792 Mon Sep 17 00:00:00 2001 From: George Kraft Date: Mon, 3 Jul 2017 09:44:22 -0500 Subject: [PATCH] Fix kubernetes charms not restarting services after snap upgrades --- .../juju/layers/kubernetes-master/reactive/kubernetes_master.py | 1 + .../juju/layers/kubernetes-worker/reactive/kubernetes_worker.py | 1 + 2 files changed, 2 insertions(+) diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index 0bc39a5840..20d7758e39 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -155,6 +155,7 @@ def install_snaps(): hookenv.status_set('maintenance', 'Installing cdk-addons snap') snap.install('cdk-addons', channel=channel) set_state('kubernetes-master.snaps.installed') + remove_state('kubernetes-master.components.started') @when('config.changed.channel') diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index a4f0204616..4dba0c0ff6 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -149,6 +149,7 @@ def install_snaps(): hookenv.status_set('maintenance', 'Installing kube-proxy snap') snap.install('kube-proxy', channel=channel, classic=True) set_state('kubernetes-worker.snaps.installed') + set_state('kubernetes-worker.restart-needed') remove_state('kubernetes-worker.snaps.upgrade-needed') remove_state('kubernetes-worker.snaps.upgrade-specified')