rename APIEndpoint to VPCEndpoint (#471)

Prajyot-Parab · web-flow · commit f6cd04c430b5 · 2021-12-09T00:02:11.000-08:00
Signed-off-by: Prajyot-Parab &lt;prajyot.parab2@ibm.com&gt;
diff --git a/api/v1alpha3/ibmvpccluster_types.go b/api/v1alpha3/ibmvpccluster_types.go
@@ -60,7 +60,7 @@ type IBMVPCClusterStatus struct {
 	// Bastion Instance `json:"bastion,omitempty"`
 	Ready       bool        `json:"ready"`
 	Subnet      Subnet      `json:"subnet,omitempty"`
-	APIEndpoint APIEndpoint `json:"apiEndpoint,omitempty"`
+	VPCEndpoint VPCEndpoint `json:"vpcEndpoint,omitempty"`
 }
 
 // VPC holds the VPC information
diff --git a/api/v1alpha3/types.go b/api/v1alpha3/types.go
@@ -30,8 +30,8 @@ type Subnet struct {
 	Zone          *string `json:"zone"`
 }
 
-// APIEndpoint describes a APIEndpoint
-type APIEndpoint struct {
+// VPCEndpoint describes a VPCEndpoint
+type VPCEndpoint struct {
 	Address *string `json:"address"`
 	FIPID   *string `json:"floatingIPID"`
 }
diff --git a/api/v1alpha3/zz_generated.deepcopy.go b/api/v1alpha3/zz_generated.deepcopy.go
diff --git a/api/v1alpha4/ibmvpccluster_types.go b/api/v1alpha4/ibmvpccluster_types.go
@@ -60,7 +60,7 @@ type IBMVPCClusterStatus struct {
 	// Bastion Instance `json:"bastion,omitempty"`
 	Ready       bool        `json:"ready"`
 	Subnet      Subnet      `json:"subnet,omitempty"`
-	APIEndpoint APIEndpoint `json:"apiEndpoint,omitempty"`
+	VPCEndpoint VPCEndpoint `json:"vpcEndpoint,omitempty"`
 }
 
 // VPC holds the VPC information
diff --git a/api/v1alpha4/types.go b/api/v1alpha4/types.go
@@ -30,8 +30,8 @@ type Subnet struct {
 	Zone          *string `json:"zone"`
 }
 
-// APIEndpoint describes a APIEndpoint
-type APIEndpoint struct {
+// VPCEndpoint describes a VPCEndpoint
+type VPCEndpoint struct {
 	Address *string `json:"address"`
 	FIPID   *string `json:"floatingIPID"`
 }
diff --git a/api/v1alpha4/zz_generated.deepcopy.go b/api/v1alpha4/zz_generated.deepcopy.go
diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go
@@ -188,7 +188,7 @@ func (s *ClusterScope) ensureFIPUnique(fipName string) (*vpcv1.FloatingIP, error
 
 // DeleteFloatingIP deletes a Floating IP associated with floating ip id
 func (s *ClusterScope) DeleteFloatingIP() error {
-	fipID := *s.IBMVPCCluster.Status.APIEndpoint.FIPID
+	fipID := *s.IBMVPCCluster.Status.VPCEndpoint.FIPID
 	if fipID != "" {
 		deleteFIPOption := &vpcv1.DeleteFloatingIPOptions{}
 		deleteFIPOption.SetID(fipID)
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcclusters.yaml
@@ -82,17 +82,6 @@ spec:
           status:
             description: IBMVPCClusterStatus defines the observed state of IBMVPCCluster
             properties:
-              apiEndpoint:
-                description: APIEndpoint describes a APIEndpoint
-                properties:
-                  address:
-                    type: string
-                  floatingIPID:
-                    type: string
-                required:
-                - address
-                - floatingIPID
-                type: object
               ready:
                 description: Bastion Instance `json:"bastion,omitempty"`
                 type: boolean
@@ -126,6 +115,17 @@ spec:
                 - id
                 - name
                 type: object
+              vpcEndpoint:
+                description: VPCEndpoint describes a VPCEndpoint
+                properties:
+                  address:
+                    type: string
+                  floatingIPID:
+                    type: string
+                required:
+                - address
+                - floatingIPID
+                type: object
             required:
             - ready
             type: object
@@ -198,17 +198,6 @@ spec:
           status:
             description: IBMVPCClusterStatus defines the observed state of IBMVPCCluster
             properties:
-              apiEndpoint:
-                description: APIEndpoint describes a APIEndpoint
-                properties:
-                  address:
-                    type: string
-                  floatingIPID:
-                    type: string
-                required:
-                - address
-                - floatingIPID
-                type: object
               ready:
                 description: Bastion Instance `json:"bastion,omitempty"`
                 type: boolean
@@ -242,6 +231,17 @@ spec:
                 - id
                 - name
                 type: object
+              vpcEndpoint:
+                description: VPCEndpoint describes a VPCEndpoint
+                properties:
+                  address:
+                    type: string
+                  floatingIPID:
+                    type: string
+                required:
+                - address
+                - floatingIPID
+                type: object
             required:
             - ready
             type: object
diff --git a/controllers/ibmvpccluster_controller.go b/controllers/ibmvpccluster_controller.go
@@ -140,7 +140,7 @@ func (r *IBMVPCClusterReconciler) reconcile(ctx context.Context, clusterScope *s
 				Port: 6443,
 			}
 
-			clusterScope.IBMVPCCluster.Status.APIEndpoint = infrastructurev1alpha4.APIEndpoint{
+			clusterScope.IBMVPCCluster.Status.VPCEndpoint = infrastructurev1alpha4.VPCEndpoint{
 				Address: fip.Address,
 				FIPID:   fip.ID,
 			}
diff --git a/controllers/ibmvpcmachine_controller.go b/controllers/ibmvpcmachine_controller.go
@@ -173,7 +173,7 @@ func (r *IBMVPCMachineReconciler) reconcileNormal(ctx context.Context, machineSc
 		machineScope.IBMVPCMachine.Spec.ProviderID = pointer.StringPtr(fmt.Sprintf("ibmvpc://%s/%s", machineScope.Machine.Spec.ClusterName, machineScope.IBMVPCMachine.Name))
 		if ok {
 			options := &vpcv1.AddInstanceNetworkInterfaceFloatingIPOptions{}
-			options.SetID(*machineScope.IBMVPCCluster.Status.APIEndpoint.FIPID)
+			options.SetID(*machineScope.IBMVPCCluster.Status.VPCEndpoint.FIPID)
 			options.SetInstanceID(*instance.ID)
 			options.SetNetworkInterfaceID(*instance.PrimaryNetworkInterface.ID)
 			floatingIP, _, err :=

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ type IBMVPCClusterStatus struct {`
`60`	`60`	// Bastion Instance `json:"bastion,omitempty"`
`61`	`61`	Ready bool `json:"ready"`
`62`	`62`	Subnet Subnet `json:"subnet,omitempty"`
`63`		- APIEndpoint APIEndpoint `json:"apiEndpoint,omitempty"`
	`63`	+ VPCEndpoint VPCEndpoint `json:"vpcEndpoint,omitempty"`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// VPC holds the VPC information`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ type Subnet struct {`
`30`	`30`	Zone *string `json:"zone"`
`31`	`31`	`}`
`32`	`32`
`33`		`-// APIEndpoint describes a APIEndpoint`
`34`		`-type APIEndpoint struct {`
	`33`	`+// VPCEndpoint describes a VPCEndpoint`
	`34`	`+type VPCEndpoint struct {`
`35`	`35`	Address *string `json:"address"`
`36`	`36`	FIPID *string `json:"floatingIPID"`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ func (r IBMVPCClusterReconciler) reconcile(ctx context.Context, clusterScope s`
`140`	`140`	`Port: 6443,`
`141`	`141`	`}`
`142`	`142`
`143`		`- clusterScope.IBMVPCCluster.Status.APIEndpoint = infrastructurev1alpha4.APIEndpoint{`
	`143`	`+ clusterScope.IBMVPCCluster.Status.VPCEndpoint = infrastructurev1alpha4.VPCEndpoint{`
`144`	`144`	`Address: fip.Address,`
`145`	`145`	`FIPID: fip.ID,`
`146`	`146`	`}`