Skip to content

Commit

Permalink
Support configuring the Calico iptables insert mode (#5473)
Browse files Browse the repository at this point in the history
* Support configuring the insert mode

Defaults to the upstream default https://docs.projectcalico.org/v3.9/reference/felix/configuration

so nothing should change for existing deployments.

This allows coexistence with other firewall management technologies.

* Add a note to the sample config
  • Loading branch information
hfinucane authored Mar 14, 2020
1 parent 168241d commit 158d998
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions inventory/sample/group_vars/k8s-cluster/k8s-net-calico.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,5 @@
# * interface=INTERFACE-REGEX
# see https://docs.projectcalico.org/reference/node/configuration
# calico_ip_auto_method: "interface=eth.*"
# Choose the iptables insert mode for Calico: "Insert" or "Append".
# calico_felix_chaininsertmode: Insert
1 change: 1 addition & 0 deletions roles/network_plugin/calico/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ calicoctl_memory_limit: 170M
calicoctl_cpu_limit: 100m
calicoctl_memory_requests: 32M
calicoctl_cpu_requests: 250m
calico_felix_chaininsertmode: Insert

# Enable Prometheus Metrics endpoint for felix
calico_felix_prometheusmetricsenabled: false
Expand Down
2 changes: 2 additions & 0 deletions roles/network_plugin/calico/templates/calico-node.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ spec:
- name: FELIX_IPINIPMTU
value: "{{ calico_mtu }}"
{% endif %}
- name: FELIX_CHAININSERTMODE
value: "{{ calico_felix_chaininsertmode }}"
- name: FELIX_PROMETHEUSMETRICSENABLED
value: "{{ calico_felix_prometheusmetricsenabled }}"
- name: FELIX_PROMETHEUSMETRICSPORT
Expand Down

0 comments on commit 158d998

Please sign in to comment.