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

Add support for Calico CNI host-local IPAM plugin (#6580)

Browse Source
This commit is contained in:
Barry Melbourne
2020-09-17 10:44:46 +01:00
committed by GitHub
parent 705ad84ce7
commit b6b26c710f
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
roles/network_plugin/calico/templates/cni-calico.conflist.j2
View File

@@ -9,9 +9,9 @@
{% else %}
{% if cloud_provider is defined %}
"nodename": "{{ calico_kubelet_name.stdout }}",
{% else %}
{% else %}
"nodename": "{{ calico_baremetal_nodename }}",
{% endif %}
{% endif %}
{% endif %}
"type": "calico",
"log_level": "info",
@@ -22,7 +22,7 @@
"etcd_key_file": "{{ calico_cert_dir }}/key.pem",
"etcd_ca_cert_file": "{{ calico_cert_dir }}/ca_cert.crt",
{% endif %}
{% if calico_datastore == "kdd" and calico_version is version('v3.6.0', '<') %}
{% if calico_ipam_host_local is defined %}
"ipam": {
"type": "host-local",
"subnet": "usePodCidr"
@@ -47,18 +47,18 @@
"policy": {
"type": "k8s"
},
{%- endif %}
{% endif %}
{% if calico_mtu is defined and calico_mtu is number %}
"mtu": {{ calico_mtu }},
{%- endif %}
{% endif %}
"kubernetes": {
"kubeconfig": "{% if calico_version is version('v3.3.0', '>=') %}__KUBECONFIG_FILEPATH__{% else %}{{ kube_config_dir }}/node-kubeconfig.yaml{% endif %}"
}
},
{
"type":"portmap",
"capabilities":{
"portMappings":true
"capabilities": {
"portMappings": true
}
}
]