Merge pull request kubernetes#82521 from viviyww/master12

k8s-ci-robot · web-flow · commit 3ae81af18334 · 2019-09-12T19:18:30.000-07:00
Modify the log of kube-proxy
diff --git a/cmd/kube-proxy/app/server_others.go b/cmd/kube-proxy/app/server_others.go
@@ -326,7 +326,7 @@ func getProxyMode(proxyMode string, khandle ipvs.KernelHandler, ipsetver ipvs.IP
 	case proxyModeIPVS:
 		return tryIPVSProxy(khandle, ipsetver, kcompat)
 	}
-	klog.Warningf("Flag proxy-mode=%q unknown, assuming iptables proxy", proxyMode)
+	klog.Warningf("Unknown proxy mode %q, assuming iptables proxy", proxyMode)
 	return tryIPTablesProxy(kcompat)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ func getProxyMode(proxyMode string, khandle ipvs.KernelHandler, ipsetver ipvs.IP`
`326`	`326`	`case proxyModeIPVS:`
`327`	`327`	`return tryIPVSProxy(khandle, ipsetver, kcompat)`
`328`	`328`	`}`
`329`		`- klog.Warningf("Flag proxy-mode=%q unknown, assuming iptables proxy", proxyMode)`
	`329`	`+ klog.Warningf("Unknown proxy mode %q, assuming iptables proxy", proxyMode)`
`330`	`330`	`return tryIPTablesProxy(kcompat)`
`331`	`331`	`}`
`332`	`332`