C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

calico CALICO_IPV4POOL_IPIP overriding variable (#3507)

Browse source
This commit is contained in:
Anupam Basak 2018-10-12 12:39:36 +05:30 committed by k8s-ci-robot
parent 3b750cafc1
commit 3ce933051a
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roles/network_plugin/calico/defaults/main.yml
View file

@ -4,6 +4,7 @@ nat_outgoing: true
# add default ippool name # add default ippool name
calico_pool_name: "default-pool" calico_pool_name: "default-pool"
calico_ipv4pool_ipip: "Off"
# Use IP-over-IP encapsulation across hosts # Use IP-over-IP encapsulation across hosts
ipip: true ipip: true

4
roles/network_plugin/calico/templates/calico-node.yml.j2
View file

@ -77,8 +77,8 @@ spec:
# # Configure the IP Pool from which Pod IPs will be chosen. # # Configure the IP Pool from which Pod IPs will be chosen.
# - name: CALICO_IPV4POOL_CIDR # - name: CALICO_IPV4POOL_CIDR
# value: "192.168.0.0/16" # value: "192.168.0.0/16"
# - name: CALICO_IPV4POOL_IPIP - name: CALICO_IPV4POOL_IPIP
# value: "always" value: "{{ calico_ipv4pool_ipip }}"
# Disable IPv6 on Kubernetes. # Disable IPv6 on Kubernetes.
- name: FELIX_IPV6SUPPORT - name: FELIX_IPV6SUPPORT
value: "false" value: "false"