utils: improve unittest coverage

Signed-off-by: Cyclinder Kuo <[email protected]>

pkg/coordinatormanager/coordinator_informer.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"net"
 	"reflect"
-	"regexp"
 	"sort"
 	"strings"
 	"time"
@@ -473,7 +472,7 @@ func (cc *CoordinatorController) updatePodAndServerCIDR(ctx context.Context, log
 
 	if err == nil {
 		logger.Sugar().Info("Trying to fetch the ClusterCIDR from kube-system/kubeadm-config")
-		k8sPodCIDR, k8sServiceCIDR, err = ExtractK8sCIDRFromKubeadmConfigMap(&cm)
+		k8sPodCIDR, k8sServiceCIDR, err = utils.ExtractK8sCIDRFromKubeadmConfigMap(&cm)
 		if err == nil {
 			// Success to get ClusterCIDR from kubeadm-config
 			logger.Sugar().Infof("Success get CIDR from kubeadm-config: PodCIDR=%v, ServiceCIDR=%v", k8sPodCIDR, k8sServiceCIDR)
@@ -507,7 +506,7 @@ func (cc *CoordinatorController) updatePodAndServerCIDR(ctx context.Context, log
 			return coordCopy
 		}
 
-		k8sPodCIDR, k8sServiceCIDR = ExtractK8sCIDRFromKCMPod(&podList.Items[0])
+		k8sPodCIDR, k8sServiceCIDR = utils.ExtractK8sCIDRFromKCMPod(&podList.Items[0])
 		logger.Sugar().Infof("kube-controller-manager k8sPodCIDR %v, k8sServiceCIDR %v", k8sPodCIDR, k8sServiceCIDR)
 	}
 
@@ -778,103 +777,6 @@ func (cc *CoordinatorController) updateServiceCIDR(logger *zap.Logger, coordCopy
 	return nil
 }
 
-func ExtractK8sCIDRFromKubeadmConfigMap(cm *corev1.ConfigMap) ([]string, []string, error) {
-	if cm == nil {
-		return nil, nil, fmt.Errorf("kubeadm configmap is unexpected to nil")
-	}
-	var podCIDR, serviceCIDR []string
-
-	clusterConfig, exists := cm.Data["ClusterConfiguration"]
-	if !exists {
-		return podCIDR, serviceCIDR, fmt.Errorf("unable to get kubeadm configmap ClusterConfiguration")
-	}
-
-	podReg := regexp.MustCompile(`podSubnet:\s*(\S+)`)
-	serviceReg := regexp.MustCompile(`serviceSubnet:\s*(\S+)`)
-
-	podSubnets := podReg.FindStringSubmatch(clusterConfig)
-	serviceSubnets := serviceReg.FindStringSubmatch(clusterConfig)
-
-	if len(podSubnets) > 1 {
-		for _, cidr := range strings.Split(podSubnets[1], ",") {
-			cidr = strings.TrimSpace(cidr)
-			_, _, err := net.ParseCIDR(cidr)
-			if err != nil {
-				continue
-			}
-			podCIDR = append(podCIDR, cidr)
-		}
-	}
-
-	if len(serviceSubnets) > 1 {
-		for _, cidr := range strings.Split(serviceSubnets[1], ",") {
-			cidr = strings.TrimSpace(cidr)
-			_, _, err := net.ParseCIDR(cidr)
-			if err != nil {
-				continue
-			}
-			serviceCIDR = append(serviceCIDR, cidr)
-		}
-	}
-
-	return podCIDR, serviceCIDR, nil
-}
-
-func ExtractK8sCIDRFromKCMPod(kcm *corev1.Pod) ([]string, []string) {
-	var podCIDR, serviceCIDR []string
-
-	podReg := regexp.MustCompile(`--cluster-cidr=(.*)`)
-	serviceReg := regexp.MustCompile(`--service-cluster-ip-range=(.*)`)
-
-	var podSubnets, serviceSubnets []string
-	findSubnets := func(l string) {
-		if len(podSubnets) == 0 {
-			podSubnets = podReg.FindStringSubmatch(l)
-		}
-		if len(serviceSubnets) == 0 {
-			serviceSubnets = serviceReg.FindStringSubmatch(l)
-		}
-	}
-
-	for _, l := range kcm.Spec.Containers[0].Command {
-		findSubnets(l)
-		if len(podSubnets) != 0 && len(serviceSubnets) != 0 {
-			break
-		}
-	}
-
-	if len(podSubnets) == 0 || len(serviceSubnets) == 0 {
-		for _, l := range kcm.Spec.Containers[0].Args {
-			findSubnets(l)
-			if len(podSubnets) != 0 && len(serviceSubnets) != 0 {
-				break
-			}
-		}
-	}
-
-	if len(podSubnets) != 0 {
-		for _, cidr := range strings.Split(podSubnets[1], ",") {
-			_, _, err := net.ParseCIDR(cidr)
-			if err != nil {
-				continue
-			}
-			podCIDR = append(podCIDR, cidr)
-		}
-	}
-
-	if len(serviceSubnets) != 0 {
-		for _, cidr := range strings.Split(serviceSubnets[1], ",") {
-			_, _, err := net.ParseCIDR(cidr)
-			if err != nil {
-				continue
-			}
-			serviceCIDR = append(serviceCIDR, cidr)
-		}
-	}
-
-	return podCIDR, serviceCIDR
-}
-
 func fetchType(cniDir string) (string, error) {
 	defaultCniName, err := utils.GetDefaultCniName(cniDir)
 	if err != nil {

pkg/utils/utils.go

@@ -5,10 +5,13 @@ package utils
 
 import (
 	"fmt"
+	"net"
+	"regexp"
 	"sort"
 	"strings"
 
 	"github.com/containernetworking/cni/libcni"
+	corev1 "k8s.io/api/core/v1"
 )
 
 // GetDefaultCNIConfPath according to the provided CNI file path (default is /etc/cni/net.d),
@@ -68,3 +71,100 @@ func fetchCniNameFromPath(cniPath string) (string, error) {
 	}
 	return conf.Network.Name, nil
 }
+
+func ExtractK8sCIDRFromKubeadmConfigMap(cm *corev1.ConfigMap) ([]string, []string, error) {
+	if cm == nil {
+		return nil, nil, fmt.Errorf("kubeadm configmap is unexpected to nil")
+	}
+	var podCIDR, serviceCIDR []string
+
+	clusterConfig, exists := cm.Data["ClusterConfiguration"]
+	if !exists {
+		return podCIDR, serviceCIDR, fmt.Errorf("unable to get kubeadm configmap ClusterConfiguration")
+	}
+
+	podReg := regexp.MustCompile(`podSubnet:\s*(\S+)`)
+	serviceReg := regexp.MustCompile(`serviceSubnet:\s*(\S+)`)
+
+	podSubnets := podReg.FindStringSubmatch(clusterConfig)
+	serviceSubnets := serviceReg.FindStringSubmatch(clusterConfig)
+
+	if len(podSubnets) > 1 {
+		for _, cidr := range strings.Split(podSubnets[1], ",") {
+			cidr = strings.TrimSpace(cidr)
+			_, _, err := net.ParseCIDR(cidr)
+			if err != nil {
+				continue
+			}
+			podCIDR = append(podCIDR, cidr)
+		}
+	}
+
+	if len(serviceSubnets) > 1 {
+		for _, cidr := range strings.Split(serviceSubnets[1], ",") {
+			cidr = strings.TrimSpace(cidr)
+			_, _, err := net.ParseCIDR(cidr)
+			if err != nil {
+				continue
+			}
+			serviceCIDR = append(serviceCIDR, cidr)
+		}
+	}
+
+	return podCIDR, serviceCIDR, nil
+}
+
+func ExtractK8sCIDRFromKCMPod(kcm *corev1.Pod) ([]string, []string) {
+	var podCIDR, serviceCIDR []string
+
+	podReg := regexp.MustCompile(`--cluster-cidr=(.*)`)
+	serviceReg := regexp.MustCompile(`--service-cluster-ip-range=(.*)`)
+
+	var podSubnets, serviceSubnets []string
+	findSubnets := func(l string) {
+		if len(podSubnets) == 0 {
+			podSubnets = podReg.FindStringSubmatch(l)
+		}
+		if len(serviceSubnets) == 0 {
+			serviceSubnets = serviceReg.FindStringSubmatch(l)
+		}
+	}
+
+	for _, l := range kcm.Spec.Containers[0].Command {
+		findSubnets(l)
+		if len(podSubnets) != 0 && len(serviceSubnets) != 0 {
+			break
+		}
+	}
+
+	if len(podSubnets) == 0 || len(serviceSubnets) == 0 {
+		for _, l := range kcm.Spec.Containers[0].Args {
+			findSubnets(l)
+			if len(podSubnets) != 0 && len(serviceSubnets) != 0 {
+				break
+			}
+		}
+	}
+
+	if len(podSubnets) != 0 {
+		for _, cidr := range strings.Split(podSubnets[1], ",") {
+			_, _, err := net.ParseCIDR(cidr)
+			if err != nil {
+				continue
+			}
+			podCIDR = append(podCIDR, cidr)
+		}
+	}
+
+	if len(serviceSubnets) != 0 {
+		for _, cidr := range strings.Split(serviceSubnets[1], ",") {
+			_, _, err := net.ParseCIDR(cidr)
+			if err != nil {
+				continue
+			}
+			serviceCIDR = append(serviceCIDR, cidr)
+		}
+	}
+
+	return podCIDR, serviceCIDR
+}

pkg/utils/utils_suite_test.go

@@ -0,0 +1,15 @@
+// Copyright 2024 Authors of spidernet-io
+// SPDX-License-Identifier: Apache-2.0
+package utils
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+func TestUtils(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Utils Suite", Label("utils", "unittest"))
+}