Propagated the NC Status inside the CNS and IPAM Monitor pool states

Azure · Sep 5, 2023 · ce6dbe3 · ce6dbe3
1 parent 2b55ae8
commit ce6dbe3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 0 deletions.
diff --git a/cns/NetworkContainerContract.go b/cns/NetworkContainerContract.go
@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/Azure/azure-container-networking/cns/types"
+	"github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 )
@@ -95,6 +96,7 @@ type CreateNetworkContainerRequest struct {
 	AllowHostToNCCommunication bool
 	AllowNCToHostCommunication bool
 	EndpointPolicies           []NetworkContainerRequestPolicies
+	NCStatus                   v1alpha.NetworkContainerStatus
 }
 
 // CreateNetworkContainerRequest implements fmt.Stringer for logging

diff --git a/cns/ipampool/monitor.go b/cns/ipampool/monitor.go
@@ -44,6 +44,7 @@ type metaState struct {
 	subnet             string
 	subnetARMID        string
 	subnetCIDR         string
+	nncStatus          v1alpha.NetworkContainerStatus
 }
 
 type Options struct {
@@ -120,6 +121,7 @@ func (pm *Monitor) Start(ctx context.Context) error {
 				pm.metastate.subnet = nnc.Status.NetworkContainers[0].SubnetName
 				pm.metastate.subnetCIDR = nnc.Status.NetworkContainers[0].SubnetAddressSpace
 				pm.metastate.subnetARMID = GenerateARMID(&nnc.Status.NetworkContainers[0])
+				pm.metastate.nncStatus = nnc.Status.NetworkContainers[0].UpdateStatus
 			}
 			pm.metastate.primaryIPAddresses = make(map[string]struct{})
 			// Add Primary IP to Map, if not present.

diff --git a/cns/kubecontroller/nodenetworkconfig/conversion.go b/cns/kubecontroller/nodenetworkconfig/conversion.go
@@ -66,6 +66,7 @@ func CreateNCRequestFromDynamicNC(nc v1alpha.NetworkContainer) (*cns.CreateNetwo
 			IPSubnet:         subnet,
 			GatewayIPAddress: nc.DefaultGateway,
 		},
+		NCStatus: nc.UpdateStatus,
 	}, nil
 }
 

diff --git a/cns/kubecontroller/nodenetworkconfig/conversion_linux.go b/cns/kubecontroller/nodenetworkconfig/conversion_linux.go
@@ -56,5 +56,6 @@ func createNCRequestFromStaticNCHelper(nc v1alpha.NetworkContainer, primaryIPPre
 			IPSubnet:         subnet,
 			GatewayIPAddress: nc.DefaultGateway,
 		},
+		NCStatus: nc.UpdateStatus,
 	}, nil
 }
diff --git a/cns/kubecontroller/nodenetworkconfig/conversion_windows.go b/cns/kubecontroller/nodenetworkconfig/conversion_windows.go
@@ -66,5 +66,6 @@ func createNCRequestFromStaticNCHelper(nc v1alpha.NetworkContainer, primaryIPPre
 			IPSubnet:         subnet,
 			GatewayIPAddress: nc.DefaultGateway,
 		},
+		NCStatus: nc.UpdateStatus
 	}, nil
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     			IPSubnet:         subnet,
     			GatewayIPAddress: nc.DefaultGateway,
     		},
+    		NCStatus: nc.UpdateStatus,
     	}, nil
     }
@@ Expand Down @@