github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #58843 from hyperbolic2346/mwilson/spaces-fixes

Browse Source 
Automatic merge from submit-queue. 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>.

Fixing spaces issue found with tests.

Had some missing parameters for some functions.



**What this PR does / why we need it**:
Fixing charms when setting extra sans on load balancer or 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/477
**Special notes for your reviewer**:

**Release note**:

```release-note
Fixing extra_sans option on master and load balancer.
```
This commit is contained in:
Kubernetes Submit Queue 2018-01-26 07:40:06 -08:00 committed by GitHub
commit 46cd37480e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,12 +93,13 @@ def request_server_certificates(tls, website):
tls.request_server_cert(common_name, sans, certificate_name)
@when('config.changed.extra_sans', 'certificates.available')
def update_certificate(tls):
@when('config.changed.extra_sans', 'certificates.available',
'website.available')
def update_certificate(tls, website):
# Using the config.changed.extra_sans flag to catch changes.
# IP changes will take ~5 minutes or so to propagate, but
# it will update.
request_server_certificates(tls)
request_server_certificates(tls, website)
@when('certificates.server.cert.available',

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

@ -612,12 +612,13 @@ def send_data(tls, kube_api_endpoint):
tls.request_server_cert(common_name, sans, certificate_name)
@when('config.changed.extra_sans', 'certificates.available')
def update_certificate(tls):
@when('config.changed.extra_sans', 'certificates.available',
'kube-api-endpoint.available')
def update_certificate(tls, kube_api_endpoint):
# Using the config.changed.extra_sans flag to catch changes.
# IP changes will take ~5 minutes or so to propagate, but
# it will update.
send_data(tls)
send_data(tls, kube_api_endpoint)
@when('certificates.server.cert.available',