BUG: provide certificates handler for default local service

ivanmatmati · oktalz · commit b536263ca646 · 2024-11-21T12:43:21.000Z
diff --git a/pkg/controller/global.go b/pkg/controller/global.go
@@ -168,7 +168,7 @@ func (c *HAProxyController) handleDefaultService() {
 		SvcName:          name,
 		IsDefaultBackend: true,
 	}
-	if svc, err = service.New(c.store, ingressPath, nil, false, nil, c.store.ConfigMaps.Main.Annotations); err == nil {
+	if svc, err = service.New(c.store, ingressPath, c.haproxy.Certificates, false, nil, c.store.ConfigMaps.Main.Annotations); err == nil {
 		err = svc.SetDefaultBackend(c.store, c.haproxy, []string{c.haproxy.FrontHTTP, c.haproxy.FrontHTTPS}, c.annotations)
 	}
 	if err != nil {
@@ -238,7 +238,7 @@ func (c *HAProxyController) handleDefaultLocalService() {
 		IsDefaultBackend: true,
 	}
 
-	if svc, err = service.New(c.store, ingressPath, nil, false, nil, c.store.ConfigMaps.Main.Annotations); err == nil {
+	if svc, err = service.New(c.store, ingressPath, c.haproxy.Certificates, false, nil, c.store.ConfigMaps.Main.Annotations); err == nil {
 		err = svc.SetDefaultBackend(c.store, c.haproxy, []string{c.haproxy.FrontHTTP, c.haproxy.FrontHTTPS}, c.annotations)
 	}
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ func (c *HAProxyController) handleDefaultService() {`
`168`	`168`	`SvcName: name,`
`169`	`169`	`IsDefaultBackend: true,`
`170`	`170`	`}`
`171`		`- if svc, err = service.New(c.store, ingressPath, nil, false, nil, c.store.ConfigMaps.Main.Annotations); err == nil {`
	`171`	`+ if svc, err = service.New(c.store, ingressPath, c.haproxy.Certificates, false, nil, c.store.ConfigMaps.Main.Annotations); err == nil {`
`172`	`172`	`err = svc.SetDefaultBackend(c.store, c.haproxy, []string{c.haproxy.FrontHTTP, c.haproxy.FrontHTTPS}, c.annotations)`
`173`	`173`	`}`
`174`	`174`	`if err != nil {`
`@@ -238,7 +238,7 @@ func (c *HAProxyController) handleDefaultLocalService() {`
`238`	`238`	`IsDefaultBackend: true,`
`239`	`239`	`}`
`240`	`240`
`241`		`- if svc, err = service.New(c.store, ingressPath, nil, false, nil, c.store.ConfigMaps.Main.Annotations); err == nil {`
	`241`	`+ if svc, err = service.New(c.store, ingressPath, c.haproxy.Certificates, false, nil, c.store.ConfigMaps.Main.Annotations); err == nil {`
`242`	`242`	`err = svc.SetDefaultBackend(c.store, c.haproxy, []string{c.haproxy.FrontHTTP, c.haproxy.FrontHTTPS}, c.annotations)`
`243`	`243`	`}`
`244`	`244`	`if err != nil {`