Update egress agent test

charts/crds/egressgateway.spidernet.io_egresstunnels.yaml

@@ -9,7 +9,7 @@ spec:
   group: egressgateway.spidernet.io
   names:
     categories:
-    - egressnode
+    - egresstunnel
     kind: EgressTunnel
     listKind: EgressTunnelList
     plural: egresstunnels

pkg/agent/police.go

@@ -487,16 +487,6 @@ func parseMark(mark string) (uint32, error) {
 	return i32, nil
 }
 
-func parseMarkToInt(mark string) (int, error) {
-	tmp := strings.ReplaceAll(mark, "0x", "")
-	i64, err := strconv.ParseInt(tmp, 16, 32)
-	if err != nil {
-		return 0, err
-	}
-	i32 := int(i64)
-	return i32, nil
-}
-
 func (r *policeReconciler) buildPolicyRule(policyName string, mark uint32, version uint8, isIgnoreInternalCIDR bool) *iptables.Rule {
 	tmp := "v4-"
 	ignoreInternalCIDRName := EgressClusterCIDRIPv4

pkg/agent/vxlan.go

@@ -6,6 +6,7 @@ package agent
 import (
 	"context"
 	"fmt"
+	"strconv"
 
 	"net"
 	"strings"
@@ -185,7 +186,7 @@ func (r *vxlanReconciler) updateEgressNodeStatus(node *egressv1.EgressTunnel, ve
 		ctx := context.Background()
 		err = r.client.Get(ctx, types.NamespacedName{Name: r.cfg.NodeName}, node)
 		if err != nil {
-			if !errors.IsNotFound(err) {
+			if errors.IsNotFound(err) {
 				return nil
 			}
 			return err
@@ -283,11 +284,7 @@ func (r *vxlanReconciler) parseVTEP(status egressv1.EgressNodeStatus) *vxlan.Pee
 	if !ready {
 		return nil
 	}
-	return &vxlan.Peer{
-		IPv4: ipv4,
-		IPv6: ipv6,
-		MAC:  mac,
-	}
+	return &vxlan.Peer{IPv4: ipv4, IPv6: ipv6, MAC: mac}
 }
 
 func (r *vxlanReconciler) version() int {
@@ -423,6 +420,16 @@ func (r *vxlanReconciler) ensureRoute() error {
 	return nil
 }
 
+func parseMarkToInt(mark string) (int, error) {
+	tmp := strings.ReplaceAll(mark, "0x", "")
+	i64, err := strconv.ParseInt(tmp, 16, 32)
+	if err != nil {
+		return 0, err
+	}
+	i32 := int(i64)
+	return i32, nil
+}
+
 func newEgressNodeController(mgr manager.Manager, cfg *config.Config, log logr.Logger) error {
 	ruleRoute := route.NewRuleRoute(log)
 

pkg/controller/egress_cluster_info.go

@@ -6,6 +6,7 @@ package controller
 import (
 	"context"
 	"fmt"
+	"github.com/spidernet-io/egressgateway/pkg/utils/ip"
 	"strings"
 	"sync"
 
@@ -144,11 +145,11 @@ func (r *eciReconciler) reconcileCalicoIPPool(ctx context.Context, req reconcile
 	log.Info("update event")
 
 	// check if cidr about ippools changed
-	isv4Cidr, err := utils.IsIPv4Cidr(ippool.Spec.CIDR)
+	isv4Cidr, err := ip.IsIPv4Cidr(ippool.Spec.CIDR)
 	if err != nil {
 		return reconcile.Result{Requeue: true}, err
 	}
-	isv6Cidr, err := utils.IsIPv6Cidr(ippool.Spec.CIDR)
+	isv6Cidr, err := ip.IsIPv6Cidr(ippool.Spec.CIDR)
 	if err != nil {
 		return reconcile.Result{Requeue: true}, err
 	}
@@ -547,11 +548,11 @@ func getCidr(pod *corev1.Pod, param string) (ipv4Range, ipv6Range []string, err
 	// get cidr
 	ipRanges := strings.Split(ipRange, ",")
 	if len(ipRanges) == 1 {
-		if isV4, _ := utils.IsIPv4Cidr(ipRanges[0]); isV4 {
+		if isV4, _ := ip.IsIPv4Cidr(ipRanges[0]); isV4 {
 			ipv4Range = ipRanges
 			ipv6Range = []string{}
 		}
-		if isV6, _ := utils.IsIPv6Cidr(ipRanges[0]); isV6 {
+		if isV6, _ := ip.IsIPv6Cidr(ipRanges[0]); isV6 {
 			ipv6Range = ipRanges
 			ipv4Range = []string{}
 

pkg/controller/webhook/validate.go

@@ -161,7 +161,7 @@ func checkEIP(client client.Client, ctx context.Context, egp egressv1.EgressPoli
 	return true, nil
 }
 
-// ValidateHook ValidateHook
+// MutateHook MutateHook
 func MutateHook(client client.Client, cfg *config.Config) *webhook.Admission {
 	return &webhook.Admission{
 		Handler: admission.HandlerFunc(func(ctx context.Context, req webhook.AdmissionRequest) webhook.AdmissionResponse {

pkg/controller/webhook/validate_test.go

@@ -81,7 +81,7 @@ func TestValidateEgressGateway(t *testing.T) {
 	}
 }
 
-func TestValidateEgressGatewayPolicy(t *testing.T) {
+func TestValidateEgressPolicy(t *testing.T) {
 	ctx := context.Background()
 
 	cases := map[string]struct {

pkg/egressgateway/egress_gateway.go

@@ -6,6 +6,7 @@ package egressgateway
 import (
 	"context"
 	"fmt"
+	"github.com/spidernet-io/egressgateway/pkg/utils/ip"
 	"math/rand"
 	"net"
 	"time"
@@ -657,10 +658,10 @@ func (r egnReconciler) allocatorEIP(selEipLolicy string, nodeName string, pi pol
 		var useIpv4s []net.IP
 		var useIpv4sByNode []net.IP
 
-		ipv4Ranges, _ := utils.MergeIPRanges(constant.IPv4, eg.Spec.Ippools.IPv4)
+		ipv4Ranges, _ := ip.MergeIPRanges(constant.IPv4, eg.Spec.Ippools.IPv4)
 		perIpv4 = pi.ipv4
 		if len(perIpv4) != 0 {
-			result, err := utils.IsIPIncludedRange(constant.IPv4, perIpv4, ipv4Ranges)
+			result, err := ip.IsIPIncludedRange(constant.IPv4, perIpv4, ipv4Ranges)
 			if err != nil {
 				return "", "", err
 			}
@@ -676,8 +677,8 @@ func (r egnReconciler) allocatorEIP(selEipLolicy string, nodeName string, pi pol
 				}
 			}
 
-			ipv4s, _ := utils.ParseIPRanges(constant.IPv4, ipv4Ranges)
-			freeIpv4s := utils.IPsDiffSet(ipv4s, useIpv4s, false)
+			ipv4s, _ := ip.ParseIPRanges(constant.IPv4, ipv4Ranges)
+			freeIpv4s := ip.IPsDiffSet(ipv4s, useIpv4s, false)
 
 			if len(freeIpv4s) == 0 {
 				for _, node := range eg.Status.NodeList {
@@ -709,11 +710,11 @@ func (r egnReconciler) allocatorEIP(selEipLolicy string, nodeName string, pi pol
 		var useIpv6s []net.IP
 		var useIpv6sByNode []net.IP
 
-		ipv6Ranges, _ := utils.MergeIPRanges(constant.IPv6, eg.Spec.Ippools.IPv6)
+		ipv6Ranges, _ := ip.MergeIPRanges(constant.IPv6, eg.Spec.Ippools.IPv6)
 
 		perIpv6 = pi.ipv6
 		if len(perIpv6) != 0 {
-			result, err := utils.IsIPIncludedRange(constant.IPv6, perIpv6, ipv6Ranges)
+			result, err := ip.IsIPIncludedRange(constant.IPv6, perIpv6, ipv6Ranges)
 			if err != nil {
 				return "", "", err
 			}
@@ -729,8 +730,8 @@ func (r egnReconciler) allocatorEIP(selEipLolicy string, nodeName string, pi pol
 				}
 			}
 
-			ipv6s, _ := utils.ParseIPRanges(constant.IPv6, ipv6Ranges)
-			freeIpv6s := utils.IPsDiffSet(ipv6s, useIpv6s, false)
+			ipv6s, _ := ip.ParseIPRanges(constant.IPv6, ipv6Ranges)
+			freeIpv6s := ip.IPsDiffSet(ipv6s, useIpv6s, false)
 
 			if len(freeIpv6s) == 0 {
 				for _, node := range eg.Status.NodeList {