daemon: add BackendSlot to Service6Key.String and Service4Key.String

[ upstream commit ecf6ff1 ] This commit adds BackendSlot value to the Service6Key.String and Service4Key.String methods. This is to prevent the service key from being deleted when the backend endpoint is deleted. Fixes: #29580 Signed-off-by: xyz-li <[email protected]> Signed-off-by: Nicolas Busseneau <[email protected]>
cilium · Apr 11, 2024 · 8ac2eb0 · 8ac2eb0
1 parent f85ba09
commit 8ac2eb0
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/pkg/maps/lbmap/ipv4.go b/pkg/maps/lbmap/ipv4.go
@@ -253,6 +253,7 @@ func (k *Service4Key) String() string {
 	if kHost.Scope == loadbalancer.ScopeInternal {
 		addr += "/i"
 	}
+	addr = fmt.Sprintf("%s (%d)", addr, kHost.BackendSlot)
 	return addr
 }
 

diff --git a/pkg/maps/lbmap/ipv6.go b/pkg/maps/lbmap/ipv6.go
@@ -149,9 +149,9 @@ func NewService6Key(ip net.IP, port uint16, proto u8proto.U8proto, scope uint8,
 func (k *Service6Key) String() string {
 	kHost := k.ToHost().(*Service6Key)
 	if kHost.Scope == loadbalancer.ScopeInternal {
-		return fmt.Sprintf("[%s]:%d/i", kHost.Address, kHost.Port)
+		return fmt.Sprintf("[%s]:%d/i (%d)", kHost.Address, kHost.Port, kHost.BackendSlot)
 	} else {
-		return fmt.Sprintf("[%s]:%d", kHost.Address, kHost.Port)
+		return fmt.Sprintf("[%s]:%d (%d)", kHost.Address, kHost.Port, kHost.BackendSlot)
 	}
 }
 

diff --git a/test/helpers/kubectl.go b/test/helpers/kubectl.go
@@ -1893,8 +1893,7 @@ func (kub *Kubectl) validateServicePlumbingInCiliumPod(fullName, ciliumPod strin
 		return fmt.Errorf("unable to validate cilium service by running '%s': %s", cmd, res.OutputPrettyPrint())
 	}
 
-	var lbMap map[string][]string
-	err = res.Unmarshal(&lbMap)
+	lbMap, err := parseLBList(res)
 	if err != nil {
 		return fmt.Errorf("unable to unmarshal cilium bpf lb list output: %s", err)
 	}
@@ -4013,16 +4012,42 @@ func (kub *Kubectl) fillServiceCache() error {
 			return err
 		}
 
-		err = ciliumLbRes.Unmarshal(&podCache.loadBalancers)
+		lbMap, err := parseLBList(ciliumLbRes)
 		if err != nil {
 			return fmt.Errorf("Unable to unmarshal Cilium bpf lb list: %s", err.Error())
 		}
+
+		podCache.loadBalancers = lbMap
 		cache.pods = append(cache.pods, podCache)
 	}
 	kub.serviceCache = &cache
 	return nil
 }
 
+func parseLBList(res *CmdRes) (map[string][]string, error) {
+	var resMap map[string][]string
+	err := res.Unmarshal(&resMap)
+	if err != nil {
+		return nil, err
+	}
+	// A service for example:
+	// 10.96.0.10:9153 (1)      10.0.1.251:9153 (7) (1)
+	// 172.18.0.4:32686/i (1)   10.0.0.179:69 (32) (1)
+	lbMap := make(map[string][]string)
+	for frontend, backends := range resMap {
+		// strip the space and parentheses
+		index := strings.Index(frontend, " ")
+		if index > 0 {
+			frontend = frontend[:index]
+		}
+		if len(backends) > 0 {
+			lbMap[frontend] = append(lbMap[frontend], backends...)
+		}
+	}
+
+	return lbMap, nil
+}
+
 // KubeDNSPreFlightCheck makes sure that kube-dns is plumbed into Cilium.
 func (kub *Kubectl) KubeDNSPreFlightCheck() error {
 	var dnsErr error