diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index 1780795bff8..8149c9ab288 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -30,7 +30,6 @@ from shlex import split from subprocess import check_call from subprocess import check_output from subprocess import CalledProcessError -from time import sleep from charms import layer from charms.layer import snap @@ -335,19 +334,11 @@ def idle_status(kube_api, kube_control): def master_services_down(): """Ensure master services are up and running. - Try to restart any failing services once. Return: list of failing services""" services = ['kube-apiserver', 'kube-controller-manager', 'kube-scheduler'] - for service in services: - daemon = 'snap.{}.daemon'.format(service) - if not host.service_running(daemon): - hookenv.log("Service {} was down. Starting it.".format(daemon)) - host.service_start(daemon) - sleep(10) - failing_services = [] for service in services: daemon = 'snap.{}.daemon'.format(service) diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index 282aa70cbc6..57e9fae5bf2 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -22,7 +22,6 @@ from shlex import split from subprocess import check_call, check_output from subprocess import CalledProcessError from socket import gethostname -from time import sleep from charms import layer from charms.layer import snap @@ -262,12 +261,6 @@ def update_kubelet_status(): 'kubelet', 'kube-proxy' ] - for service in services: - daemon = 'snap.{}.daemon'.format(service) - if not _systemctl_is_active(daemon): - hookenv.log("Service {} id down. Starting it.".format(daemon)) - sleep(10) - failing_services = [] for service in services: daemon = 'snap.{}.daemon'.format(service)