Adopt CAPI v2beta2 status changes and respective controller changes for IBMPowerVSCluster (#2312)

* Add v1beta2 changes to IBMPowerVSCluster

* Controller changes for v1beta2

* Update test files to accomodate controller changes

Author: Karthik-K-N

api/v1beta1/zz_generated.conversion.go

@@ -180,3 +180,118 @@ const (
 	// Power VS infrastructure should be created as a part of cluster creation.
 	CreateInfrastructureAnnotation = "powervs.cluster.x-k8s.io/create-infra"
 )
+
+// IBMPowerVSCluster's Ready condition and corresponding reasons that will be used in v1Beta2 API version.
+const (
+	// IBMPowerVSClusterReadyV1Beta2Condition is true if the IBMPowerVSCluster's deletionTimestamp is not set, IBMPowerVSCluster's
+	// FailureDomainsReady, VCenterAvailable and ClusterModulesReady conditions are true.
+	IBMPowerVSClusterReadyV1Beta2Condition = capiv1beta1.ReadyV1Beta2Condition
+
+	// IBMPowerVSClusterReadyV1Beta2Reason surfaces when the IBMPowerVSCluster readiness criteria is met.
+	IBMPowerVSClusterReadyV1Beta2Reason = capiv1beta1.ReadyV1Beta2Reason
+
+	// IBMPowerVSClusterNotReadyV1Beta2Reason surfaces when the IBMPowerVSCluster readiness criteria is not met.
+	IBMPowerVSClusterNotReadyV1Beta2Reason = capiv1beta1.NotReadyV1Beta2Reason
+
+	// IBMPowerVSClusterReadyUnknownV1Beta2Reason surfaces when at least one of the IBMPowerVSCluster readiness criteria is unknown
+	// and none of the IBMPowerVSCluster readiness criteria is met.
+	IBMPowerVSClusterReadyUnknownV1Beta2Reason = capiv1beta1.ReadyUnknownV1Beta2Reason
+)
+
+const (
+	// WorkspaceReadyV1Beta2Condition reports on the successful reconciliation of a PowerVS workspace.
+	WorkspaceReadyV1Beta2Condition = "WorkspaceReady"
+
+	// WorkspaceReadyV1Beta2Reason surfaces when the PowerVS workspace is ready.
+	WorkspaceReadyV1Beta2Reason = capiv1beta1.ReadyV1Beta2Reason
+
+	// WorkspaceNotReadyV1Beta2Reason surfaces when PowerVS workspace is not ready.
+	WorkspaceNotReadyV1Beta2Reason = capiv1beta1.NotReadyV1Beta2Reason
+
+	// WorkspaceDeletingV1Beta2Reason surfaces when the PowerVS workspace is being deleted.
+	WorkspaceDeletingV1Beta2Reason = capiv1beta1.DeletingV1Beta2Reason
+
+	// NetworkReadyV1Beta2Condition reports on the successful reconciliation of a PowerVS network.
+	NetworkReadyV1Beta2Condition = "NetworkReady"
+
+	// NetworkReadyV1Beta2Reason surfaces when PowerVS workspace is ready.
+	NetworkReadyV1Beta2Reason = capiv1beta1.ReadyV1Beta2Reason
+
+	// NetworkNotReadyV1Beta2Reason surfaces when the PowerVS network is not ready.
+	NetworkNotReadyV1Beta2Reason = capiv1beta1.NotReadyV1Beta2Reason
+
+	// NetworkDeletingV1Beta2Reason surfaces when the PowerVS network is being deleted.
+	NetworkDeletingV1Beta2Reason = capiv1beta1.DeletingV1Beta2Reason
+
+	// VPCReadyV1Beta2Condition reports on the successful reconciliation of a VPC.
+	VPCReadyV1Beta2Condition = "VPCReady"
+
+	// VPCReadyV1Beta2Reason surfaces when the VPC is ready.
+	VPCReadyV1Beta2Reason = capiv1beta1.ReadyV1Beta2Reason
+
+	// VPCNotReadyV1Beta2Reason surfaces when VPC is not ready.
+	VPCNotReadyV1Beta2Reason = capiv1beta1.NotReadyV1Beta2Reason
+
+	// VPCDeletingV1Beta2Reason surfaces when the VPC is being deleted.
+	VPCDeletingV1Beta2Reason = capiv1beta1.DeletingV1Beta2Reason
+
+	// VPCSubnetReadyV1Beta2Condition reports on the successful reconciliation of a VPC subnet.
+	VPCSubnetReadyV1Beta2Condition = "VPCSubnetReady"
+
+	// VPCSubnetReadyV1Beta2Reason surfaces when the VPC subnet is ready.
+	VPCSubnetReadyV1Beta2Reason = capiv1beta1.ReadyV1Beta2Reason
+
+	// VPCSubnetNotReadyV1Beta2Reason surfaces when VPC subnet is not ready.
+	VPCSubnetNotReadyV1Beta2Reason = capiv1beta1.NotReadyV1Beta2Reason
+
+	// VPCSubnetDeletingV1Beta2Reason surfaces when the VPC subnet is being deleted.
+	VPCSubnetDeletingV1Beta2Reason = capiv1beta1.DeletingV1Beta2Reason
+
+	// VPCSecurityGroupReadyV1Beta2Condition reports on the successful reconciliation of a VPC Security Group.
+	VPCSecurityGroupReadyV1Beta2Condition = "VPCSecurityGroupReady"
+
+	// VPCSecurityGroupReadyV1Beta2Reason surfaces when the VPC security group is ready.
+	VPCSecurityGroupReadyV1Beta2Reason = capiv1beta1.ReadyV1Beta2Reason
+
+	// VPCSecurityGroupNotReadyV1Beta2Reason surfaces when VPC security group is not ready.
+	VPCSecurityGroupNotReadyV1Beta2Reason = capiv1beta1.NotReadyV1Beta2Reason
+
+	// VPCSecurityGroupDeletingV1Beta2Reason surfaces when the VPC security group is being deleted.
+	VPCSecurityGroupDeletingV1Beta2Reason = capiv1beta1.DeletingV1Beta2Reason
+
+	// TransitGatewayReadyV1Beta2Condition reports on the successful reconciliation of a transit gateway.
+	TransitGatewayReadyV1Beta2Condition = "TransitGatewayReady"
+
+	// TransitGatewayReadyV1Beta2Reason surfaces when the transit gateway is ready.
+	TransitGatewayReadyV1Beta2Reason = capiv1beta1.ReadyV1Beta2Reason
+
+	// TransitGatewayNotReadyV1Beta2Reason surfaces when the transit gateway is not ready.
+	TransitGatewayNotReadyV1Beta2Reason = capiv1beta1.NotReadyV1Beta2Reason
+
+	// TransitGatewayDeletingV1Beta2Reason surfaces when the transit gateway is being deleted.
+	TransitGatewayDeletingV1Beta2Reason = capiv1beta1.DeletingV1Beta2Reason
+
+	// VPCLoadBalancerReadyV1Beta2Condition reports on the successful reconciliation of a VPC LoadBalancer.
+	VPCLoadBalancerReadyV1Beta2Condition = "LoadBalancerReady"
+
+	// VPCLoadBalancerReadyV1Beta2Reason surfaces when the VPC LoadBalancer is ready.
+	VPCLoadBalancerReadyV1Beta2Reason = capiv1beta1.ReadyV1Beta2Reason
+
+	// VPCLoadBalancerNotReadyV1Beta2Reason surfaces when VPC LoadBalancer is not ready.
+	VPCLoadBalancerNotReadyV1Beta2Reason = capiv1beta1.NotReadyV1Beta2Reason
+
+	// VPCLoadBalancerDeletingV1Beta2Reason surfaces when the VPC LoadBalancer is being deleted.
+	VPCLoadBalancerDeletingV1Beta2Reason = capiv1beta1.DeletingV1Beta2Reason
+
+	// COSInstanceReadyV1Beta2Condition reports on the successful reconciliation of a COS instance.
+	COSInstanceReadyV1Beta2Condition = "COSInstanceReady"
+
+	// COSInstanceReadyV1Beta2Reason surfaces when the COS instance is ready.
+	COSInstanceReadyV1Beta2Reason = capiv1beta1.ReadyV1Beta2Reason
+
+	// COSInstanceNotReadyV1Beta2Reason surfaces when the COS instance is not ready.
+	COSInstanceNotReadyV1Beta2Reason = capiv1beta1.NotReadyV1Beta2Reason
+
+	// COSInstanceDeletingV1Beta2Reason surfaces when the COS instance is being deleted.
+	COSInstanceDeletingV1Beta2Reason = capiv1beta1.DeletingV1Beta2Reason
+)

api/v1beta2/conditions_consts.go

@@ -232,6 +232,21 @@ type IBMPowerVSClusterStatus struct {
 
 	// Conditions defines current service state of the IBMPowerVSCluster.
 	Conditions capiv1beta1.Conditions `json:"conditions,omitempty"`
+
+	// v1beta2 groups all the fields that will be added or modified in IBMPowerVSCluster's status with the V1Beta2 version.
+	// +optional
+	V1Beta2 *IBMPowerVSClusterV1Beta2Status `json:"v1beta2,omitempty"`
+}
+
+// IBMPowerVSClusterV1Beta2Status groups all the fields that will be added or modified in IBMPowerVSCluster with the V1Beta2 version.
+// See https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20240916-improve-status-in-CAPI-resources.md for more context.
+type IBMPowerVSClusterV1Beta2Status struct {
+	// conditions represents the observations of a DevCluster's current state.
+	// +optional
+	// +listType=map
+	// +listMapKey=type
+	// +kubebuilder:validation:MaxItems=32
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -329,6 +344,22 @@ func (r *IBMPowerVSCluster) SetConditions(conditions capiv1beta1.Conditions) {
 	r.Status.Conditions = conditions
 }
 
+// GetV1Beta2Conditions returns the set of conditions for this object.
+func (r *IBMPowerVSCluster) GetV1Beta2Conditions() []metav1.Condition {
+	if r.Status.V1Beta2 == nil {
+		return nil
+	}
+	return r.Status.V1Beta2.Conditions
+}
+
+// SetV1Beta2Conditions sets conditions for an API object.
+func (r *IBMPowerVSCluster) SetV1Beta2Conditions(conditions []metav1.Condition) {
+	if r.Status.V1Beta2 == nil {
+		r.Status.V1Beta2 = &IBMPowerVSClusterV1Beta2Status{}
+	}
+	r.Status.V1Beta2.Conditions = conditions
+}
+
 // Set sets the details of the resource.
 func (rf *ResourceReference) Set(resource ResourceReference) {
 	rf.ID = resource.ID