scl/kubespray
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calico add support for container ip forwarding setting (#8184)

Browse Source
This commit is contained in:
zhengtianbao
2021-11-12 21:06:46 -06:00
committed by GitHub
parent 5f1456337b
commit a08d82d94e
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/network_plugin/calico/defaults/main.yml
View File

@ -123,3 +123,6 @@ calico_bgp_listen_port: 179
# Calico FelixConfiguration options # Calico FelixConfiguration options
calico_felix_reporting_interval: 0s calico_felix_reporting_interval: 0s
calico_felix_log_severity_screen: Info calico_felix_log_severity_screen: Info
# Calico container settings
calico_allow_ip_forwarding: false

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

@ -38,6 +38,11 @@
"ipv4_pools": ["{{ calico_pool_cidr | default(kube_pods_subnet) }}"] "ipv4_pools": ["{{ calico_pool_cidr | default(kube_pods_subnet) }}"]
}, },
{% endif %} {% endif %}
{% if calico_allow_ip_forwarding %}
"container_settings": {
"allow_ip_forwarding": true
},
{% endif %}
{% if (calico_feature_control is defined) and (calico_feature_control|length > 0) %} {% if (calico_feature_control is defined) and (calico_feature_control|length > 0) %}
"feature_control": { "feature_control": {
{% for fc in calico_feature_control -%} {% for fc in calico_feature_control -%}