Update calico to 1.15.0 + minor update to kube-ovn/weave (#6306)

This commit is contained in:
Florian Ruynat
2020-06-29 23:39:58 +02:00
committed by GitHub
parent 4c1e0b188d
commit 8213b1802b
4 changed files with 25 additions and 10 deletions

View File

@@ -209,6 +209,11 @@ spec:
# # Configure the IP Pool from which Pod IPs will be chosen.
# - name: CALICO_IPV4POOL_CIDR
# value: "{{ calico_pool_cidr | default(kube_pods_subnet) }}"
{% if calico_veth_mtu is defined %}
# Set MTU for the Wireguard tunnel device.
- name: FELIX_WIREGUARDMTU
value: "{{ calico_veth_mtu }}"
{% endif %}
- name: CALICO_IPV4POOL_IPIP
value: "{{ calico_ipv4pool_ipip }}"
# Disable IPv6 on Kubernetes.