MINOR: remove default tune.ssl.default-dh-param

hdurand0710 · Gopher Bot · commit aa559c58cbbc · 2026-01-09T10:05:59.000Z
[WARNING]  (155) : config : parsing [/etc/haproxy/haproxy.cfg:16] : 'tune.ssl.default-dh-param' is not supported by AWS-LC 1.65.1, keyword ignored
diff --git a/pkg/controller/global.go b/pkg/controller/global.go
@@ -68,12 +68,7 @@ func (c *HAProxyController) globalCfg() {
 	}
 	if newGlobal == nil {
 		newGlobal = &models.Global{
-			GlobalBase: models.GlobalBase{
-				// TuneSslDefaultDhParam: 2048,
-				TuneSslOptions: &models.TuneSslOptions{
-					DefaultDhParam: 2048,
-				},
-			},
+			GlobalBase: models.GlobalBase{},
 		}
 		for _, a := range c.annotations.Global(newGlobal, &newLg) {
 			err = a.Process(c.store, c.store.ConfigMaps.Main.Annotations)
@@ -86,9 +81,6 @@ func (c *HAProxyController) globalCfg() {
 		newGlobal.TuneSslOptions = &models.TuneSslOptions{}
 	}
 
-	if newGlobal.TuneSslOptions.DefaultDhParam == 0 {
-		newGlobal.TuneSslOptions.DefaultDhParam = 2048
-	}
 	env.SetGlobal(newGlobal, &newLg, c.haproxy.Env)
 	diff := newGlobal.Diff(*global)
 	if len(diff) != 0 {
diff --git a/pkg/haproxy/env/defaults.go b/pkg/haproxy/env/defaults.go
@@ -31,14 +31,6 @@ func SetGlobal(global *models.Global, logTargets *models.LogTargets, env Env) {
 		global.StatsTimeout = utils.PtrInt64(36000)
 	}
 
-	// TuneSSL options
-	if global.TuneSslOptions == nil {
-		global.TuneSslOptions = &models.TuneSslOptions{}
-	}
-	if global.TuneSslOptions.DefaultDhParam == 0 {
-		global.TuneSslOptions.DefaultDhParam = 2048
-	}
-
 	// SSL options
 	if global.SslOptions == nil {
 		global.SslOptions = &models.SslOptions{}
