REORG/MEDIUM: Process ActiveBackends in haproxy.api package

Author: Mo3m3n

pkg/controller/handler.go

@@ -50,7 +50,6 @@ func (c *HAProxyController) initHandlers() {
 			AddrIPv6: c.osArgs.IPV6BindAddr,
 		},
 		&handler.PatternFiles{},
-		handler.Refresh{},
 	}
 	if c.osArgs.PprofEnabled {
 		c.updateHandlers = append(c.updateHandlers, handler.Pprof{})

pkg/handler/https.go

@@ -173,8 +173,9 @@ func (handler HTTPS) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annota
 	}
 	// ssl-passthrough
 	_, errFtSSL := h.FrontendGet(h.FrontSSL)
+	_, errBdSSL := h.BackendGet(h.BackSSL)
 	if h.SSLPassthrough {
-		if errFtSSL != nil {
+		if errFtSSL != nil || errBdSSL != nil {
 			logger.Error(handler.enableSSLPassthrough(h))
 			h.SSLPassthrough = true
 			reload = true

pkg/handler/pprof.go

@@ -57,7 +57,6 @@ func (handler Pprof) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annota
 	if err != nil {
 		return
 	}
-	h.ActiveBackends[pprofBackend] = struct{}{}
 	reload = true
 	return
 }

pkg/haproxy/api/api.go

@@ -52,6 +52,7 @@ type HAProxyClient interface {
 	GlobalPushConfiguration(models.Global) error
 	GlobalCfgSnippet(snippet []string) error
 	GetMap(mapFile string) (*models.Map, error)
+	RefreshBackends() (deleted []string, err error)
 	SetMapContent(mapFile string, payload string) error
 	SetServerAddr(backendName string, serverName string, ip string, port int) error
 	SetServerState(backendName string, serverName string, state string) error
@@ -65,6 +66,7 @@ type HAProxyClient interface {
 
 type clientNative struct {
 	nativeAPI                   clientnative.HAProxyClient
+	activeBackends              map[string]struct{}
 	activeTransaction           string
 	activeTransactionHasChanges bool
 }
@@ -100,6 +102,7 @@ func New(transactionDir, configFile, programPath, runtimeSocket string) (client
 			Configuration: &confClient,
 			Runtime:       &runtimeClient,
 		},
+		activeBackends: make(map[string]struct{}),
 	}
 	return &cn, nil
 }

pkg/haproxy/api/backend.go

@@ -1,6 +1,8 @@
 package api
 
 import (
+	"fmt"
+
 	"github.com/haproxytech/client-native/v2/models"
 	"github.com/haproxytech/config-parser/v4/types"
 )
@@ -15,12 +17,18 @@ func (c *clientNative) BackendGet(backendName string) (*models.Backend, error) {
 	if err != nil {
 		return nil, err
 	}
+	c.activeBackends[backend.Name] = struct{}{}
 	return backend, nil
 }
 
 func (c *clientNative) BackendCreate(backend models.Backend) error {
 	c.activeTransactionHasChanges = true
-	return c.nativeAPI.Configuration.CreateBackend(&backend, c.activeTransaction, 0)
+	err := c.nativeAPI.Configuration.CreateBackend(&backend, c.activeTransaction, 0)
+	if err != nil {
+		return err
+	}
+	c.activeBackends[backend.Name] = struct{}{}
+	return nil
 }
 
 func (c *clientNative) BackendEdit(backend models.Backend) error {
@@ -115,3 +123,21 @@ func (c *clientNative) BackendServersGet(backendName string) (models.Servers, er
 	}
 	return servers, nil
 }
+
+func (c *clientNative) RefreshBackends() (deleted []string, err error) {
+	backends, errAPI := c.BackendsGet()
+	if errAPI != nil {
+		err = fmt.Errorf("unable to get configured backends")
+		return
+	}
+	for _, backend := range backends {
+		if _, ok := c.activeBackends[backend.Name]; !ok {
+			if err = c.BackendDelete(backend.Name); err != nil {
+				return
+			}
+			deleted = append(deleted, backend.Name)
+		}
+	}
+	c.activeBackends = map[string]struct{}{}
+	return
+}

pkg/haproxy/config/main.go

@@ -12,11 +12,9 @@ type Config struct {
 	maps.Maps
 	rules.Rules
 	certs.Certificates
-	ActiveBackends  map[string]struct{}
-	RateLimitTables []string
-	HTTPS           bool
-	SSLPassthrough  bool
-	AuxCfgModTime   int64
+	HTTPS          bool
+	SSLPassthrough bool
+	AuxCfgModTime  int64
 }
 
 // Init initializes HAProxy structs
@@ -35,16 +33,13 @@ func New(env Env, rules rules.Rules) (cfg *Config, err error) {
 		return
 	}
 	cfg.Rules = rules
-	cfg.ActiveBackends = make(map[string]struct{})
 	return
 }
 
 // Clean cleans all the statuses of various data that was changed
 // deletes them completely or just resets them if needed
 func (cfg *Config) Clean() {
 	cfg.SSLPassthrough = false
-	cfg.RateLimitTables = []string{}
-	cfg.ActiveBackends = make(map[string]struct{})
 	cfg.CleanMaps()
 	cfg.CleanCerts()
 	cfg.CleanRules()

pkg/haproxy/main.go

@@ -70,25 +70,11 @@ func (h *HAProxy) Refresh(cleanCrts bool) (reload bool, err error) {
 	// Maps
 	reload = h.RefreshMaps(h.HAProxyClient) || reload
 	// Backends
-	if h.SSLPassthrough {
-		h.ActiveBackends[h.BackSSL] = struct{}{}
-	}
-	for _, rateLimitTable := range h.RateLimitTables {
-		h.ActiveBackends[rateLimitTable] = struct{}{}
-	}
-	backends, errAPI := h.BackendsGet()
-	if errAPI != nil {
-		err = fmt.Errorf("unable to get configured backends")
-		return
-	}
-	for _, backend := range backends {
-		if _, ok := h.ActiveBackends[backend.Name]; !ok {
-			logger.Debugf("Deleting backend '%s'", backend.Name)
-			if err := h.BackendDelete(backend.Name); err != nil {
-				logger.Panic(err)
-			}
-			annotations.RemoveBackendCfgSnippet(backend.Name)
-		}
+	deleted, err := h.RefreshBackends()
+	logger.Error(err)
+	for _, backend := range deleted {
+		logger.Debugf("Backend '%s' deleted", backend)
+		annotations.RemoveBackendCfgSnippet(backend)
 	}
 	return
 }

pkg/ingress/ingress.go

@@ -128,7 +128,6 @@ func (i *Ingress) handlePath(k store.K8s, h haproxy.HAProxy, host string, path *
 	if err != nil {
 		return
 	}
-	h.ActiveBackends[backendName] = struct{}{}
 	// Endpoints
 	endpointsReload := svc.HandleHAProxySrvs(k, h)
 	return backendReload || endpointsReload || routeReload, err
@@ -180,9 +179,6 @@ func addRules(list rules.List, h haproxy.HAProxy, ingressRule bool) []rules.Rule
 			if h.SSLPassthrough {
 				frontends = []string{h.FrontHTTP, h.FrontSSL}
 			}
-		case rules.REQ_RATELIMIT:
-			limitRule := rule.(*rules.ReqRateLimit)
-			h.RateLimitTables = append(h.RateLimitTables, limitRule.TableName)
 		}
 		for _, frontend := range frontends {
 			logger.Error(h.AddRule(frontend, rule, ingressRule))

pkg/service/service.go

@@ -214,7 +214,6 @@ func (s *Service) SetDefaultBackend(k store.K8s, h haproxy.HAProxy, frontends []
 			ftReload = true
 		}
 	}
-	h.ActiveBackends[backendName] = struct{}{}
 	endpointsReload := s.HandleHAProxySrvs(k, h)
 	reload = bdReload || ftReload || endpointsReload
 	return reload, err