BUG/MINOR: Fix backend runtime sync

This commit fixes following issue:

- A change in service targetPort was not reflected in server port definition for corresponding backend.
- When a change in service selector value results in an empty targets set, the backend kept its slots of servers instead of losing them.

Author: ivanmatmati

controller/haproxy/api/api.go

@@ -25,6 +25,7 @@ type HAProxyClient interface {
 	BackendServerCreate(backendName string, data models.Server) error
 	BackendServerEdit(backendName string, data models.Server) error
 	BackendServerDelete(backendName string, serverName string) error
+	BackendServersGet(backendName string) (models.Servers, error)
 	BackendSwitchingRuleCreate(frontend string, rule models.BackendSwitchingRule) error
 	BackendSwitchingRuleDeleteAll(frontend string)
 	DefaultsGetConfiguration() (*models.Defaults, error)

controller/haproxy/api/backend.go

@@ -107,3 +107,11 @@ func (c *clientNative) ServerGet(serverName, backendName string) (models.Server,
 	}
 	return *server, nil
 }
+
+func (c *clientNative) BackendServersGet(backendName string) (models.Servers, error) {
+	_, servers, err := c.nativeAPI.Configuration.GetServers(backendName, c.activeTransaction)
+	if err != nil {
+		return nil, err
+	}
+	return servers, nil
+}

controller/service/endpoints.go

@@ -31,6 +31,9 @@ func (s *SvcContext) HandleHAProxySrvs(client api.HAProxyClient, store store.K8s
 	backend, err := s.getRuntimeBackend(store)
 	if err != nil {
 		logger.Warningf("Ingress '%s/%s': %s", s.ingress.Namespace, s.ingress.Name, err)
+		if servers, _ := client.BackendServersGet(s.backend.Name); servers != nil {
+			client.BackendServerDeleteAll(s.backend.Name)
+		}
 		return
 	}
 	backend.Name = s.backend.Name // set backendName in store.PortEndpoints for runtime updates.

controller/store/events.go

@@ -225,29 +225,28 @@ func getEndpoints(slices map[string]*Endpoints) (endpoints map[string]PortEndpoi
 }
 
 func (k *K8s) EventEndpoints(ns *Namespace, data *Endpoints, syncHAproxySrvs func(backend *RuntimeBackend, portUpdated bool) error) (updateRequired bool) {
-	newEndpoints := data
-	oldEndpoints := ns.Endpoints[data.Service][data.SliceName]
-	if oldEndpoints.Equal(newEndpoints) {
-		return false
-	}
 	if _, ok := ns.Endpoints[data.Service]; !ok {
 		ns.Endpoints[data.Service] = make(map[string]*Endpoints)
 	}
-	ns.Endpoints[data.Service][data.SliceName] = newEndpoints
+	if endpoints, ok := ns.Endpoints[data.Service][data.SliceName]; ok {
+		if data.Status != DELETED && endpoints.Equal(data) {
+			return false
+		}
+	}
+	ns.Endpoints[data.Service][data.SliceName] = data
 
-	for portName, portEndpoints := range getEndpoints(ns.Endpoints[data.Service]) {
+	endpoints := getEndpoints(ns.Endpoints[data.Service])
+	_, ok := ns.HAProxyRuntime[data.Service]
+	if !ok || len(endpoints) == 0 {
+		ns.HAProxyRuntime[data.Service] = make(map[string]*RuntimeBackend)
+	}
+	for portName, portEndpoints := range endpoints {
 		newBackend := &RuntimeBackend{Endpoints: portEndpoints}
-		runtime, ok := ns.HAProxyRuntime[data.Service]
-		if !ok {
-			runtime = make(map[string]*RuntimeBackend)
-			ns.HAProxyRuntime[data.Service] = runtime
-		}
-		backend, ok := runtime[portName]
+		backend, ok := ns.HAProxyRuntime[data.Service][portName]
 		if ok {
 			portUpdated := (newBackend.Endpoints.Port != backend.Endpoints.Port)
 			newBackend.HAProxySrvs = backend.HAProxySrvs
 			newBackend.Name = backend.Name
-			newBackend.Endpoints.Port = backend.Endpoints.Port
 			logger.Warning(syncHAproxySrvs(newBackend, portUpdated))
 		}
 		ns.HAProxyRuntime[data.Service][portName] = newBackend

deploy/tests/e2e/endpoints/http_test.go

@@ -50,14 +50,13 @@ func (suite *EndpointsSuite) Test_HTTP_Reach() {
 					}()
 				}
 				switch replicas {
-				case 8:
+				case 8, 3:
 					// HAProxy reloaded due to scale up
 					pid = suite.getPID()
 				case 0:
 					if len(counter) > 0 {
 						return false
 					}
-					fallthrough
 				default:
 					if pid != suite.getPID() {
 						suite.Error(fmt.Errorf("Uncessary reload of HAproxy"))