Merge pull request vmware-tanzu#828 from seanpang-vmware/removeip

Remove vpcPath from networkinfo CRD

build/yaml/crd/nsx.vmware.com_networkinfos.yaml

@@ -51,9 +51,6 @@ spec:
                   items:
                     type: string
                   type: array
-                vpcPath:
-                  description: NSX Policy path for VPC.
-                  type: string
               required:
               - defaultSNATIP
               - name

build/yaml/samples/nsx_v1alpha1_networkinfo.yaml

@@ -15,4 +15,3 @@ vpcs:
   name: vpc-d110d5aa-006d-4b59-9caf-424a4fba932c--kube-system
   privateIPv4CIDRs:
   - 172.26.0.0/16
-  vpcPath: /orgs/default/projects/project-quality/vpcs/19a8a52e-beb0-4396-91ce-5821a15a43db

pkg/controllers/networkinfo/networkinfo_controller.go

@@ -180,6 +180,24 @@ func (r *NetworkInfoReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 			log.Info("finalizers cannot be recognized", "NetworkInfo", req.NamespacedName)
 		}
 	}
+
+	state := &v1alpha1.VPCState{
+		Name:                    *createdVpc.DisplayName,
+		DefaultSNATIP:           snatIP,
+		LoadBalancerIPAddresses: cidr,
+		PrivateIPs:              privateIPs,
+	}
+
+	// AKO needs to know the AVI subnet path created by NSX
+	setVPCNetworkConfigurationStatusWithLBS(ctx, r.Client, ncName, state.Name, path, nsxLBSPath, *createdVpc.Path)
+	r.StatusUpdater.UpdateSuccess(ctx, networkInfoCR, setNetworkInfoVPCStatus, state)
+
+	if retryWithSystemVPC {
+		setNSNetworkReadyCondition(ctx, r.Client, req.Namespace, systemNSCondition)
+		return common.ResultRequeueAfter60sec, nil
+	}
+
+	setNSNetworkReadyCondition(ctx, r.Client, req.Namespace, nsMsgVPCIsReady.getNSNetworkCondition())
 	return common.ResultNormal, nil
 }