github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
pull/6/head
Kubernetes Submit Queue 2017-06-26 15:29:27 -07:00 committed by GitHub
parent 6a28658ca1 d354e0bf4f
commit a3df4bf764
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/proxy/iptables/proxier.go
View File

@ -1571,7 +1571,8 @@ func (proxier *Proxier) syncProxyRules() {
glog.V(5).Infof("Restoring iptables rules: %s", proxier.iptablesData.Bytes()) glog.V(5).Infof("Restoring iptables rules: %s", proxier.iptablesData.Bytes())
err = proxier.iptables.RestoreAll(proxier.iptablesData.Bytes(), utiliptables.NoFlushTables, utiliptables.RestoreCounters) err = proxier.iptables.RestoreAll(proxier.iptablesData.Bytes(), utiliptables.NoFlushTables, utiliptables.RestoreCounters)
if err != nil { 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. // Revert new local ports.
revertPorts(replacementPortsMap, proxier.portsMap) revertPorts(replacementPortsMap, proxier.portsMap)
return return