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

seanpang-vmware · web-flow · commit d64736d5bd74 · 2024-11-19T11:05:41.000+08:00
Remove vpcPath from networkinfo CRD
diff --git a/build/yaml/crd/vpc/crd.nsx.vmware.com_networkinfos.yaml b/build/yaml/crd/vpc/crd.nsx.vmware.com_networkinfos.yaml
@@ -55,9 +55,6 @@ spec:
                   items:
                     type: string
                   type: array
-                vpcPath:
-                  description: NSX Policy path for VPC.
-                  type: string
               required:
               - defaultSNATIP
               - name
diff --git a/build/yaml/samples/nsx_v1alpha1_networkinfo.yaml b/build/yaml/samples/nsx_v1alpha1_networkinfo.yaml
@@ -12,5 +12,4 @@ vpcs:
   loadBalancerIPAddresses: 172.26.0.0/26
   name: vpc-d110d5aa-006d-4b59-9caf-424a4fba932c--kube-system
   privateIPs:
-  - 172.26.0.0/16
-  vpcPath: /orgs/default/projects/project-quality/vpcs/19a8a52e-beb0-4396-91ce-5821a15a43db
+  - 172.26.0.0/16
diff --git a/pkg/apis/vpc/v1alpha1/networkinfo_types.go b/pkg/apis/vpc/v1alpha1/networkinfo_types.go
@@ -39,8 +39,6 @@ type VPCState struct {
 	LoadBalancerIPAddresses string `json:"loadBalancerIPAddresses,omitempty"`
 	// Private CIDRs used for the VPC.
 	PrivateIPs []string `json:"privateIPs,omitempty"`
-	// NSX Policy path for VPC.
-	VPCPath string `json:"vpcPath,omitempty"`
 }
 
 func init() {
diff --git a/pkg/controllers/networkinfo/networkinfo_controller.go b/pkg/controllers/networkinfo/networkinfo_controller.go
@@ -322,7 +322,6 @@ func (r *NetworkInfoReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		DefaultSNATIP:           snatIP,
 		LoadBalancerIPAddresses: cidr,
 		PrivateIPs:              privateIPs,
-		VPCPath:                 *createdVpc.Path,
 	}
 
 	// AKO needs to know the AVI subnet path created by NSX

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@ type VPCState struct {`
`39`	`39`	LoadBalancerIPAddresses string `json:"loadBalancerIPAddresses,omitempty"`
`40`	`40`	`// Private CIDRs used for the VPC.`
`41`	`41`	PrivateIPs []string `json:"privateIPs,omitempty"`
`42`		`- // NSX Policy path for VPC.`
`43`		- VPCPath string `json:"vpcPath,omitempty"`
`44`	`42`	`}`
`45`	`43`
`46`	`44`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,6 @@ func (r *NetworkInfoReconciler) Reconcile(ctx context.Context, req ctrl.Request)`
`322`	`322`	`DefaultSNATIP: snatIP,`
`323`	`323`	`LoadBalancerIPAddresses: cidr,`
`324`	`324`	`PrivateIPs: privateIPs,`
`325`		`- VPCPath: *createdVpc.Path,`
`326`	`325`	`}`
`327`	`326`
`328`	`327`	`// AKO needs to know the AVI subnet path created by NSX`