github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Changing the way we clear the certificate written flag to use a helper function in the tls layer.

Browse Source
This commit is contained in:
Mike Wilson 2017-11-01 17:53:29 -04:00
parent b5b53bd273
commit 21c8253dfe
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/juju/layers/kubeapi-load-balancer/reactive/load_balancer.py
View File

@ -27,6 +27,7 @@ from charmhelpers.contrib.charmsupport import nrpe
from charms.reactive.helpers import data_changed from charms.reactive.helpers import data_changed
from charms.layer import nginx from charms.layer import nginx
from charms.layer import tls_client
from subprocess import Popen from subprocess import Popen
from subprocess import PIPE from subprocess import PIPE
@ -73,7 +74,7 @@ def kick_nginx(tls):
# certificate changed, so sighup nginx # certificate changed, so sighup nginx
hookenv.log("Certificate information changed, sending SIGHUP to nginx") hookenv.log("Certificate information changed, sending SIGHUP to nginx")
host.service_restart('nginx') host.service_restart('nginx')
remove_state('tls_client.server.certificate.written') tls_client.reset_certificate_write_flag('server')
@when('config.changed.port') @when('config.changed.port')

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

@ -45,6 +45,8 @@ from charms.kubernetes.common import get_version
from charms.kubernetes.common import retry from charms.kubernetes.common import retry
from charms.kubernetes.flagmanager import FlagManager from charms.kubernetes.flagmanager import FlagManager
from charms.layer import tls_client
from charmhelpers.core import hookenv from charmhelpers.core import hookenv
from charmhelpers.core import host from charmhelpers.core import host
from charmhelpers.core import unitdata from charmhelpers.core import unitdata
@ -568,7 +570,7 @@ def kick_api_server(tls):
# 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') set_state('kube-apiserver.do-restart')
remove_state('tls_client.server.certificate.written') tls_client.reset_certificate_write_flag('server')
@when('kubernetes-master.components.started') @when('kubernetes-master.components.started')