Move CNI config and add MTU support for calico-cni
- Move CNI configuration creation for Calico to appropriate network_plugin role from kubernetes/node. - Add support for MTU configuration in Calico.
This commit is contained in:
parent
c18ccb64fb
commit
512c5b8440
4 changed files with 14 additions and 7 deletions
|
@ -4,13 +4,6 @@
|
||||||
- include: nginx-proxy.yml
|
- include: nginx-proxy.yml
|
||||||
when: is_kube_master == false and loadbalancer_apiserver_localhost|default(false)
|
when: is_kube_master == false and loadbalancer_apiserver_localhost|default(false)
|
||||||
|
|
||||||
- name: Write Calico cni config
|
|
||||||
template:
|
|
||||||
src: "cni-calico.conf.j2"
|
|
||||||
dest: "/etc/cni/net.d/10-calico.conf"
|
|
||||||
owner: kube
|
|
||||||
when: kube_network_plugin == "calico"
|
|
||||||
|
|
||||||
- name: Write kubelet config file
|
- name: Write kubelet config file
|
||||||
template: src=kubelet.j2 dest={{ kube_config_dir }}/kubelet.env backup=yes
|
template: src=kubelet.j2 dest={{ kube_config_dir }}/kubelet.env backup=yes
|
||||||
notify:
|
notify:
|
||||||
|
|
|
@ -11,3 +11,8 @@ overwrite_hyperkube_cni: true
|
||||||
|
|
||||||
calico_cert_dir: /etc/calico/certs
|
calico_cert_dir: /etc/calico/certs
|
||||||
etcd_cert_dir: /etc/ssl/etcd/ssl
|
etcd_cert_dir: /etc/ssl/etcd/ssl
|
||||||
|
|
||||||
|
# You can set MTU value here. If left undefined or empty, it will
|
||||||
|
# not be specified in calico CNI config, so Calico will use built-in
|
||||||
|
# defaults. The value should be a number, not a string.
|
||||||
|
# calico_mtu: 1500
|
||||||
|
|
|
@ -1,4 +1,10 @@
|
||||||
---
|
---
|
||||||
|
- name: Calico | Write Calico cni config
|
||||||
|
template:
|
||||||
|
src: "cni-calico.conf.j2"
|
||||||
|
dest: "/etc/cni/net.d/10-calico.conf"
|
||||||
|
owner: kube
|
||||||
|
|
||||||
- name: Calico | Set docker daemon options
|
- name: Calico | Set docker daemon options
|
||||||
template:
|
template:
|
||||||
src: docker
|
src: docker
|
||||||
|
|
|
@ -13,6 +13,9 @@
|
||||||
"policy": {
|
"policy": {
|
||||||
"type": "k8s"
|
"type": "k8s"
|
||||||
},
|
},
|
||||||
|
{% endif %}
|
||||||
|
{% if calico_mtu is defined and calico_mtu is number %}
|
||||||
|
"mtu": {{ calico_mtu }},
|
||||||
{% endif %}
|
{% endif %}
|
||||||
"kubernetes": {
|
"kubernetes": {
|
||||||
"kubeconfig": "{{ kube_config_dir }}/node-kubeconfig.yaml"
|
"kubeconfig": "{{ kube_config_dir }}/node-kubeconfig.yaml"
|
Loading…
Reference in a new issue