Merge pull request #676 from hjensas/ushift

Add MicroShift support to IPv6 cluster net detect

Author: stuggi

modules/common/go.mod

@@ -74,6 +74,7 @@ require (
 	golang.org/x/tools v0.41.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/protobuf v1.36.7 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/apiextensions-apiserver v0.31.14 // indirect

modules/common/ocp/ocp.go

@@ -25,6 +25,7 @@ import (
 	ocp_config "github.com/openshift/api/config/v1"
 	"gopkg.in/yaml.v3"
 	corev1 "k8s.io/api/core/v1"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	k8s_utils "k8s.io/utils/net"
 )
@@ -52,31 +53,80 @@ func IsFipsCluster(ctx context.Context, h *helper.Helper) (bool, error) {
 }
 
 // HasIPv6ClusterNetwork - Check if OCP has an IPv6 cluster network
+// Falls back to checking Node PodCIDR and kubernetes service IP families for MicroShift
 func HasIPv6ClusterNetwork(ctx context.Context, h *helper.Helper) (bool, error) {
 	networkConfig := &ocp_config.Network{}
 	err := h.GetClient().Get(ctx, types.NamespacedName{Name: "cluster", Namespace: ""}, networkConfig)
+	if err == nil {
+		// OCP Network config available
+		for _, clusterNetwork := range networkConfig.Status.ClusterNetwork {
+			if k8s_utils.IsIPv6CIDRString(clusterNetwork.CIDR) {
+				return true, nil
+			}
+		}
+		return false, nil
+	}
+
+	// Fallback for MicroShift: check if error is NotFound
+	if !k8serrors.IsNotFound(err) {
+		return false, err
+	}
+
+	// Check Node PodCIDR
+	nodeList := &corev1.NodeList{}
+	err = h.GetClient().List(ctx, nodeList)
 	if err != nil {
 		return false, err
 	}
 
-	for _, clusterNetwork := range networkConfig.Status.ClusterNetwork {
-		if k8s_utils.IsIPv6CIDRString(clusterNetwork.CIDR) {
+	for _, node := range nodeList.Items {
+		if node.Spec.PodCIDR != "" && k8s_utils.IsIPv6CIDRString(node.Spec.PodCIDR) {
 			return true, nil
 		}
+		for _, podCIDR := range node.Spec.PodCIDRs {
+			if k8s_utils.IsIPv6CIDRString(podCIDR) {
+				return true, nil
+			}
+		}
 	}
+
 	return false, nil
 }
 
 // FirstClusterNetworkIsIPv6 - Check if first OCP cluster network is IPv6
+// Falls back to checking first Node PodCIDR and kubernetes service IP families for MicroShift
 func FirstClusterNetworkIsIPv6(ctx context.Context, h *helper.Helper) (bool, error) {
 	networkConfig := &ocp_config.Network{}
 	err := h.GetClient().Get(ctx, types.NamespacedName{Name: "cluster", Namespace: ""}, networkConfig)
+	if err == nil {
+		// OCP Network config available
+		for _, clusterNetwork := range networkConfig.Status.ClusterNetwork {
+			return k8s_utils.IsIPv6CIDRString(clusterNetwork.CIDR), nil
+		}
+		return false, nil
+	}
+
+	// Fallback for MicroShift: check if error is NotFound
+	if !k8serrors.IsNotFound(err) {
+		return false, err
+	}
+
+	// Check first Node PodCIDR
+	nodeList := &corev1.NodeList{}
+	err = h.GetClient().List(ctx, nodeList)
 	if err != nil {
 		return false, err
 	}
 
-	for _, clusterNetwork := range networkConfig.Status.ClusterNetwork {
-		return k8s_utils.IsIPv6CIDRString(clusterNetwork.CIDR), nil
+	if len(nodeList.Items) > 0 {
+		node := nodeList.Items[0]
+		if node.Spec.PodCIDR != "" {
+			return k8s_utils.IsIPv6CIDRString(node.Spec.PodCIDR), nil
+		}
+		if len(node.Spec.PodCIDRs) > 0 {
+			return k8s_utils.IsIPv6CIDRString(node.Spec.PodCIDRs[0]), nil
+		}
 	}
+
 	return false, nil
 }