VPC: Extend VPC related API's for v2 VPC reconcile

Extend the API's used in the v2 support of reconciling
VPC for the VPCCluster support.

Author: cjschaef

api/v1beta1/zz_generated.conversion.go

@@ -113,7 +113,11 @@ type VPCNetworkSpec struct {
 	// +optional
 	ResourceGroup *string `json:"resourceGroup,omitempty"`
 
-	// TODO(cjschaef): Complete spec definition (SecurityGroups, VPC)
+	// vpc defines the IBM Cloud VPC.
+	// +optional
+	VPC *VPCResource `json:"vpc,omitempty"`
+
+	// TODO(cjschaef): Complete spec definition (SecurityGroups, etc.)
 }
 
 // VPCSecurityGroupStatus defines a vpc security group resource status with its id and respective rule's ids.
@@ -146,11 +150,22 @@ type VPCLoadBalancerStatus struct {
 type IBMVPCClusterStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
+	// dep: rely on Network instead.
 	VPC VPC `json:"vpc,omitempty"`
 
+	// network is the status of the VPC network resources.
+	// +optional
+	Network *VPCNetworkStatus `json:"network,omitempty"`
+
 	// Ready is true when the provider resource is ready.
 	// +optional
-	Ready       bool        `json:"ready"`
+	// +kubebuilder:default=false
+	Ready bool `json:"ready"`
+
+	// resourceGroup is the status of the cluster's Resource Group.
+	// +optional
+	ResourceGroup *ResourceStatus `json:"resourceGroup,omitempty"`
+
 	Subnet      Subnet      `json:"subnet,omitempty"`
 	VPCEndpoint VPCEndpoint `json:"vpcEndpoint,omitempty"`
 
@@ -163,6 +178,45 @@ type IBMVPCClusterStatus struct {
 	Conditions capiv1beta1.Conditions `json:"conditions,omitempty"`
 }
 
+// VPCNetworkStatus provides details on the status of VPC network resources.
+type VPCNetworkStatus struct {
+	// resourceGroup references the Resource Group for Network resources for the cluster.
+	// This can be the same or unique from the cluster's Resource Group.
+	// +optional
+	ResourceGroup *ResourceStatus `json:"resourceGroup,omitempty"`
+
+	// vpc references the IBM Cloud VPC.
+	// +optional
+	VPC *VPCResourceStatus `json:"vpc,omitempty"`
+}
+
+// VPCResourceStatus identifies a VPC resource by id (and name) and whether it is ready.
+type VPCResourceStatus struct {
+	// id defines the IBM Cloud ID of the resource.
+	// +required
+	ID string `json:"id"`
+
+	// name defines the name of the resource.
+	// +optional
+	Name *string `json:"name,omitempty"`
+
+	// ready defines whether the IBM Cloud VPC resource is ready.
+	// +required
+	// +kubebuilder:default=false
+	Ready bool `json:"ready"`
+}
+
+// Set sets the VPCResourceStatus fields.
+func (s *VPCResourceStatus) Set(resource VPCResourceStatus) {
+	s.ID = resource.ID
+	// Set the name if it hasn't been, or the resource.Name won't remove it (nil).
+	if s.Name == nil && resource.Name != nil {
+		s.Name = resource.Name
+	}
+	s.Name = resource.Name
+	s.Ready = resource.Ready
+}
+
 // VPC holds the VPC information.
 type VPC struct {
 	ID   string `json:"id"`

api/v1beta2/ibmvpccluster_types.go

@@ -400,3 +400,53 @@ type VPCEndpoint struct {
 	// +optional
 	LBID *string `json:"loadBalancerIPID,omitempty"`
 }
+
+// GenericResourceReference represents a generic IBM Cloud resource.
+type GenericResourceReference struct {
+	// id defines the generic IBM Cloud resource ID.
+	// +required
+	ID string `json:"id"`
+
+	// name defines the generic IBM Cloud resource name.
+	// +optional
+	Name *string `json:"name,omitempty"`
+}
+
+// ResourceStatus identifies a resource by id (and name) and whether it is ready.
+type ResourceStatus struct {
+	// id defines the Id of the IBM Cloud resource status.
+	// +required
+	ID string `json:"id"`
+
+	// name defines the name of the IBM Cloud resource status.
+	// +optional
+	Name *string `json:"name,omitempty"`
+
+	// ready defines whether the IBM Cloud resource is ready.
+	// +required
+	Ready bool `json:"ready"`
+}
+
+// Set sets the ResourceStatus fields.
+func (s *ResourceStatus) Set(resource ResourceStatus) {
+	s.ID = resource.ID
+	// Set the name if it hasn't been, or the incoming name won't remove it (nil).
+	if s.Name == nil && resource.Name != nil {
+		s.Name = resource.Name
+	}
+	s.Ready = resource.Ready
+}
+
+// VPCResource represents a VPC resource.
+// +kubebuilder:validation:XValidation:rule="has(self.id) || has(self.name)",message="an id or name must be provided"
+type VPCResource struct {
+	// id of the resource.
+	// +kubebuilder:validation:MinLength=1
+	// +optional
+	ID *string `json:"id,omitempty"`
+
+	// name of the resource.
+	// +kubebuilder:validation:MinLength=1
+	// +optional
+	Name *string `json:"name,omitempty"`
+}