Merge pull request #32101 from ping035627/ping035627-patch-0906

Automatic merge from submit-queue Delete empty value in the log When err isn't nil, it has printed log and returned, so it needn't to print err to the log later (it's nil).

Merge pull request #32101 from ping035627/ping035627-patch-0906
e0d7425b · Kubernetes Submit Queue · GitHub · 4e509606 · 3bce910d · e0d7425b
Commit e0d7425b authored Sep 11, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

server.go cmd/kube-proxy/app/server.go +1 -2

No files found.
--- a/cmd/kube-proxy/app/server.go
+++ b/cmd/kube-proxy/app/server.go
@@ -391,7 +391,6 @@ func getProxyMode(proxyMode string, client nodeGetter, hostname string, iptver i
 }

 func tryIPTablesProxy(iptver iptables.IPTablesVersioner, kcompat iptables.KernelCompatTester) string {
-	var err error
 	// guaranteed false on error, error only necessary for debugging
 	useIPTablesProxy, err := iptables.CanUseIPTablesProxier(iptver, kcompat)
 	if err != nil {
@@ -402,7 +401,7 @@ func tryIPTablesProxy(iptver iptables.IPTablesVersioner, kcompat iptables.Kernel
 		return proxyModeIPTables
 	}
 	// Fallback.
-	glog.V(1).Infof("Can't use iptables proxy, using userspace proxier: %v", err)
+	glog.V(1).Infof("Can't use iptables proxy, using userspace proxier")
 	return proxyModeUserspace
 }