External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-17 17:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Revert "Use K8s 1.14 and add kubeadm experimental control plane mode (#4317)" (#4510)

Browse Source 
This reverts commit 316508626d.
This commit is contained in:
Matthew Mosesohn
2019-04-11 22:52:43 +03:00
committed by Kubernetes Prow Robot
parent 316508626d
commit d39c273d96
37 changed files with 398 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/network_plugin/canal/defaults/main.yml
View File

@@ -30,8 +30,3 @@ calicoctl_memory_limit: 170M
calicoctl_cpu_limit: 100m
calicoctl_memory_requests: 32M
calicoctl_cpu_requests: 25m
# etcd cert filenames
kube_etcd_cacert_file: ca.pem
kube_etcd_cert_file: node-{{ inventory_hostname }}.pem
kube_etcd_key_file: node-{{ inventory_hostname }}-key.pem

6
roles/network_plugin/canal/tasks/main.yml
View File

@@ -20,9 +20,9 @@
state: hard
force: yes
with_items:
- {s: "{{ kube_etcd_cacert_file }}", d: "ca_cert.crt"}
- {s: "{{ kube_etcd_cert_file }}", d: "cert.crt"}
- {s: "{{ kube_etcd_key_file }}", d: "key.pem"}
- {s: "ca.pem", d: "ca_cert.crt"}
- {s: "node-{{ inventory_hostname }}.pem", d: "cert.crt"}
- {s: "node-{{ inventory_hostname }}-key.pem", d: "key.pem"}
- name: Canal | Set Flannel etcd configuration
command: |-