Browse Source

[calico] switch default iptables backend detection to Auto (#8429)

pull/8464/head
Cristian Calin 2 years ago
committed by GitHub
parent
commit
ef34f5fe7d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 2 additions and 14 deletions
  1. 2
      inventory/sample/group_vars/k8s_cluster/k8s-net-calico.yml
  2. 2
      roles/network_plugin/calico/defaults/main.yml
  3. 3
      tests/files/packet_almalinux8-calico-nodelocaldns-secondary.yml
  4. 3
      tests/files/packet_almalinux8-calico.yml
  5. 3
      tests/files/packet_almalinux8-crio.yml
  6. 3
      tests/files/packet_almalinux8-docker.yml

2
inventory/sample/group_vars/k8s_cluster/k8s-net-calico.yml

@ -59,7 +59,7 @@
# calico_datastore: "kdd" # calico_datastore: "kdd"
# Choose Calico iptables backend: "Legacy", "Auto" or "NFT" # Choose Calico iptables backend: "Legacy", "Auto" or "NFT"
# calico_iptables_backend: "Legacy"
# calico_iptables_backend: "Auto"
# Use typha (only with kdd) # Use typha (only with kdd)
# typha_enabled: false # typha_enabled: false

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

@ -78,7 +78,7 @@ calico_healthhost: "localhost"
calico_iptables_lock_timeout_secs: 10 calico_iptables_lock_timeout_secs: 10
# Choose Calico iptables backend: "Legacy", "Auto" or "NFT" (FELIX_IPTABLESBACKEND) # Choose Calico iptables backend: "Legacy", "Auto" or "NFT" (FELIX_IPTABLESBACKEND)
calico_iptables_backend: "Legacy"
calico_iptables_backend: "Auto"
# Calico Wireguard support # Calico Wireguard support
calico_wireguard_enabled: false calico_wireguard_enabled: false

3
tests/files/packet_almalinux8-calico-nodelocaldns-secondary.yml

@ -7,6 +7,3 @@ vm_memory: 3072Mi
# Kubespray settings # Kubespray settings
enable_nodelocaldns_secondary: true enable_nodelocaldns_secondary: true
loadbalancer_apiserver_type: haproxy loadbalancer_apiserver_type: haproxy
# required
calico_iptables_backend: "Auto"

3
tests/files/packet_almalinux8-calico.yml

@ -9,6 +9,3 @@ metrics_server_enabled: true
dashboard_namespace: "kube-dashboard" dashboard_namespace: "kube-dashboard"
dashboard_enabled: true dashboard_enabled: true
loadbalancer_apiserver_type: haproxy loadbalancer_apiserver_type: haproxy
# required
calico_iptables_backend: "Auto"

3
tests/files/packet_almalinux8-crio.yml

@ -6,6 +6,3 @@ mode: default
# Kubespray settings # Kubespray settings
container_manager: crio container_manager: crio
auto_renew_certificates: true auto_renew_certificates: true
# required
calico_iptables_backend: "Auto"

3
tests/files/packet_almalinux8-docker.yml

@ -4,9 +4,6 @@ cloud_image: almalinux-8
mode: default mode: default
vm_memory: 3072Mi vm_memory: 3072Mi
# required
calico_iptables_backend: "Auto"
# Use docker # Use docker
container_manager: docker container_manager: docker
etcd_deployment_type: docker etcd_deployment_type: docker

Loading…
Cancel
Save