Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
53f00722
Commit
53f00722
authored
Jul 21, 2017
by
Konstantinos Tsakalozos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not try to restart services
parent
685dff99
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
16 deletions
+0
-16
kubernetes_master.py
...ju/layers/kubernetes-master/reactive/kubernetes_master.py
+0
-9
kubernetes_worker.py
...ju/layers/kubernetes-worker/reactive/kubernetes_worker.py
+0
-7
No files found.
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View file @
53f00722
...
@@ -30,7 +30,6 @@ from shlex import split
...
@@ -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):
...
@@ -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
)
...
...
cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py
View file @
53f00722
...
@@ -22,7 +22,6 @@ from shlex import split
...
@@ -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():
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment