Browse Source

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

pull/8192/head
zhengtianbao 3 years ago
committed by GitHub
parent
commit
a08d82d94e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
  1. 3
      roles/network_plugin/calico/defaults/main.yml
  2. 5
      roles/network_plugin/calico/templates/cni-calico.conflist.j2

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

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

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

@ -38,6 +38,11 @@
"ipv4_pools": ["{{ calico_pool_cidr | default(kube_pods_subnet) }}"]
},
{% 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) %}
"feature_control": {
{% for fc in calico_feature_control -%}

Loading…
Cancel
Save