Merge pull request #54120 from m1093782566/fix-proxy-mode

Automatic merge from submit-queue (batch tested with PRs 54906, 54120, 54934, 54915, 54848). 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>. Fix kube-proxy fall back to iptables firstly when unable to load kernel modules **What this PR does / why we need it**: Fix kube-proxy fall back to iptables firstly when unable to load kernel modules **Which issue this PR fixes**: fixes #54121 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` /kind bug /sig network /area kube-proxy

Merge pull request #54120 from m1093782566/fix-proxy-mode
b006bc5d · Kubernetes Submit Queue · GitHub · 63cc6006 · ea930dbe · b006bc5d
Unverified Commit b006bc5d authored Nov 02, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

server_others.go cmd/kube-proxy/app/server_others.go +2 -2

No files found.
--- a/cmd/kube-proxy/app/server_others.go
+++ b/cmd/kube-proxy/app/server_others.go
@@ -275,8 +275,8 @@ func tryIPVSProxy(iptver iptables.IPTablesVersioner, kcompat iptables.KernelComp
 	// IPVS Proxier relies on iptables
 	useIPVSProxy, err := ipvs.CanUseIPVSProxier()
 	if err != nil {
-		utilruntime.HandleError(fmt.Errorf("can't determine whether to use ipvs proxy, using userspace proxier: %v", err))
-		return proxyModeUserspace
+		// Try to fallback to iptables before falling back to userspace
+		utilruntime.HandleError(fmt.Errorf("can't determine whether to use ipvs proxy, error: %v", err))
 	}
 	if useIPVSProxy {
 		return proxyModeIPVS