Merge pull request #562 from jnummelin/calico-iptables-mode-auto

Always set calico to auto detect iptables backend mode
k0sproject · Dec 21, 2020 · 8749d9d · 8749d9d
2 parents fdce30c + 1ef2710
commit 8749d9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/docs/internal/upgrading-calico.md b/docs/internal/upgrading-calico.md
@@ -44,7 +44,12 @@ not the calico originals.
   value: "{{ .VxlanVNI }}"
 {{- end }}
 ```
-
+- iptables auto detect:
+```helmyaml
+# Auto detect the iptables backend
+- name: FELIX_IPTABLESBACKEND
+  value: "auto"
+```
 - variable-based WireGuard support:
 ```helmyaml
 {{- if .EnableWireguard }}

diff --git a/static/manifests/calico/DaemonSet/calico-node.yaml b/static/manifests/calico/DaemonSet/calico-node.yaml
@@ -154,6 +154,9 @@ spec:
             # Auto-detect the BGP IP address.
             - name: IP
               value: "autodetect"
+            # Auto detect the iptables backend
+            - name: FELIX_IPTABLESBACKEND
+              value: "auto"
             {{- if eq .Mode "ipip" }}
             # Enable IPIP
             - name: CALICO_IPV4POOL_IPIP