MINOR: add HAProxyClient to controller builder

Author: ivanmatmati

pkg/controller/builder.go

@@ -9,6 +9,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
 	"github.com/haproxytech/kubernetes-ingress/pkg/haproxy"
+	"github.com/haproxytech/kubernetes-ingress/pkg/haproxy/api"
 	"github.com/haproxytech/kubernetes-ingress/pkg/haproxy/config"
 	"github.com/haproxytech/kubernetes-ingress/pkg/haproxy/process"
 	"github.com/haproxytech/kubernetes-ingress/pkg/ingress"
@@ -19,6 +20,7 @@ import (
 
 type Builder struct {
 	osArgs         utils.OSArgs
+	haproxyClient  api.HAProxyClient
 	haproxyEnv     config.Env
 	haproxyProcess process.Process
 	haproxyCfgFile []byte
@@ -51,6 +53,11 @@ func (builder *Builder) WithHAProxyProcess(process process.Process) *Builder {
 	return builder
 }
 
+func (builder *Builder) WithHaproxyClient(haproxyClient api.HAProxyClient) *Builder {
+	builder.haproxyClient = haproxyClient
+	return builder
+}
+
 func (builder *Builder) WithEventChan(eventChan chan k8s.SyncDataEvent) *Builder {
 	builder.eventChan = eventChan
 	return builder
@@ -104,7 +111,7 @@ func (builder *Builder) Build() *HAProxyController {
 		}()
 	}
 
-	haproxy, err := haproxy.New(builder.osArgs, builder.haproxyEnv, builder.haproxyCfgFile, builder.haproxyProcess)
+	haproxy, err := haproxy.New(builder.osArgs, builder.haproxyEnv, builder.haproxyCfgFile, builder.haproxyProcess, builder.haproxyClient)
 	logger.Panic(err)
 
 	prefix, errPrefix := utils.GetPodPrefix(os.Getenv("POD_NAME"))

pkg/haproxy/main.go

@@ -24,7 +24,7 @@ type HAProxy struct {
 	*config.Config
 }
 
-func New(osArgs utils.OSArgs, env config.Env, cfgFile []byte, p process.Process) (h HAProxy, err error) {
+func New(osArgs utils.OSArgs, env config.Env, cfgFile []byte, p process.Process, client api.HAProxyClient) (h HAProxy, err error) {
 	err = (&env).Init(osArgs)
 	if err != nil {
 		err = fmt.Errorf("failed to initialize haproxy environment: %w", err)
@@ -43,11 +43,12 @@ func New(osArgs utils.OSArgs, env config.Env, cfgFile []byte, p process.Process)
 		err = fmt.Errorf("failed to initialize haproxy config state: %w", err)
 		return
 	}
-
-	h.HAProxyClient, err = api.New(h.CfgDir, h.MainCFGFile, h.Binary, h.RuntimeSocket)
-	if err != nil {
-		err = fmt.Errorf("failed to initialize haproxy API client: %w", err)
-		return
+	if client == nil {
+		h.HAProxyClient, err = api.New(h.CfgDir, h.MainCFGFile, h.Binary, h.RuntimeSocket)
+		if err != nil {
+			err = fmt.Errorf("failed to initialize haproxy API client: %w", err)
+			return
+		}
 	}
 	if p == nil {
 		h.Process = process.New(h.Env, osArgs, h.AuxCFGFile, h.HAProxyClient)