MINOR: add haproxy.Process to controller builder

Author: ivanmatmati

pkg/controller/builder.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/haproxytech/kubernetes-ingress/pkg/haproxy"
 	"github.com/haproxytech/kubernetes-ingress/pkg/haproxy/config"
+	"github.com/haproxytech/kubernetes-ingress/pkg/haproxy/process"
 	"github.com/haproxytech/kubernetes-ingress/pkg/ingress"
 	"github.com/haproxytech/kubernetes-ingress/pkg/k8s"
 	"github.com/haproxytech/kubernetes-ingress/pkg/store"
@@ -19,9 +20,10 @@ import (
 type Builder struct {
 	osArgs         utils.OSArgs
 	haproxyEnv     config.Env
+	haproxyProcess process.Process
+	haproxyCfgFile []byte
 	store          store.K8s
 	publishService *utils.NamespaceValue
-	haproxyCfgFile []byte
 	eventChan      chan k8s.SyncDataEvent
 	ingressChan    chan ingress.Sync
 }
@@ -44,6 +46,11 @@ func NewBuilder() *Builder {
 	return &Builder{haproxyEnv: defaultEnv}
 }
 
+func (builder *Builder) WithHAProxyProcess(process process.Process) *Builder {
+	builder.haproxyProcess = process
+	return builder
+}
+
 func (builder *Builder) WithEventChan(eventChan chan k8s.SyncDataEvent) *Builder {
 	builder.eventChan = eventChan
 	return builder
@@ -97,7 +104,7 @@ func (builder *Builder) Build() *HAProxyController {
 		}()
 	}
 
-	haproxy, err := haproxy.New(builder.osArgs, builder.haproxyEnv, builder.haproxyCfgFile)
+	haproxy, err := haproxy.New(builder.osArgs, builder.haproxyEnv, builder.haproxyCfgFile, builder.haproxyProcess)
 	logger.Panic(err)
 
 	prefix, errPrefix := utils.GetPodPrefix(os.Getenv("POD_NAME"))

pkg/haproxy/main.go

@@ -2,7 +2,6 @@ package haproxy
 
 import (
 	"fmt"
-	"os"
 	"os/exec"
 	"strings"
 
@@ -25,7 +24,7 @@ type HAProxy struct {
 	*config.Config
 }
 
-func New(osArgs utils.OSArgs, env config.Env, cfgFile []byte) (h HAProxy, err error) {
+func New(osArgs utils.OSArgs, env config.Env, cfgFile []byte, p process.Process) (h HAProxy, err error) {
 	err = (&env).Init(osArgs)
 	if err != nil {
 		err = fmt.Errorf("failed to initialize haproxy environment: %w", err)
@@ -50,16 +49,9 @@ func New(osArgs utils.OSArgs, env config.Env, cfgFile []byte) (h HAProxy, err er
 		err = fmt.Errorf("failed to initialize haproxy API client: %w", err)
 		return
 	}
-
-	if osArgs.UseWiths6Overlay {
-		h.Process = process.NewControlOverS6(h.Env, osArgs, h.HAProxyClient)
-	} else {
-		h.Process = process.NewDirectControl(h.Env, osArgs, h.HAProxyClient)
-		if _, err := os.Stat(h.AuxCFGFile); err == nil {
-			h.UseAuxFile(true)
-		}
+	if p == nil {
+		h.Process = process.New(h.Env, osArgs, h.AuxCFGFile, h.HAProxyClient)
 	}
-
 	if !osArgs.Test {
 		logVersion(h.Binary)
 	}

pkg/haproxy/process/direct-control.go

@@ -19,14 +19,6 @@ type directControl struct {
 	useAuxFile bool
 }
 
-func NewDirectControl(env config.Env, oSArgs utils.OSArgs, api api.HAProxyClient) Process {
-	return &directControl{
-		Env:    env,
-		OSArgs: oSArgs,
-		API:    api,
-	}
-}
-
 func (d *directControl) Service(action string) (err error) {
 	if d.OSArgs.Test {
 		logger.Infof("HAProxy would be %sed now", action)

pkg/haproxy/process/interface.go

@@ -7,15 +7,36 @@ import (
 	"syscall"
 
 	"github.com/haproxytech/kubernetes-ingress/pkg/haproxy/api"
+	"github.com/haproxytech/kubernetes-ingress/pkg/haproxy/config"
 	"github.com/haproxytech/kubernetes-ingress/pkg/utils"
 )
 
+var logger = utils.GetLogger()
+
 type Process interface {
 	Service(action string) (err error)
 	UseAuxFile(useAuxFile bool)
 }
 
-var logger = utils.GetLogger()
+func New(env config.Env, osArgs utils.OSArgs, auxCfgFile string, api api.HAProxyClient) (p Process) {
+	if osArgs.UseWiths6Overlay {
+		p = &s6Control{
+			Env:    env,
+			OSArgs: osArgs,
+			API:    api,
+		}
+	} else {
+		p = &directControl{
+			Env:    env,
+			OSArgs: osArgs,
+			API:    api,
+		}
+		if _, err := os.Stat(auxCfgFile); err == nil {
+			p.UseAuxFile(true)
+		}
+	}
+	return p
+}
 
 // Return HAProxy master process if it exists.
 func haproxyProcess(pidFile string) (*os.Process, error) {

pkg/haproxy/process/s6-overlay.go

@@ -16,14 +16,6 @@ type s6Control struct {
 	API    api.HAProxyClient
 }
 
-func NewControlOverS6(env config.Env, oSArgs utils.OSArgs, api api.HAProxyClient) Process {
-	return &s6Control{
-		Env:    env,
-		OSArgs: oSArgs,
-		API:    api,
-	}
-}
-
 func (d *s6Control) Service(action string) (err error) {
 	if d.OSArgs.Test {
 		logger.Infof("HAProxy would be %sed now", action)