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

Use K8s 1.14 and add kubeadm experimental control plane mode (#4514)

Browse Source 
* Use K8s 1.14 and add kubeadm experimental control plane mode

This reverts commit d39c273d96.

* Cleanup kubeadm setup run on first master

* pin kubeadm_certificate_key in test

* Remove kubelet autolabel of kube-node, add symlink for pki dir

Change-Id: Id5e74dd667c60675dbfe4193b0bc9fb44380e1ca
This commit is contained in:
Matthew Mosesohn
2019-04-19 16:01:54 +03:00
committed by Kubernetes Prow Robot
parent d0e628911c
commit 05dc2b3a09
39 changed files with 319 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/network_plugin/calico/templates/etcdv2-store.yml.j2
View File

@@ -4,6 +4,6 @@ metadata:
spec:
datastoreType: "etcdv2"
etcdEndpoints: "{{ etcd_access_addresses }}"
etcdKeyFile: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem"
etcdCertFile: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem"
etcdCACertFile: "{{ etcd_cert_dir }}/ca.pem"
etcdKeyFile: "{{ etcd_cert_dir }}/{{ kube_etcd_key_file }}"
etcdCertFile: "{{ etcd_cert_dir }}/{{ kube_etcd_cert_file }}"
etcdCACertFile: "{{ etcd_cert_dir }}/{{ kube_etcd_cacert_file }}"