Saved the updated NC Status into the CNS statefile

Azure · Sep 9, 2023 · 06751ed · 06751ed
1 parent 41b65b3
commit 06751ed
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 43 deletions.
diff --git a/cns/NetworkContainerContract.go b/cns/NetworkContainerContract.go
@@ -96,17 +96,17 @@ type CreateNetworkContainerRequest struct {
 	AllowHostToNCCommunication bool
 	AllowNCToHostCommunication bool
 	EndpointPolicies           []NetworkContainerRequestPolicies
-	NCStatus                   v1alpha.NetworkContainerStatus
+	NCStatus                   v1alpha.NCStatus
 }
 
 // CreateNetworkContainerRequest implements fmt.Stringer for logging
 func (req *CreateNetworkContainerRequest) String() string {
 	return fmt.Sprintf("CreateNetworkContainerRequest"+
 		"{Version: %s, NetworkContainerType: %s, NetworkContainerid: %s, PrimaryInterfaceIdentifier: %s, "+
 		"LocalIPConfiguration: %+v, IPConfiguration: %+v, SecondaryIPConfigs: %+v, MultitenancyInfo: %+v, "+
-		"AllowHostToNCCommunication: %t, AllowNCToHostCommunication: %t}",
+		"AllowHostToNCCommunication: %t, AllowNCToHostCommunication: %t, NCStatus: %s}",
 		req.Version, req.NetworkContainerType, req.NetworkContainerid, req.PrimaryInterfaceIdentifier, req.LocalIPConfiguration,
-		req.IPConfiguration, req.SecondaryIPConfigs, req.MultiTenancyInfo, req.AllowHostToNCCommunication, req.AllowNCToHostCommunication)
+		req.IPConfiguration, req.SecondaryIPConfigs, req.MultiTenancyInfo, req.AllowHostToNCCommunication, req.AllowNCToHostCommunication, string(req.NCStatus))
 }
 
 // NetworkContainerRequestPolicies - specifies policies associated with create network request

diff --git a/cns/ipampool/monitor.go b/cns/ipampool/monitor.go
@@ -121,7 +121,6 @@ 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,7 +66,7 @@ func CreateNCRequestFromDynamicNC(nc v1alpha.NetworkContainer) (*cns.CreateNetwo
 			IPSubnet:         subnet,
 			GatewayIPAddress: nc.DefaultGateway,
 		},
-		NCStatus: nc.UpdateStatus,
+		NCStatus: nc.Status,
 	}, nil
 }
 

diff --git a/cns/kubecontroller/nodenetworkconfig/conversion_linux.go b/cns/kubecontroller/nodenetworkconfig/conversion_linux.go
@@ -56,6 +56,6 @@ func createNCRequestFromStaticNCHelper(nc v1alpha.NetworkContainer, primaryIPPre
 			IPSubnet:         subnet,
 			GatewayIPAddress: nc.DefaultGateway,
 		},
-		NCStatus: nc.UpdateStatus,
+		NCStatus: nc.Status,
 	}, nil
 }
diff --git a/cns/kubecontroller/nodenetworkconfig/conversion_windows.go b/cns/kubecontroller/nodenetworkconfig/conversion_windows.go
@@ -66,6 +66,6 @@ func createNCRequestFromStaticNCHelper(nc v1alpha.NetworkContainer, primaryIPPre
 			IPSubnet:         subnet,
 			GatewayIPAddress: nc.DefaultGateway,
 		},
-		NCStatus: nc.UpdateStatus,
+		NCStatus: nc.Status,
 	}, nil
 }
diff --git a/crd/nodenetworkconfig/api/v1alpha/nodenetworkconfig.go b/crd/nodenetworkconfig/api/v1alpha/nodenetworkconfig.go
@@ -77,13 +77,6 @@ type NodeNetworkConfigStatus struct {
 	NetworkContainers []NetworkContainer `json:"networkContainers,omitempty"`
 }
 
-// NetworkContainerStatus defines the status of the Network Containers
-type NetworkContainerStatus struct {
-	Timestamp       metav1.Time `json:"timestamp,omitempty"`
-	LatestStatus    string      `json:"latestStatus,omitempty"`
-	LatestErrorText string      `json:"latestErrorText,omitempty"`
-}
-
 // Scaler groups IP request params together
 type Scaler struct {
 	BatchSize               int64 `json:"batchSize,omitempty"`

diff --git a/crd/nodenetworkconfig/api/v1alpha/zz_generated.deepcopy.go b/crd/nodenetworkconfig/api/v1alpha/zz_generated.deepcopy.go
diff --git a/crd/nodenetworkconfig/manifests/acn.azure.com_nodenetworkconfigs.yaml b/crd/nodenetworkconfig/manifests/acn.azure.com_nodenetworkconfigs.yaml
@@ -133,18 +133,6 @@ spec:
                       description: NCType is the specific type of network this NC
                         represents.
                       type: string
-                    updateStatus:
-                      description: NetworkContainerStatus defines the status of the
-                        Network Containers
-                      properties:
-                        latestErrorText:
-                          type: string
-                        latestStatus:
-                          type: string
-                        timestamp:
-                          format: date-time
-                          type: string
-                      type: object
                     version:
                       default: 0
                       format: int64