diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 4db770315c4..b12fe3a73ba 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -532,7 +532,7 @@ KUBE_PROXY_DAEMONSET=${KUBE_PROXY_DAEMONSET:-false} # true, false # as an addon daemonset. KUBE_PROXY_DISABLE="${KUBE_PROXY_DISABLE:-false}" # true, false -# Optional: Change the kube-proxy implementation. Choices are [iptables, ipvs]. +# Optional: Change the kube-proxy implementation. Choices are [iptables, ipvs, nftables]. KUBE_PROXY_MODE=${KUBE_PROXY_MODE:-iptables} # Will be passed into the kube-proxy via `--detect-local-mode` diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 7a938eafb5b..168115a4424 100755 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -1774,6 +1774,12 @@ function prepare-kube-proxy-manifest-variables { fi params+=" --proxy-mode=ipvs --ipvs-sync-period=1m --ipvs-min-sync-period=10s" ;; + nftables) + # Pass --conntrack-tcp-be-liberal so we can test that this makes the + # "proxy implementation should not be vulnerable to the invalid conntrack state bug" + # test pass. https://issues.k8s.io/122663#issuecomment-1885024015 + params+=" --proxy-mode=nftables --conntrack-tcp-be-liberal" + ;; esac if [[ -n "${KUBEPROXY_TEST_ARGS:-}" ]]; then