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

Merge pull request #602 from adidenko/fix-canal-ssl

Browse Source 
Fix etcd ssl for canal
This commit is contained in:
Matthew Mosesohn
2016-11-15 12:43:22 +03:00
committed by GitHub
parent 5cd65f9c45 caa81f3ac2
commit ab0ff2ab3c
6 changed files with 73 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
roles/kubernetes/node/templates/cni-canal.conf.j2
View File

@@ -1,15 +0,0 @@
{
"name": "canal-k8s-network",
"type": "flannel",
"delegate": {
"type": "calico",
"etcd_endpoints": "{{ etcd_access_endpoint }}",
"log_level": "info",
"policy": {
"type": "k8s"
},
"kubernetes": {
"kubeconfig": "{{ kube_config_dir }}/node-kubeconfig.yaml"
}
}
}