Skip to content

Commit 3994db3

Browse files
committed
salt: Do no longer set bridge-nf-call-iptables sysctls
Thoses sysctls are not strictly needed for the cluster to work with Calico CNI and it may cause trouble when using ExternalIPs with a bridge interface
1 parent a47f365 commit 3994db3

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
- Bump coredns version to [1.12.2](https://github.com/coredns/coredns/releases/tag/v1.12.2)
1111
(PR[#4637](https://github.com/scality/metalk8s/pull/4637))
1212

13+
- Do no longer enforce net.bridge.bridge-nf-call-ip6tables and
14+
net.bridge.bridge-nf-call-iptables sysctls
15+
(PR[#4724](https://github.com/scality/metalk8s/pull/4724))
16+
1317
## Release 131.0.5 (in development)
1418

1519
## Release 131.0.4

salt/metalk8s/defaults.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ kubeadm_preflight:
3131
- 2379
3232
- 2380
3333
sysctl_values:
34-
net.bridge.bridge-nf-call-ip6tables: 1
35-
net.bridge.bridge-nf-call-iptables: 1
3634
net.ipv4.ip_forward: 1
3735
recommended:
3836
packages:

salt/metalk8s/internal/preflight/mandatory.sls

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ Enable {{ kubelet.container_engine }} service:
2222
- test: Check that the crictl socket answer
2323
{%- endif %}
2424
25-
# required to set sysctl net.bridge.bridge-nf-call-iptables
26-
Add the module br_netfilter to kernel:
27-
kmod.present:
28-
- name: br_netfilter
29-
- persist: True
3025
3126
{%- for item, value in kubeadm_preflight.mandatory.sysctl_values.items() %}
3227
Set sysctl {{ item }} value to {{ value }}:
@@ -35,10 +30,6 @@ Set sysctl {{ item }} value to {{ value }}:
3530
- value: {{ value }}
3631
- config: /etc/sysctl.d/60-metalk8s.conf
3732
- check_priority: True
38-
{%- if item in ("net.bridge.bridge-nf-call-ip6tables", "net.bridge.bridge-nf-call-iptables") %}
39-
- require:
40-
- kmod: Add the module br_netfilter to kernel
41-
{%- endif %}
4233
{%- endfor %}
4334
4435
{%- for swap_device in salt.mount.swaps().keys() %}

0 commit comments

Comments
 (0)