Return slice from GetIPFamilies instead of fixed-sized array

...since it could have 0, 1, or 2 elements otherwise it will have empty string values for element indices that aren't specifically set (so currently it returns ["4", ""]). Signed-off-by: Tom Pantelis <[email protected]>
submariner-io · Feb 24, 2025 · 5262f00 · 5262f00
1 parent 00afd11
commit 5262f00
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/pkg/types/types.go b/pkg/types/types.go
@@ -21,6 +21,7 @@ package types
 import (
 	subv1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1"
 	k8snet "k8s.io/utils/net"
+	"k8s.io/utils/set"
 )
 
 type SubmarinerCluster struct {
@@ -52,10 +53,11 @@ type SubmarinerSpecification struct {
 	MetricsPort                   int `default:"32780"`
 }
 
-func (subSpec *SubmarinerSpecification) GetIPFamilies() [2]k8snet.IPFamily {
-	var ipFamilies [2]k8snet.IPFamily
+func (subSpec *SubmarinerSpecification) GetIPFamilies() []k8snet.IPFamily {
+	ipFamilies := set.New[k8snet.IPFamily]()
+
 	// TODO_IPV6: set ipFamilies according to ClusterCidr content
-	ipFamilies[0] = k8snet.IPv4
+	ipFamilies.Insert(k8snet.IPv4)
 
-	return ipFamilies
+	return ipFamilies.UnsortedList()
 }