Merge pull request #60166 from rramkumar1/hairpin-mode-default-change

Automatic merge from submit-queue (batch tested with PRs 60166, 61706, 61769). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Change HAIRPIN_MODE to hairpin-veth as default **What this PR does / why we need it**: Change the default HAIRPIN_MODE back to "hairpin-veth". It was previously "promiscuous-bridge" in order to workaround a kernel bug which deadlocked the machine when hairpin-veth was used. (#27498) After some thorough manual testing on ubuntu clusters, we feel confident now that the kernel bug is fixed so we should switch back to using hairpin-veth. This will allow us to clean up some ebtables rules that were put in place to make "promiscuous-bridge" work properly. Once this change goes in, we need to carefully monitor our e2e tests to make sure the bug has not resurfaced. **Release note**: ```release-note In a GCE cluster, the default HAIRPIN_MODE is now "hairpin-veth". ``` /cc @freehan @prameshj /assign @roberthbailey

Merge pull request #60166 from rramkumar1/hairpin-mode-default-change
789a27be · Kubernetes Submit Queue · GitHub · 27df7d18 · 7def53ab · 789a27be
Unverified Commit 789a27be authored Mar 28, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 28, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

config-default.sh cluster/gce/config-default.sh +1 -1

config-test.sh cluster/gce/config-test.sh +1 -1

No files found.
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -326,7 +326,7 @@ NETWORK_POLICY_PROVIDER="${NETWORK_POLICY_PROVIDER:-none}" # calico
 NON_MASQUERADE_CIDR="0.0.0.0/0"

 # How should the kubelet configure hairpin mode?
-HAIRPIN_MODE="${HAIRPIN_MODE:-promiscuous-bridge}" # promiscuous-bridge, hairpin-veth, none
+HAIRPIN_MODE="${HAIRPIN_MODE:-hairpin-veth}" # promiscuous-bridge, hairpin-veth, none
 # Optional: if set to true, kube-up will configure the cluster to run e2e tests.
 E2E_STORAGE_TEST_ENVIRONMENT="${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false}"


--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -351,7 +351,7 @@ NETWORK_POLICY_PROVIDER="${NETWORK_POLICY_PROVIDER:-none}" # calico
 NON_MASQUERADE_CIDR="0.0.0.0/0"

 # How should the kubelet configure hairpin mode?
-HAIRPIN_MODE="${HAIRPIN_MODE:-promiscuous-bridge}" # promiscuous-bridge, hairpin-veth, none
+HAIRPIN_MODE="${HAIRPIN_MODE:-hairpin-veth}" # promiscuous-bridge, hairpin-veth, none

 # Optional: if set to true, kube-up will configure the cluster to run e2e tests.
 E2E_STORAGE_TEST_ENVIRONMENT=${KUBE_E2E_STORAGE_TEST_ENVIRONMENT:-false}