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

Merge pull request #2485 from LuckySB/flannel_iface_regexp

Browse source 
Add --iface-regex options to flannel
This commit is contained in:
Chad Swenson 2018-03-20 21:18:01 -05:00 committed by GitHub
commit a6b918c1a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roles/network_plugin/flannel/defaults/main.yml
View file

@ -5,9 +5,15 @@
# flannel_public_ip: "{{ access_ip|default(ip|default(ansible_default_ipv4.address)) }}" # flannel_public_ip: "{{ access_ip|default(ip|default(ansible_default_ipv4.address)) }}"
## interface that should be used for flannel operations ## interface that should be used for flannel operations
## This is actually an inventory node-level item ## This is actually an inventory cluster-level item
# flannel_interface: # flannel_interface:
## Select interface that should be used for flannel operations by regexp on Name or IP
## This is actually an inventory cluster-level item
## example: select interface with ip from net 10.0.0.0/23
## single quote and escape backslashes
# flannel_interface_regexp: '10\\.0\\.[0-2]\\.\\d{1,3}'
# You can choose what type of flannel backend to use # You can choose what type of flannel backend to use
# please refer to flannel's docs : https://github.com/coreos/flannel/blob/master/README.md # please refer to flannel's docs : https://github.com/coreos/flannel/blob/master/README.md
flannel_backend_type: "vxlan" flannel_backend_type: "vxlan"

2
roles/network_plugin/flannel/templates/cni-flannel.yml.j2
View file

@ -66,7 +66,7 @@ spec:
requests: requests:
cpu: {{ flannel_cpu_requests }} cpu: {{ flannel_cpu_requests }}
memory: {{ flannel_memory_requests }} memory: {{ flannel_memory_requests }}
command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr"{% if flannel_interface is defined %}, "--iface={{ flannel_interface }}"{% endif %} ] command: [ "/opt/bin/flanneld", "--ip-masq", "--kube-subnet-mgr"{% if flannel_interface is defined %}, "--iface={{ flannel_interface }}"{% endif %}{% if flannel_interface_regexp is defined %}, "--iface-regex={{ flannel_interface_regexp }}"{% endif %} ]
securityContext: securityContext:
privileged: true privileged: true
env: env: