Skip to content

K
k3s
Commit da46d1cf authored by caiyixiang's avatar caiyixiang
Browse files
Options

correct a few spelling mistakes

parent 5658addb
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cmd/kube-proxy/app/server.go
View file @ da46d1cf
...@@ -383,17 +383,17 @@ func getConntrackMax(config *options.ProxyServerConfig) (int, error) { ...@@ -383,17 +383,17 @@ func getConntrackMax(config *options.ProxyServerConfig) (int, error) {
if config.ConntrackMaxPerCore > 0 { if config.ConntrackMaxPerCore > 0 {
return -1, fmt.Errorf("invalid config: ConntrackMax and ConntrackMaxPerCore are mutually exclusive") return -1, fmt.Errorf("invalid config: ConntrackMax and ConntrackMaxPerCore are mutually exclusive")
} }
glog.V(3).Infof("getConntrackMax: using absolute conntrax-max (deprecated)") glog.V(3).Infof("getConntrackMax: using absolute conntrack-max (deprecated)")
return int(config.ConntrackMax), nil return int(config.ConntrackMax), nil
} }
if config.ConntrackMaxPerCore > 0 { if config.ConntrackMaxPerCore > 0 {
floor := int(config.ConntrackMin) floor := int(config.ConntrackMin)
scaled := int(config.ConntrackMaxPerCore) * runtime.NumCPU() scaled := int(config.ConntrackMaxPerCore) * runtime.NumCPU()
if scaled > floor { if scaled > floor {
glog.V(3).Infof("getConntrackMax: using scaled conntrax-max-per-core") glog.V(3).Infof("getConntrackMax: using scaled conntrack-max-per-core")
return scaled, nil return scaled, nil
} }
glog.V(3).Infof("getConntrackMax: using conntrax-min") glog.V(3).Infof("getConntrackMax: using conntrack-min")
return floor, nil return floor, nil
} }
return 0, nil return 0, nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment