github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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).
This commit is contained in:
Kubernetes Submit Queue 2016-09-11 01:11:42 -07:00 committed by GitHub
commit e0d7425b11
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kube-proxy/app/server.go
View File

@ -391,7 +391,6 @@ func getProxyMode(proxyMode string, client nodeGetter, hostname string, iptver i
} }
func tryIPTablesProxy(iptver iptables.IPTablesVersioner, kcompat iptables.KernelCompatTester) string { func tryIPTablesProxy(iptver iptables.IPTablesVersioner, kcompat iptables.KernelCompatTester) string {
var err error
// guaranteed false on error, error only necessary for debugging // guaranteed false on error, error only necessary for debugging
useIPTablesProxy, err := iptables.CanUseIPTablesProxier(iptver, kcompat) useIPTablesProxy, err := iptables.CanUseIPTablesProxier(iptver, kcompat)
if err != nil { if err != nil {
@ -402,7 +401,7 @@ func tryIPTablesProxy(iptver iptables.IPTablesVersioner, kcompat iptables.Kernel
return proxyModeIPTables return proxyModeIPTables
} }
// Fallback. // 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 return proxyModeUserspace
} }