add error logs

Author: paulyufan2

cns/middlewares/k8sSwiftV2.go

@@ -259,42 +259,42 @@ func (k *K8sSWIFTv2Middleware) addRoutes(cidrs []string, gatewayIP string) []cns
 	return routes
 }
 
-func (k *K8sSWIFTv2Middleware) SetInfraRoutes() []cns.Route {
+func (k *K8sSWIFTv2Middleware) SetInfraRoutes() ([]cns.Route, error) {
 	var routes []cns.Route
 
 	// Get and parse infraVNETCIDRs from env
 	infraVNETCIDRs, err := configuration.InfraVNETCIDRs()
 	if err != nil {
-		return errors.Wrapf(err, "failed to get infraVNETCIDRs from env")
+		return nil, errors.Wrapf(err, "failed to get infraVNETCIDRs from env")
 	}
 	infraVNETCIDRsv4, infraVNETCIDRsv6, err := utils.ParseCIDRs(infraVNETCIDRs)
 	if err != nil {
-		return errors.Wrapf(err, "failed to parse infraVNETCIDRs")
+		return nil, errors.Wrapf(err, "failed to parse infraVNETCIDRs")
 	}
 
 	// Get and parse podCIDRs from env
 	podCIDRs, err := configuration.PodCIDRs()
 	if err != nil {
-		return errors.Wrapf(err, "failed to get podCIDRs from env")
+		return nil, errors.Wrapf(err, "failed to get podCIDRs from env")
 	}
 	podCIDRsV4, podCIDRv6, err := utils.ParseCIDRs(podCIDRs)
 	if err != nil {
-		return errors.Wrapf(err, "failed to parse podCIDRs")
+		return nil, errors.Wrapf(err, "failed to parse podCIDRs")
 	}
 
 	// Get and parse serviceCIDRs from env
 	serviceCIDRs, err := configuration.ServiceCIDRs()
 	if err != nil {
-		return errors.Wrapf(err, "failed to get serviceCIDRs from env")
+		return nil, errors.Wrapf(err, "failed to get serviceCIDRs from env")
 	}
 	serviceCIDRsV4, serviceCIDRsV6, err := utils.ParseCIDRs(serviceCIDRs)
 	if err != nil {
-		return errors.Wrapf(err, "failed to parse serviceCIDRs")
+		return nil, errors.Wrapf(err, "failed to parse serviceCIDRs")
 	}
 
 	ip, err := netip.ParseAddr(podIPInfo.PodIPConfig.IPAddress)
 	if err != nil {
-		return errors.Wrapf(err, "failed to parse podIPConfig IP address %s", podIPInfo.PodIPConfig.IPAddress)
+		return nil, errors.Wrapf(err, "failed to parse podIPConfig IP address %s", podIPInfo.PodIPConfig.IPAddress)
 	}
 
 	if ip.Is4() {
@@ -307,5 +307,5 @@ func (k *K8sSWIFTv2Middleware) SetInfraRoutes() []cns.Route {
 		routes = append(routes, k.addRoutes(infraVNETCIDRsv6, overlayGatewayV6)...)
 	}
 
-	return routes
+	return routes, nil
 }

cns/middlewares/k8sSwiftV2_linux.go

@@ -6,6 +6,7 @@ import (
 	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/cns/logger"
 	"github.com/Azure/azure-container-networking/crd/multitenancy/api/v1alpha1"
+	"github.com/pkg/errors"
 )
 
 // setRoutes sets the routes for podIPInfo used in SWIFT V2 scenario.
@@ -26,7 +27,11 @@ func (k *K8sSWIFTv2Middleware) setRoutes(podIPInfo *cns.PodIpInfo) error {
 		routes = append(routes, virtualGWRoute, route)
 
 	case cns.InfraNIC:
-		routes = k.SetInfraRoutes()
+		infraRoutes, err := k.SetInfraRoutes()
+		if err != nil {
+			return errors.Wrap("failed to set infra routes")
+		}
+		routes = append(routes, infraRoutes)
 		podIPInfo.SkipDefaultRoutes = true
 
 	case cns.NodeNetworkInterfaceBackendNIC: //nolint:exhaustive // ignore exhaustive types check

cns/middlewares/k8sSwiftV2_windows.go

@@ -23,7 +23,11 @@ func (k *K8sSWIFTv2Middleware) setRoutes(podIPInfo *cns.PodIpInfo) error {
 		podIPInfo.Routes = append(podIPInfo.Routes, route)
 
 		// add routes for infraNIC
-		podIPInfo.Routes = append(podIPInfo.Routes, k.SetInfraRoutes())
+		routes, err := k.SetInfraRoutes()
+		if err != nil {
+			return errors.Wrap("failed to set infra routes")
+		}
+		podIPInfo.Routes = append(podIPInfo.Routes, routes)
 		podIPInfo.SkipDefaultRoutes = true
 	}
 	return nil