External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-04-14 06:29:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Changes in Kubernetes and Calico-CNI plugin config files

Browse Source 
required for usage of Calico CNI plugin version 1.4.2
This commit is contained in:
Sergey Vasilenko
2016-10-06 13:06:19 +03:00
parent c490e5c8a1
commit a6344f7561
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes/node/templates/cni-calico.conf.j2
View File

@@ -1,9 +1,11 @@
{ {
"name": "calico-k8s-network", "name": "calico-k8s-network",
"type": "calico", "type": "calico",
"etcd_authority": "{{ etcd_authority }}",
"log_level": "info", "log_level": "info",
"ipam": { "ipam": {
"type": "calico-ipam" "type": "calico-ipam"
},
"kubernetes": {
"kubeconfig": "{{ kube_config_dir }}/node-kubeconfig.yaml"
} }
} }

1
roles/kubernetes/node/templates/node-kubeconfig.yaml.j2
View File

@@ -4,6 +4,7 @@ clusters:
- name: local - name: local
cluster: cluster:
certificate-authority: {{ kube_cert_dir }}/ca.pem certificate-authority: {{ kube_cert_dir }}/ca.pem
server: http://127.0.0.1:8080
users: users:
- name: kubelet - name: kubelet
user: user: