remove logs

Author: paulyufan2

cni/network/invoker_cns.go

@@ -487,7 +487,20 @@ func configureSecondaryAddResult(info *IPResultInfo, addResult *IPAMAddResult, p
 	if err != nil {
 		return err
 	}
-	logger.Info("routes are now", zap.Any("routes are now", routes))
+	defaultRouteDstPrefix := network.Ipv4DefaultRouteDstPrefix
+	ncgw := net.ParseIP(info.ncGatewayIPAddress)
+
+	resRoute := addResult.interfaceInfo[key].Routes
+	if len(routes) > 0 {
+		resRoute = append(resRoute, routes...)
+	} else { // add default routes for secondary interfaces
+		resRoute = append(resRoute, network.RouteInfo{
+			Dst: defaultRouteDstPrefix,
+			Gw:  ncgw,
+		})
+	}
+
+	logger.Info("routes are now", zap.Any("routes are now", resRoute))
 
 	addResult.interfaceInfo[key] = network.InterfaceInfo{
 		IPConfigs: []*network.IPConfig{
@@ -499,7 +512,7 @@ func configureSecondaryAddResult(info *IPResultInfo, addResult *IPAMAddResult, p
 				Gateway: net.ParseIP(info.ncGatewayIPAddress),
 			},
 		},
-		Routes:            routes,
+		Routes:            resRoute,
 		NICType:           info.nicType,
 		MacAddress:        macAddress,
 		SkipDefaultRoutes: info.skipDefaultRoutes,

cni/network/network.go

@@ -856,7 +856,6 @@ func (plugin *NetPlugin) createEpInfo(opt *createEpInfoOpt) (*network.EndpointIn
 	}
 
 	setEndpointOptions(opt.cnsNetworkConfig, &endpointInfo, vethName)
-	logger.Info("endpointInfo routes are", zap.Any("endpointInfo routes", endpointInfo.Routes))
 	logger.Info("Generated endpoint info from fields", zap.String("epInfo", endpointInfo.PrettyString()))
 
 	// now our ep info should have the full combined information from both the network and endpoint structs

cns/middlewares/k8sSwiftV2_windows.go

@@ -43,15 +43,15 @@ func (k *K8sSWIFTv2Middleware) assignSubnetPrefixLengthFields(podIPInfo *cns.Pod
 		},
 		GatewayIPAddress: interfaceInfo.GatewayIP,
 	}
-	// assign routes
-	virtualGWRoute := cns.Route{
+	// assign default route
+	defaultRoute := cns.Route{
 		IPAddress: fmt.Sprintf("%s/%d", interfaceInfo.GatewayIP, prefixLength),
 	}
 	route := cns.Route{
 		IPAddress:        "0.0.0.0/0",
-		GatewayIPAddress: virtualGW,
+		GatewayIPAddress: interfaceInfo.GatewayIP,
 	}
-	podIPInfo.Routes = append(podIPInfo.Routes, virtualGWRoute, route)
+	podIPInfo.Routes = append(podIPInfo.Routes, defaultRoute, route)
 
 	return nil
 }

network/endpoint_windows.go

@@ -332,11 +332,13 @@ func (nw *network) configureHcnEndpoint(epInfo *EndpointInfo) (*hcn.HostComputeE
 		hcnEndpoint.Policies = append(hcnEndpoint.Policies, endpointPolicy)
 	}
 
+	logger.Info("epInfo.Routes are", zap.Any("epInfo.Routes", epInfo.Routes))
 	for _, route := range epInfo.Routes {
 		hcnRoute := hcn.Route{
 			NextHop:           route.Gw.String(),
 			DestinationPrefix: route.Dst.String(),
 		}
+		logger.Info("endpoint windows", zap.Any("hcnRoute", hcnRoute))
 
 		hcnEndpoint.Routes = append(hcnEndpoint.Routes, hcnRoute)
 	}
@@ -421,14 +423,14 @@ func (nw *network) createHostNCApipaEndpoint(cli apipaClient, epInfo *EndpointIn
 
 // newEndpointImplHnsV2 creates a new endpoint in the network using Hnsv2
 func (nw *network) newEndpointImplHnsV2(cli apipaClient, epInfo *EndpointInfo) (*endpoint, error) {
+	logger.Info("epInfo routes on newEndpointImplHnsV2", zap.Any("epInfo routes", epInfo.Routes))
 	hcnEndpoint, err := nw.configureHcnEndpoint(epInfo)
 	if err != nil {
 		logger.Error("Failed to configure hcn endpoint due to", zap.Error(err))
 		return nil, err
 	}
 
 	// Create the HCN endpoint.
-	logger.Info("Creating hcn endpoint", zap.Any("hcnEndpoint", hcnEndpoint), zap.String("computenetwork", hcnEndpoint.HostComputeNetwork))
 	hnsResponse, err := Hnsv2.CreateEndpoint(hcnEndpoint)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to create endpoint: %s due to error: %v", hcnEndpoint.Name, err)

network/network.go

@@ -317,6 +317,7 @@ func (nm *networkManager) EndpointCreate(cnsclient apipaClient, epInfos []*Endpo
 	eps := []*endpoint{} // save endpoints for stateless
 
 	for _, epInfo := range epInfos {
+		logger.Info("epInfo routes in nm endpointCreate is", zap.Any("epInfo routes in nm endpointCreate is", epInfo.Routes))
 		logger.Info("Creating endpoint and network", zap.String("endpointInfo", epInfo.PrettyString()))
 		// check if network exists by searching through all external interfaces for the network
 		_, nwGetErr := nm.GetNetworkInfo(epInfo.NetworkID)