From ce6dbe32422851b83b661b4634046cd38b66b98f Mon Sep 17 00:00:00 2001
From: Ashish Nair <nairashu@gmail.com>
Date: Tue, 5 Sep 2023 18:23:48 +0000
Subject: [PATCH] Propagated the NC Status inside the CNS and IPAM Monitor pool
 states

---
 cns/NetworkContainerContract.go                            | 2 ++
 cns/ipampool/monitor.go                                    | 2 ++
 cns/kubecontroller/nodenetworkconfig/conversion.go         | 1 +
 cns/kubecontroller/nodenetworkconfig/conversion_linux.go   | 1 +
 cns/kubecontroller/nodenetworkconfig/conversion_windows.go | 1 +
 5 files changed, 7 insertions(+)

diff --git a/cns/NetworkContainerContract.go b/cns/NetworkContainerContract.go
index 9d041a6cfe9..6c49cde62c1 100644
--- 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
index 36df4c8cc1d..d78daf932ec 100644
--- 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
index 7e025380c6e..8b65659ae2d 100644
--- 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
index ab1039f4747..af024c2f9f8 100644
--- 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
index c0696ec3efe..0263c7744a7 100644
--- 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
 }