fix addRoutes

Author: paulyufan2

cns/middlewares/k8sSwiftV2.go

@@ -247,3 +247,14 @@ func (k *K8sSWIFTv2Middleware) getIPConfig(ctx context.Context, podInfo cns.PodI
 func (k *K8sSWIFTv2Middleware) Type() cns.SWIFTV2Mode {
 	return cns.K8sSWIFTV2
 }
+
+func (k *K8sSWIFTv2Middleware) AddRoutes(cidrs []string, gatewayIP string) []cns.Route {
+	routes := make([]cns.Route, len(cidrs))
+	for i, cidr := range cidrs {
+		routes[i] = cns.Route{
+			IPAddress:        cidr,
+			GatewayIPAddress: gatewayIP,
+		}
+	}
+	return routes
+}

cns/middlewares/k8sSwiftV2_linux.go

@@ -66,13 +66,13 @@ func (k *K8sSWIFTv2Middleware) setRoutes(podIPInfo *cns.PodIpInfo) error {
 		}
 
 		if ip.Is4() {
-			routes = append(routes, addRoutes(podCIDRsV4, overlayGatewayv4)...)
-			routes = append(routes, addRoutes(serviceCIDRsV4, overlayGatewayv4)...)
-			routes = append(routes, addRoutes(infraVNETCIDRsv4, overlayGatewayv4)...)
+			routes = append(routes, k.AddRoutes(podCIDRsV4, overlayGatewayv4)...)
+			routes = append(routes, k.AddRoutes(serviceCIDRsV4, overlayGatewayv4)...)
+			routes = append(routes, k.AddRoutes(infraVNETCIDRsv4, overlayGatewayv4)...)
 		} else {
-			routes = append(routes, addRoutes(podCIDRv6, overlayGatewayV6)...)
-			routes = append(routes, addRoutes(serviceCIDRsV6, overlayGatewayV6)...)
-			routes = append(routes, addRoutes(infraVNETCIDRsv6, overlayGatewayV6)...)
+			routes = append(routes, k.AddRoutes(podCIDRv6, overlayGatewayV6)...)
+			routes = append(routes, k.AddRoutes(serviceCIDRsV6, overlayGatewayV6)...)
+			routes = append(routes, k.AddRoutes(infraVNETCIDRsv6, overlayGatewayV6)...)
 		}
 		podIPInfo.SkipDefaultRoutes = true
 
@@ -86,17 +86,6 @@ func (k *K8sSWIFTv2Middleware) setRoutes(podIPInfo *cns.PodIpInfo) error {
 	return nil
 }
 
-func addRoutes(cidrs []string, gatewayIP string) []cns.Route {
-	routes := make([]cns.Route, len(cidrs))
-	for i, cidr := range cidrs {
-		routes[i] = cns.Route{
-			IPAddress:        cidr,
-			GatewayIPAddress: gatewayIP,
-		}
-	}
-	return routes
-}
-
 // assignSubnetPrefixLengthFields is a no-op for linux swiftv2 as the default prefix-length is sufficient
 func (k *K8sSWIFTv2Middleware) assignSubnetPrefixLengthFields(_ *cns.PodIpInfo, _ v1alpha1.InterfaceInfo, _ string) error {
 	return nil

cns/middlewares/k8sSwiftV2_windows.go

@@ -61,13 +61,13 @@ func (k *K8sSWIFTv2Middleware) setRoutes(podIPInfo *cns.PodIpInfo) error {
 		}
 
 		if ip.Is4() {
-			podIPInfo.Routes = append(podIPInfo.Routes, addRoutes(podCIDRsV4, overlayGatewayv4)...)
-			podIPInfo.Routes = append(podIPInfo.Routes, addRoutes(serviceCIDRsV4, overlayGatewayv4)...)
-			podIPInfo.Routes = append(podIPInfo.Routes, addRoutes(infraVNETCIDRsv4, overlayGatewayv4)...)
+			podIPInfo.Routes = append(podIPInfo.Routes, k.AddRoutes(podCIDRsV4, overlayGatewayv4)...)
+			podIPInfo.Routes = append(podIPInfo.Routes, k.AddRoutes(serviceCIDRsV4, overlayGatewayv4)...)
+			podIPInfo.Routes = append(podIPInfo.Routes, k.AddRoutes(infraVNETCIDRsv4, overlayGatewayv4)...)
 		} else {
-			podIPInfo.Routes = append(podIPInfo.Routes, addRoutes(podCIDRv6, overlayGatewayV6)...)
-			podIPInfo.Routes = append(podIPInfo.Routes, addRoutes(serviceCIDRsV6, overlayGatewayV6)...)
-			podIPInfo.Routes = append(podIPInfo.Routes, addRoutes(infraVNETCIDRsv6, overlayGatewayV6)...)
+			podIPInfo.Routes = append(podIPInfo.Routes, k.AddRoutes(podCIDRv6, overlayGatewayV6)...)
+			podIPInfo.Routes = append(podIPInfo.Routes, k.AddRoutes(serviceCIDRsV6, overlayGatewayV6)...)
+			podIPInfo.Routes = append(podIPInfo.Routes, k.AddRoutes(infraVNETCIDRsv6, overlayGatewayV6)...)
 		}
 
 		podIPInfo.SkipDefaultRoutes = true