epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-09 19:58:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixup deploy of kubeadm etcd for Kubernetes v1.15.0 (#4952)

Browse Source 
* Fixup deploy of kubeadm etcd for Kubernetes v1.15.0

Change-Id: If42c2c75c4d278ba9475ebf76c243f3e6ee4d02e

* undo renaming cloud config file

Change-Id: Iafbd27c3887d6a2a6d0819c711f150ecf70c515d
This commit is contained in:
Matthew Mosesohn
2019-07-09 15:41:59 +03:00
committed by GitHub
parent a67a50f9c0
commit 352297cf8d
8 changed files with 79 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2
View File

@@ -9,8 +9,12 @@ discovery:
apiServerEndpoint: {{ kubeadm_discovery_address }}
{% endif %}
token: {{ kubeadm_token }}
{% if kubeadm_ca_hash.stdout is defined %}
caCertHashes:
- sha256:{{ kubeadm_ca_hash.stdout }}
{% else %}
unsafeSkipCAVerification: true
{% endif %}
timeout: {{ discovery_timeout }}
tlsBootstrapToken: {{ kubeadm_token }}
caCertPath: {{ kube_cert_dir }}/ca.crt