Merge pull request #103174 from Napsty/rancher-33360

Do not attempt to overwrite higher system (sysctl) values
This commit is contained in:
Kubernetes Prow Robot 2021-09-16 16:11:33 -07:00 committed by GitHub
commit 16823fceb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -96,7 +96,7 @@ func (realConntracker) setIntSysCtl(name string, value int) error {
entry := "net/netfilter/" + name
sys := sysctl.New()
if val, _ := sys.GetSysctl(entry); val != value {
if val, _ := sys.GetSysctl(entry); val != value && val < value {
klog.InfoS("Set sysctl", "entry", entry, "value", value)
if err := sys.SetSysctl(entry, value); err != nil {
return err