Skip to content

Commit 0bea8ca

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#37793 from caiyixiang/proxy
Automatic merge from submit-queue (batch tested with PRs 37066, 37793) correct a few spelling mistakes
2 parents 433c6be + da46d1c commit 0bea8ca

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cmd/kube-proxy/app/server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,17 +383,17 @@ func getConntrackMax(config *options.ProxyServerConfig) (int, error) {
383383
if config.ConntrackMaxPerCore > 0 {
384384
return -1, fmt.Errorf("invalid config: ConntrackMax and ConntrackMaxPerCore are mutually exclusive")
385385
}
386-
glog.V(3).Infof("getConntrackMax: using absolute conntrax-max (deprecated)")
386+
glog.V(3).Infof("getConntrackMax: using absolute conntrack-max (deprecated)")
387387
return int(config.ConntrackMax), nil
388388
}
389389
if config.ConntrackMaxPerCore > 0 {
390390
floor := int(config.ConntrackMin)
391391
scaled := int(config.ConntrackMaxPerCore) * runtime.NumCPU()
392392
if scaled > floor {
393-
glog.V(3).Infof("getConntrackMax: using scaled conntrax-max-per-core")
393+
glog.V(3).Infof("getConntrackMax: using scaled conntrack-max-per-core")
394394
return scaled, nil
395395
}
396-
glog.V(3).Infof("getConntrackMax: using conntrax-min")
396+
glog.V(3).Infof("getConntrackMax: using conntrack-min")
397397
return floor, nil
398398
}
399399
return 0, nil

0 commit comments

Comments
 (0)