MINOR: uniform local peer management

deploy/tests/config/3.ingress-controller.yaml

@@ -68,6 +68,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP                   
 ---
 apiVersion: v1
 kind: Service

fs/usr/local/etc/haproxy/haproxy.cfg

@@ -23,7 +23,7 @@ defaults haproxytech
   timeout http-keep-alive 60000
 
 peers localinstance
-   peer local 127.0.0.1:10000
+
 
 frontend https
   mode http

pkg/controller/builder.go

@@ -177,6 +177,11 @@ func (builder *Builder) Build() *HAProxyController {
 	if updateStatusManager == nil {
 		updateStatusManager = status.New(builder.clientSet, builder.osArgs.IngressClass, builder.osArgs.EmptyIngressClass)
 	}
+	hostname, _ := os.Hostname()
+	podIP := utils.GetIP()
+	if podIP == "" {
+		podIP = "127.0.0.1"
+	}
 	return &HAProxyController{
 		osArgs:                   builder.osArgs,
 		haproxy:                  haproxy,
@@ -190,6 +195,8 @@ func (builder *Builder) Build() *HAProxyController {
 		gatewayManager:           gatewayManager,
 		updateStatusManager:      updateStatusManager,
 		prometheusMetricsManager: metrics.New(),
+		PodIP:                    podIP,
+		Hostname:                 hostname,
 	}
 }
 

pkg/controller/controller.go

@@ -57,6 +57,8 @@ type HAProxyController struct {
 	updateStatusManager      status.UpdateStatusManager
 	beforeUpdateHandlers     []UpdateHandler
 	prometheusMetricsManager metrics.PrometheusMetricsManager
+	PodIP                    string
+	Hostname                 string
 }
 
 // Wrapping a Native-Client transaction and commit it.
@@ -80,6 +82,15 @@ func (c *HAProxyController) clientAPIClosure(fn func() error) (err error) {
 
 // Start initializes and runs HAProxyController
 func (c *HAProxyController) Start() {
+	logger.Panic(c.clientAPIClosure(func() error {
+		return c.haproxy.PeerEntryCreateOrEdit("localinstance",
+			models.PeerEntry{
+				Name:    c.Hostname,
+				Address: &c.PodIP,
+				Port:    &c.osArgs.LocalPeerPort,
+			},
+		)
+	}))
 	c.initHandlers()
 	logger.Error(c.setupHAProxyRules())
 	logger.Error(os.Chdir(c.haproxy.Env.CfgDir))
@@ -231,17 +242,6 @@ func (c *HAProxyController) setToReady() {
 		}))
 	}
 
-	logger.Panic(c.clientAPIClosure(func() error {
-		ip := "127.0.0.1"
-		return c.haproxy.PeerEntryEdit("localinstance",
-			models.PeerEntry{
-				Name:    "local",
-				Address: &ip,
-				Port:    &c.osArgs.LocalPeerPort,
-			},
-		)
-	}))
-
 	logger.Panic(c.clientAPIClosure(func() error {
 		return c.haproxy.FrontendBindCreate("stats",
 			models.Bind{

pkg/haproxy/api/api.go

@@ -67,6 +67,7 @@ type HAProxyClient interface { //nolint:interfacebloat
 	GlobalCfgSnippet(snippet []string) error
 	GetMap(mapFile string) (*models.Map, error)
 	PeerEntryEdit(peerSection string, peer models.PeerEntry) error
+	PeerEntryCreateOrEdit(peerSection string, peer models.PeerEntry) error
 	RefreshBackends() (deleted []string, err error)
 	SetMapContent(mapFile string, payload []string) error
 	SetServerAddrAndState([]RuntimeServerData) error

pkg/haproxy/api/frontend.go

@@ -242,3 +242,16 @@ func (c *clientNative) PeerEntryEdit(peerSection string, peerEntry models.PeerEn
 	c.activeTransactionHasChanges = true
 	return configuration.EditPeerEntry(peerEntry.Name, peerSection, &peerEntry, c.activeTransaction, 0)
 }
+
+func (c *clientNative) PeerEntryCreateOrEdit(peerSection string, peerEntry models.PeerEntry) error {
+	configuration, err := c.nativeAPI.Configuration()
+	if err != nil {
+		return err
+	}
+	c.activeTransactionHasChanges = true
+	err = configuration.EditPeerEntry(peerEntry.Name, peerSection, &peerEntry, c.activeTransaction, 0)
+	if err != nil {
+		err = configuration.CreatePeerEntry(peerSection, &peerEntry, c.activeTransaction, 0)
+	}
+	return err
+}

pkg/haproxy/env/defaults.go

@@ -11,7 +11,6 @@ func SetGlobal(global *models.Global, logTargets *models.LogTargets, env Env) {
 	// Enforced values
 	global.MasterWorker = true
 	global.Pidfile = env.PIDFile
-	global.Localpeer = "local"
 	runtimeAPIs := []*models.RuntimeAPI{}
 	if env.RuntimeSocket != "" {
 		runtimeAPIs = append(runtimeAPIs, &models.RuntimeAPI{

pkg/utils/utils.go

@@ -214,3 +214,7 @@ func PointerIfNotDefault[T comparable](arg T) *T {
 	}
 	return nil
 }
+
+func GetIP() string {
+	return os.Getenv("POD_IP")
+}