github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #56633 from juju-solutions/bug/restarts 

Automatic merge from submit-queue (batch tested with PRs 56337, 56546, 56550, 56633, 56635). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Remove do-restart states

**What this PR does / why we need it**: Simplify juju reactive part of the master.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/448

**Special notes for your reviewer**:

**Release note**:

```NONE```
pull/6/head
Kubernetes Submit Queue 2017-12-16 01:53:52 -08:00 committed by GitHub
parent 528f04512f 85ac2dc9fa
commit 7a3fa9d58e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -443,7 +443,7 @@ def start_master(etcd):
configure_apiserver(etcd) configure_apiserver(etcd)
configure_controller_manager() configure_controller_manager()
configure_scheduler() configure_scheduler()
set_state('kubernetes-master.components.started')
hookenv.open_port(6443) hookenv.open_port(6443)
@ -583,7 +583,7 @@ def kick_api_server(tls):
if data_changed('cert', tls.get_server_cert()): if data_changed('cert', tls.get_server_cert()):
# certificate changed, so restart the api server # certificate changed, so restart the api server
hookenv.log("Certificate information changed, restarting api server") hookenv.log("Certificate information changed, restarting api server")
set_state('kube-apiserver.do-restart') restart_apiserver()
tls_client.reset_certificate_write_flag('server') tls_client.reset_certificate_write_flag('server')
@ -866,42 +866,25 @@ def shutdown():
service_stop('snap.kube-scheduler.daemon') service_stop('snap.kube-scheduler.daemon')
@when('kube-apiserver.do-restart')
def restart_apiserver(): def restart_apiserver():
prev_state, prev_msg = hookenv.status_get() prev_state, prev_msg = hookenv.status_get()
hookenv.status_set('maintenance', 'Restarting kube-apiserver') hookenv.status_set('maintenance', 'Restarting kube-apiserver')
host.service_restart('snap.kube-apiserver.daemon') host.service_restart('snap.kube-apiserver.daemon')
hookenv.status_set(prev_state, prev_msg) hookenv.status_set(prev_state, prev_msg)
remove_state('kube-apiserver.do-restart')
set_state('kube-apiserver.started')
@when('kube-controller-manager.do-restart')
def restart_controller_manager(): def restart_controller_manager():
prev_state, prev_msg = hookenv.status_get() prev_state, prev_msg = hookenv.status_get()
hookenv.status_set('maintenance', 'Restarting kube-controller-manager') hookenv.status_set('maintenance', 'Restarting kube-controller-manager')
host.service_restart('snap.kube-controller-manager.daemon') host.service_restart('snap.kube-controller-manager.daemon')
hookenv.status_set(prev_state, prev_msg) hookenv.status_set(prev_state, prev_msg)
remove_state('kube-controller-manager.do-restart')
set_state('kube-controller-manager.started')
@when('kube-scheduler.do-restart')
def restart_scheduler(): def restart_scheduler():
prev_state, prev_msg = hookenv.status_get() prev_state, prev_msg = hookenv.status_get()
hookenv.status_set('maintenance', 'Restarting kube-scheduler') hookenv.status_set('maintenance', 'Restarting kube-scheduler')
host.service_restart('snap.kube-scheduler.daemon') host.service_restart('snap.kube-scheduler.daemon')
hookenv.status_set(prev_state, prev_msg) hookenv.status_set(prev_state, prev_msg)
remove_state('kube-scheduler.do-restart')
set_state('kube-scheduler.started')
@when_all('kube-apiserver.started',
'kube-controller-manager.started',
'kube-scheduler.started')
@when_not('kubernetes-master.components.started')
def componenets_started():
set_state('kubernetes-master.components.started')
def arch(): def arch():
@ -1117,8 +1100,7 @@ def configure_apiserver(etcd):
api_opts['admission-control'] = ','.join(admission_control) api_opts['admission-control'] = ','.join(admission_control)
configure_kubernetes_service('kube-apiserver', api_opts, 'api-extra-args') configure_kubernetes_service('kube-apiserver', api_opts, 'api-extra-args')
restart_apiserver()
set_state('kube-apiserver.do-restart')
def configure_controller_manager(): def configure_controller_manager():
@ -1140,8 +1122,7 @@ def configure_controller_manager():
configure_kubernetes_service('kube-controller-manager', controller_opts, configure_kubernetes_service('kube-controller-manager', controller_opts,
'controller-manager-extra-args') 'controller-manager-extra-args')
restart_controller_manager()
set_state('kube-controller-manager.do-restart')
def configure_scheduler(): def configure_scheduler():
@ -1154,7 +1135,7 @@ def configure_scheduler():
configure_kubernetes_service('kube-scheduler', scheduler_opts, configure_kubernetes_service('kube-scheduler', scheduler_opts,
'scheduler-extra-args') 'scheduler-extra-args')
set_state('kube-scheduler.do-restart') restart_scheduler()
def setup_basic_auth(password=None, username='admin', uid='admin', def setup_basic_auth(password=None, username='admin', uid='admin',