mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-11-03 23:40:03 +00:00 
			
		
		
		
	Merge pull request #103174 from Napsty/rancher-33360
Do not attempt to overwrite higher system (sysctl) values
This commit is contained in:
		@@ -96,7 +96,7 @@ func (realConntracker) setIntSysCtl(name string, value int) error {
 | 
				
			|||||||
	entry := "net/netfilter/" + name
 | 
						entry := "net/netfilter/" + name
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	sys := sysctl.New()
 | 
						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)
 | 
							klog.InfoS("Set sysctl", "entry", entry, "value", value)
 | 
				
			||||||
		if err := sys.SetSysctl(entry, value); err != nil {
 | 
							if err := sys.SetSysctl(entry, value); err != nil {
 | 
				
			||||||
			return err
 | 
								return err
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user