Merge pull request #48085 from shyamjvs/reduce-kubeproxy-logs

Automatic merge from submit-queue (batch tested with PRs 44058, 48085, 48077, 48076, 47823) Move iptables logging in kubeproxy from Errorf to V(2).Infof Fixes https://github.com/kubernetes/kubernetes/issues/48052 This will stop fluentd from OOM'ing in reasonably large clusters with services due to kube-proxy. You'll still get iptables printed on setups which run at >= v2, but we can at least optout. @bowei Does this look reasonable? cc @kubernetes/sig-network-misc

Merge pull request #48085 from shyamjvs/reduce-kubeproxy-logs
a3df4bf7 · Kubernetes Submit Queue · GitHub · 6a28658c · d354e0bf · a3df4bf7
Commit a3df4bf7 authored Jun 26, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 26, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

proxier.go pkg/proxy/iptables/proxier.go +2 -1

No files found.
--- a/pkg/proxy/iptables/proxier.go
+++ b/pkg/proxy/iptables/proxier.go
@@ -1571,7 +1571,8 @@ func (proxier *Proxier) syncProxyRules() {
 	glog.V(5).Infof("Restoring iptables rules: %s", proxier.iptablesData.Bytes())
 	err = proxier.iptables.RestoreAll(proxier.iptablesData.Bytes(), utiliptables.NoFlushTables, utiliptables.RestoreCounters)
 	if err != nil {
-		glog.Errorf("Failed to execute iptables-restore: %v\nRules:\n%s", err, proxier.iptablesData.Bytes())
+		glog.Errorf("Failed to execute iptables-restore: %v", err)
+		glog.V(2).Infof("Rules:\n%s", proxier.iptablesData.Bytes())
 		// Revert new local ports.
 		revertPorts(replacementPortsMap, proxier.portsMap)
 		return