From 61491cbd291bdc962b98809fe68a178f51993fd1 Mon Sep 17 00:00:00 2001
From: Gilberto Bertin <jibi@cilium.io>
Date: Tue, 23 May 2023 23:11:53 +0200
Subject: [PATCH] check: make (Service)Address() return an IP address

change the Address method to return an IP address when available (i.e.
when ClusterIP is not empty, which happens in case of headless services)
instead of just returning the service name.

In case the IP family is set to any, this method will keep returning the
service name.

Signed-off-by: Gilberto Bertin <jibi@cilium.io>
---
 connectivity/check/peer.go | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/connectivity/check/peer.go b/connectivity/check/peer.go
index d4e2d6eefe..981d4dee78 100644
--- a/connectivity/check/peer.go
+++ b/connectivity/check/peer.go
@@ -10,6 +10,7 @@ import (
 
 	ciliumv2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2"
 	corev1 "k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 
 	"github.com/cilium/cilium-cli/k8s"
 )
@@ -152,8 +153,30 @@ func (s Service) Path() string {
 }
 
 // Address returns the network address of the Service.
-func (s Service) Address(IPFamily) string {
-	return s.Service.Name
+func (s Service) Address(family IPFamily) string {
+	// If the cluster IP is empty (headless service case) or the IP family is set to any, return the service name
+	if s.Service.Spec.ClusterIP == "" || family == IPFamilyAny {
+		return s.Service.Name
+	}
+
+	getClusterIPForIPFamily := func(family v1.IPFamily) string {
+		for i, f := range s.Service.Spec.IPFamilies {
+			if f == family {
+				return s.Service.Spec.ClusterIPs[i]
+			}
+		}
+
+		return ""
+	}
+
+	switch family {
+	case IPFamilyV4:
+		return getClusterIPForIPFamily(v1.IPv4Protocol)
+	case IPFamilyV6:
+		return getClusterIPForIPFamily(v1.IPv6Protocol)
+	}
+
+	return ""
 }
 
 // Port returns the first port of the Service.