Skip to content

Commit d1d1b97

Browse files
vgramermjuraga
authored andcommitted
MINOR: global: add no ktls option
Signed-off-by: Vincent Gramer <vgramer@haproxy.com>
1 parent f1b0b6d commit d1d1b97

12 files changed

Lines changed: 36 additions & 3 deletions

File tree

.aspell.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ allowed:
110110
- jwt
111111
- kasbin
112112
- kpi
113+
- ktls
113114
- kubebuilder
114115
- kubernetes
115116
- lifecycle

config-parser/section-parsers.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@ func (p *configParser) getGlobalParser() *Parsers { //nolint: maintidx
481481
addParser(parser, &sequence, &simple.Number{Name: "stress-level"})
482482
addParser(parser, &sequence, &simple.Word{Name: "shm-stats-file"})
483483
addParser(parser, &sequence, &simple.Number{Name: "shm-stats-file-max-objects"})
484+
addParser(parser, &sequence, &simple.Enabled{Name: "noktls"})
484485
// the ConfigSnippet must be at the end to parsers load order to ensure
485486
// the overloading of any option has been declared previously
486487
addParser(parser, &sequence, &parsers.ConfigSnippet{})

config-parser/tests/configs/haproxy.cfg.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ global
7575
dns-accept-family ipv4,ipv6
7676
shm-stats-file some_file
7777
shm-stats-file-max-objects 100
78+
noktls
7879
# random comment before snippet
7980
###_config-snippet_### BEGIN
8081
tune.ssl.default-dh-param 2048

configuration/global.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,15 @@ func parsePerformanceOptions(p parser.Parser) (*models.PerformanceOptions, error
385385
options.BusyPolling = busyPolling
386386
}
387387

388+
noktls, err := parseBoolOption(p, "noktls")
389+
if err != nil {
390+
return nil, err
391+
}
392+
if noktls {
393+
isEmpty = false
394+
options.Noktls = noktls
395+
}
396+
388397
maxSpreadChecks, err := parseTimeoutOption(p, "max-spread-checks")
389398
if err != nil {
390399
return nil, err
@@ -2998,6 +3007,10 @@ func serializePerformanceOptions(p parser.Parser, options *models.PerformanceOpt
29983007
return err
29993008
}
30003009

3010+
if err := serializeBoolOption(p, "noktls", options.Noktls); err != nil {
3011+
return err
3012+
}
3013+
30013014
if err := serializeTimeoutOption(p, "max-spread-checks", options.MaxSpreadChecks, configOptions); err != nil {
30023015
return err
30033016
}

models/performance_options.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/performance_options_compare_test.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/performanceoptions_diff_generated.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/performanceoptions_equal_generated.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

specification/build/haproxy_spec.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,6 +1371,9 @@ definitions:
13711371
nokqueue:
13721372
type: boolean
13731373
x-display-name: Disable the use of the "kqueue" event polling system on BSD
1374+
noktls:
1375+
type: boolean
1376+
x-display-name: Disables the use of ktls. It is equivalent to the command line argument "-dT"
13741377
nopoll:
13751378
type: boolean
13761379
x-display-name: Disable the use of the "poll" event polling system

specification/models/configuration/global.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,6 +1124,9 @@ performance_options:
11241124
properties:
11251125
busy_polling:
11261126
type: boolean
1127+
noktls:
1128+
type: boolean
1129+
x-display-name: Disables the use of ktls. It is equivalent to the command line argument "-dT"
11271130
max_spread_checks:
11281131
type: integer
11291132
minimum: 0

0 commit comments

Comments
 (0)