Handled PR comments:

* Updated the code to have the NC status be part of the error directly so that it can be consumed by containerD
 and cx can perform actions on it.
 * Code update to not use dynamic slices.
 * Removed the logic which handled 0 IPs allocated to NNC in CNS reconcile

Signed-off-by: GitHub <[email protected]>

Author: nairashu

cns/kubecontroller/nodenetworkconfig/reconciler.go

@@ -86,14 +86,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
 
 	// for each NC, parse it in to a CreateNCRequest and forward it to the appropriate Listener
 	for i := range nnc.Status.NetworkContainers {
-		// if the NC status has not been updated successfully skip the reconcilliation
-		noIPs := nnc.Status.NetworkContainers[i].IPAssignments == nil || len(nnc.Status.NetworkContainers[i].IPAssignments) == 0
-		if nnc.Status.NetworkContainers[i].Status != v1alpha.NCUpdateSuccess && noIPs {
-			logger.Printf("[cns-rc] skipping network container %s found in NNC because NC update status has the error %v",
-				nnc.Status.NetworkContainers[i].ID, nnc.Status.NetworkContainers[i].Status)
-			continue
-		}
-
 		// check if this NC matches the Node IP if we have one to check against
 		if r.nodeIP != "" {
 			if r.nodeIP != nnc.Status.NetworkContainers[i].NodeIP {

cns/restserver/ipam.go

@@ -14,7 +14,6 @@ import (
 	"github.com/Azure/azure-container-networking/cns/logger"
 	"github.com/Azure/azure-container-networking/cns/types"
 	"github.com/Azure/azure-container-networking/common"
-	"github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha"
 	"github.com/pkg/errors"
 )
 
@@ -792,9 +791,11 @@ func (service *HTTPRestService) AssignAvailableIPConfigs(podInfo cns.PodInfo) ([
 		return nil, ErrNoNCs
 	}
 	// slice to store NCIDs
-	ncIDs := make([]string, 0)
-	for key := range service.state.ContainerStatus {
-		ncIDs = append(ncIDs, key)
+	ncIDs := make([]string, numOfNCs)
+	i := 0
+	for ncID := range service.state.ContainerStatus {
+		ncIDs[i] = ncID
+		i++
 	}
 
 	service.Lock()
@@ -827,10 +828,8 @@ func (service *HTTPRestService) AssignAvailableIPConfigs(podInfo cns.PodInfo) ([
 			if _, found := ipsToAssign[ncID]; found {
 				continue
 			}
-			if service.state.ContainerStatus[ncID].CreateNetworkContainerRequest.NCStatus == v1alpha.NCStatusSubnetFull {
-				return podIPInfo, errors.Errorf("not enough IPs available for %s, waiting on Azure CNS to allocate more but the Subnet is full", ncID)
-			}
-			return podIPInfo, errors.Errorf("not enough IPs available for %s, waiting on Azure CNS to allocate more", ncID)
+			return podIPInfo, errors.Errorf("not enough IPs available for %s, waiting on Azure CNS to allocate more with NC Status: %s",
+				ncID, string(service.state.ContainerStatus[ncID].CreateNetworkContainerRequest.NCStatus))
 		}
 	}