github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not try to restart services

Browse Source
This commit is contained in:
Konstantinos Tsakalozos
2017-07-21 12:39:42 +03:00
parent 685dff99ab
commit 53f00722e2
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View File

@@ -30,7 +30,6 @@ from shlex import split
from subprocess import check_call from subprocess import check_call
from subprocess import check_output from subprocess import check_output
from subprocess import CalledProcessError from subprocess import CalledProcessError
from time import sleep
from charms import layer from charms import layer
from charms.layer import snap from charms.layer import snap
@@ -335,19 +334,11 @@ def idle_status(kube_api, kube_control):
def master_services_down(): def master_services_down():
"""Ensure master services are up and running. """Ensure master services are up and running.
Try to restart any failing services once.
Return: list of failing services""" Return: list of failing services"""
services = ['kube-apiserver', services = ['kube-apiserver',
'kube-controller-manager', 'kube-controller-manager',
'kube-scheduler'] '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 = [] failing_services = []
for service in services: for service in services:
daemon = 'snap.{}.daemon'.format(service) daemon = 'snap.{}.daemon'.format(service)

7
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View File

@@ -22,7 +22,6 @@ from shlex import split
from subprocess import check_call, check_output from subprocess import check_call, check_output
from subprocess import CalledProcessError from subprocess import CalledProcessError
from socket import gethostname from socket import gethostname
from time import sleep
from charms import layer from charms import layer
from charms.layer import snap from charms.layer import snap
@@ -262,12 +261,6 @@ def update_kubelet_status():
'kubelet', 'kubelet',
'kube-proxy' '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 = [] failing_services = []
for service in services: for service in services:
daemon = 'snap.{}.daemon'.format(service) daemon = 'snap.{}.daemon'.format(service)