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
21c8253d
Commit
21c8253d
authored
Nov 01, 2017
by
Mike Wilson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changing the way we clear the certificate written flag to use a helper function in the tls layer.
parent
b5b53bd2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
load_balancer.py
...ju/layers/kubeapi-load-balancer/reactive/load_balancer.py
+2
-1
kubernetes_master.py
...ju/layers/kubernetes-master/reactive/kubernetes_master.py
+3
-1
No files found.
cluster/juju/layers/kubeapi-load-balancer/reactive/load_balancer.py
View file @
21c8253d
...
@@ -27,6 +27,7 @@ from charmhelpers.contrib.charmsupport import nrpe
...
@@ -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):
...
@@ -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'
)
...
...
cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py
View file @
21c8253d
...
@@ -45,6 +45,8 @@ from charms.kubernetes.common import get_version
...
@@ -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):
...
@@ -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'
)
...
...
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