BUG: SslDefaultDhParam should get default value if needed

ivanmatmati · oktalz · commit a78d3d156ae8 · 2024-06-03T07:38:15.000Z
diff --git a/pkg/controller/global.go b/pkg/controller/global.go
@@ -81,10 +81,10 @@ func (c *HAProxyController) globalCfg() {
 	}
 	if newGlobal.TuneOptions == nil {
 		newGlobal.TuneOptions = &models.GlobalTuneOptions{}
+	}
 
-		if newGlobal.TuneSslDefaultDhParam == 0 {
-			newGlobal.TuneOptions.SslDefaultDhParam = 2048
-		}
+	if newGlobal.TuneSslDefaultDhParam == 0 {
+		newGlobal.TuneOptions.SslDefaultDhParam = 2048
 	}
 	env.SetGlobal(newGlobal, &newLg, c.haproxy.Env)
 	diff := newGlobal.Diff(*global)

Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,10 @@ func (c *HAProxyController) globalCfg() {`
`81`	`81`	`}`
`82`	`82`	`if newGlobal.TuneOptions == nil {`
`83`	`83`	`newGlobal.TuneOptions = &models.GlobalTuneOptions{}`
	`84`	`+ }`
`84`	`85`
`85`		`- if newGlobal.TuneSslDefaultDhParam == 0 {`
`86`		`- newGlobal.TuneOptions.SslDefaultDhParam = 2048`
`87`		`- }`
	`86`	`+ if newGlobal.TuneSslDefaultDhParam == 0 {`
	`87`	`+ newGlobal.TuneOptions.SslDefaultDhParam = 2048`
`88`	`88`	`}`
`89`	`89`	`env.SetGlobal(newGlobal, &newLg, c.haproxy.Env)`
`90`	`90`	`diff := newGlobal.Diff(*global)`