github-personal/matchbox
1
0
Fork 0
mirror of https://github.com/outbackdingo/matchbox.git synced 2026-01-28 02:19:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

examples: Use etcd client certs in locksmithd dropin

Browse Source 
* Fixes a regression introduced in 6f02107 which upgraded to
Kubernetes v1.6.6 and added self-hosted etcd with TLS
* Both on-host and self-hosted etcd now require clients to use
TLS client certs so locksmithd
This commit is contained in:
Dalton Hubble
2017-06-26 14:36:43 -07:00
parent 6f02107448
commit c915fc2b52
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/terraform/modules/profiles/cl/bootkube-controller.yaml.tmpl
View File

@@ -32,12 +32,12 @@ systemd:
contents: |
[Service]
Environment="REBOOT_STRATEGY=etcd-lock"
{{ if eq .etcd_on_host "false" -}}
Environment="LOCKSMITHD_ENDPOINT=http://{{.k8s_etcd_service_ip}}:2379"
{{ else }}
Environment="LOCKSMITHD_ETCD_CAFILE=/etc/ssl/etcd/etcd-ca.crt"
Environment="LOCKSMITHD_ETCD_CERTFILE=/etc/ssl/etcd/etcd-client.crt"
Environment="LOCKSMITHD_ETCD_KEYFILE=/etc/ssl/etcd/etcd-client.key"
{{ if eq .etcd_on_host "false" -}}
Environment="LOCKSMITHD_ENDPOINT=http://{{.k8s_etcd_service_ip}}:2379"
{{ else }}
Environment="LOCKSMITHD_ENDPOINT={{.etcd_endpoints}}"
{{ end }}
- name: kubelet.path

6
examples/terraform/modules/profiles/cl/bootkube-worker.yaml.tmpl
View File

@@ -9,12 +9,12 @@ systemd:
contents: |
[Service]
Environment="REBOOT_STRATEGY=etcd-lock"
{{ if eq .etcd_on_host "false" -}}
Environment="LOCKSMITHD_ENDPOINT=http://{{.k8s_etcd_service_ip}}:2379"
{{ else }}
Environment="LOCKSMITHD_ETCD_CAFILE=/etc/ssl/etcd/etcd-ca.crt"
Environment="LOCKSMITHD_ETCD_CERTFILE=/etc/ssl/etcd/etcd-client.crt"
Environment="LOCKSMITHD_ETCD_KEYFILE=/etc/ssl/etcd/etcd-client.key"
{{ if eq .etcd_on_host "false" -}}
Environment="LOCKSMITHD_ENDPOINT=http://{{.k8s_etcd_service_ip}}:2379"
{{ else }}
Environment="LOCKSMITHD_ENDPOINT={{.etcd_endpoints}}"
{{ end }}
- name: kubelet.path