✨ Add v1beta2 conditions infrastructure to AWSCluster

api/v1beta1/awscluster_conversion.go

@@ -150,6 +150,9 @@ func (src *AWSCluster) ConvertTo(dstRaw conversion.Hub) error {
 		}
 	}
 
+	// Restore V1Beta3 status from annotations.
+	dst.Status.V1Beta3 = restored.Status.V1Beta3
+
 	return nil
 }
 
@@ -230,3 +233,10 @@ func (r *AWSClusterList) ConvertFrom(srcRaw conversion.Hub) error {
 func Convert_v1beta2_SubnetSpec_To_v1beta1_SubnetSpec(in *infrav1.SubnetSpec, out *SubnetSpec, s apiconversion.Scope) error {
 	return autoConvert_v1beta2_SubnetSpec_To_v1beta1_SubnetSpec(in, out, s)
 }
+
+// Convert_v1beta2_AWSClusterStatus_To_v1beta1_AWSClusterStatus handles the V1Beta3 field
+// that doesn't exist in v1beta1. The V1Beta3 conditions are dropped during down-conversion
+// and will be restored from annotations during up-conversion.
+func Convert_v1beta2_AWSClusterStatus_To_v1beta1_AWSClusterStatus(in *infrav1.AWSClusterStatus, out *AWSClusterStatus, s apiconversion.Scope) error {
+	return autoConvert_v1beta2_AWSClusterStatus_To_v1beta1_AWSClusterStatus(in, out, s)
+}

api/v1beta2/awscluster_types.go

@@ -281,6 +281,23 @@ type AWSClusterStatus struct {
 	FailureDomains clusterv1beta1.FailureDomains `json:"failureDomains,omitempty"`
 	Bastion        *Instance                     `json:"bastion,omitempty"`
 	Conditions     clusterv1beta1.Conditions     `json:"conditions,omitempty"`
+
+	// v1beta3 groups all the fields that will be added or modified in AWSCluster's status with the V1Beta3 version.
+	// +optional
+	V1Beta3 *AWSClusterV1Beta3Status `json:"v1beta3,omitempty"`
+}
+
+// AWSClusterV1Beta3Status groups all the fields that will be added or modified in AWSClusterStatus with the V1Beta3 version.
+// See https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20240916-improve-status-in-CAPI-resources.md for more context.
+type AWSClusterV1Beta3Status struct {
+	// Conditions represents the observations of an AWSCluster's current state.
+	// Known condition types are Ready, VpcReady, SubnetsReady, InternetGatewayReady, NatGatewaysReady,
+	// RouteTablesReady, ClusterSecurityGroupsReady, BastionHostReady, LoadBalancerReady, and Paused.
+	// +optional
+	// +listType=map
+	// +listMapKey=type
+	// +kubebuilder:validation:MaxItems=32
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 // S3Bucket defines a supporting S3 bucket for the cluster, currently can be optionally used for Ignition.
@@ -355,6 +372,22 @@ func (r *AWSCluster) SetConditions(conditions clusterv1beta1.Conditions) {
 	r.Status.Conditions = conditions
 }
 
+// GetV1Beta3Conditions returns the set of conditions for this object.
+func (r *AWSCluster) GetV1Beta3Conditions() []metav1.Condition {
+	if r.Status.V1Beta3 == nil {
+		return nil
+	}
+	return r.Status.V1Beta3.Conditions
+}
+
+// SetV1Beta3Conditions sets conditions for an API object.
+func (r *AWSCluster) SetV1Beta3Conditions(conditions []metav1.Condition) {
+	if r.Status.V1Beta3 == nil {
+		r.Status.V1Beta3 = &AWSClusterV1Beta3Status{}
+	}
+	r.Status.V1Beta3.Conditions = conditions
+}
+
 func init() {
 	SchemeBuilder.Register(&AWSCluster{}, &AWSClusterList{})
 }

api/v1beta2/conditions_consts_v1beta3.go

@@ -0,0 +1,114 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta2
+
+import clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
+
+// AWSCluster's v1beta3 conditions and corresponding reasons.
+// These will be used with the V1Beta3 API version.
+
+// AWSCluster's Ready condition and corresponding reasons that will be used in v1Beta3 API version.
+const (
+	// AWSClusterReadyCondition is true if the AWSCluster's deletionTimestamp is not set, and all
+	// infrastructure conditions (VpcReady, SubnetsReady, etc.) are true.
+	AWSClusterReadyCondition = clusterv1beta1.ReadyV1Beta2Condition
+
+	// AWSClusterReadyReason surfaces when the AWSCluster readiness criteria is met.
+	AWSClusterReadyReason = clusterv1beta1.ReadyV1Beta2Reason
+
+	// AWSClusterNotReadyReason surfaces when the AWSCluster readiness criteria is not met.
+	AWSClusterNotReadyReason = clusterv1beta1.NotReadyV1Beta2Reason
+
+	// AWSClusterReadyUnknownReason surfaces when at least one AWSCluster readiness criteria is unknown
+	// and no AWSCluster readiness criteria is not met.
+	AWSClusterReadyUnknownReason = clusterv1beta1.ReadyUnknownV1Beta2Reason
+)
+
+// AWSCluster's VpcReady condition and corresponding reasons that will be used in v1Beta3 API version.
+const (
+	// AWSClusterVpcReadyCondition documents the status of the VPC for an AWSCluster.
+	AWSClusterVpcReadyCondition = "VpcReady"
+
+	// AWSClusterVpcReadyReason surfaces when the VPC for an AWSCluster is ready.
+	AWSClusterVpcReadyReason = clusterv1beta1.ReadyV1Beta2Reason
+
+	// AWSClusterVpcNotReadyReason surfaces when the VPC for an AWSCluster is not ready.
+	AWSClusterVpcNotReadyReason = clusterv1beta1.NotReadyV1Beta2Reason
+
+	// AWSClusterVpcDeletingReason surfaces when the VPC for an AWSCluster is being deleted.
+	AWSClusterVpcDeletingReason = clusterv1beta1.DeletingV1Beta2Reason
+)
+
+// AWSCluster's SubnetsReady condition and corresponding reasons that will be used in v1Beta3 API version.
+const (
+	// AWSClusterSubnetsReadyCondition documents the status of subnets for an AWSCluster.
+	AWSClusterSubnetsReadyCondition = "SubnetsReady"
+
+	// AWSClusterSubnetsReadyReason surfaces when the subnets for an AWSCluster are ready.
+	AWSClusterSubnetsReadyReason = clusterv1beta1.ReadyV1Beta2Reason
+
+	// AWSClusterSubnetsNotReadyReason surfaces when the subnets for an AWSCluster are not ready.
+	AWSClusterSubnetsNotReadyReason = clusterv1beta1.NotReadyV1Beta2Reason
+
+	// AWSClusterSubnetsDeletingReason surfaces when the subnets for an AWSCluster are being deleted.
+	AWSClusterSubnetsDeletingReason = clusterv1beta1.DeletingV1Beta2Reason
+)
+
+// AWSCluster's LoadBalancerReady condition and corresponding reasons that will be used in v1Beta3 API version.
+const (
+	// AWSClusterLoadBalancerReadyCondition documents the status of the load balancer for an AWSCluster.
+	AWSClusterLoadBalancerReadyCondition = "LoadBalancerReady"
+
+	// AWSClusterLoadBalancerReadyReason surfaces when the load balancer for an AWSCluster is ready.
+	AWSClusterLoadBalancerReadyReason = clusterv1beta1.ReadyV1Beta2Reason
+
+	// AWSClusterLoadBalancerNotReadyReason surfaces when the load balancer for an AWSCluster is not ready.
+	AWSClusterLoadBalancerNotReadyReason = clusterv1beta1.NotReadyV1Beta2Reason
+
+	// AWSClusterLoadBalancerDeletingReason surfaces when the load balancer for an AWSCluster is being deleted.
+	AWSClusterLoadBalancerDeletingReason = clusterv1beta1.DeletingV1Beta2Reason
+)
+
+// AWSCluster's ClusterSecurityGroupsReady condition and corresponding reasons that will be used in v1Beta3 API version.
+const (
+	// AWSClusterSecurityGroupsReadyCondition documents the status of security groups for an AWSCluster.
+	AWSClusterSecurityGroupsReadyCondition = "ClusterSecurityGroupsReady"
+
+	// AWSClusterSecurityGroupsReadyReason surfaces when the security groups for an AWSCluster are ready.
+	AWSClusterSecurityGroupsReadyReason = clusterv1beta1.ReadyV1Beta2Reason
+
+	// AWSClusterSecurityGroupsNotReadyReason surfaces when the security groups for an AWSCluster are not ready.
+	AWSClusterSecurityGroupsNotReadyReason = clusterv1beta1.NotReadyV1Beta2Reason
+
+	// AWSClusterSecurityGroupsDeletingReason surfaces when the security groups for an AWSCluster are being deleted.
+	AWSClusterSecurityGroupsDeletingReason = clusterv1beta1.DeletingV1Beta2Reason
+)
+
+// AWSCluster's BastionHostReady condition and corresponding reasons that will be used in v1Beta3 API version.
+const (
+	// AWSClusterBastionHostReadyCondition documents the status of the bastion host for an AWSCluster.
+	AWSClusterBastionHostReadyCondition = "BastionHostReady"
+
+	// AWSClusterBastionHostReadyReason surfaces when the bastion host for an AWSCluster is ready.
+	AWSClusterBastionHostReadyReason = clusterv1beta1.ReadyV1Beta2Reason
+
+	// AWSClusterBastionHostNotReadyReason surfaces when the bastion host for an AWSCluster is not ready.
+	AWSClusterBastionHostNotReadyReason = clusterv1beta1.NotReadyV1Beta2Reason
+
+	// AWSClusterBastionHostDeletingReason surfaces when the bastion host for an AWSCluster is being deleted.
+	AWSClusterBastionHostDeletingReason = clusterv1beta1.DeletingV1Beta2Reason
+)

config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusters.yaml

@@ -3159,6 +3159,76 @@ spec:
               ready:
                 default: false
                 type: boolean
+              v1beta3:
+                description: v1beta3 groups all the fields that will be added or modified
+                  in AWSCluster's status with the V1Beta3 version.
+                properties:
+                  conditions:
+                    description: |-
+                      Conditions represents the observations of an AWSCluster's current state.
+                      Known condition types are Ready, VpcReady, SubnetsReady, InternetGatewayReady, NatGatewaysReady,
+                      RouteTablesReady, ClusterSecurityGroupsReady, BastionHostReady, LoadBalancerReady, and Paused.
+                    items:
+                      description: Condition contains details for one aspect of the
+                        current state of this API Resource.
+                      properties:
+                        lastTransitionTime:
+                          description: |-
+                            lastTransitionTime is the last time the condition transitioned from one status to another.
+                            This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                          format: date-time
+                          type: string
+                        message:
+                          description: |-
+                            message is a human readable message indicating details about the transition.
+                            This may be an empty string.
+                          maxLength: 32768
+                          type: string
+                        observedGeneration:
+                          description: |-
+                            observedGeneration represents the .metadata.generation that the condition was set based upon.
+                            For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                            with respect to the current state of the instance.
+                          format: int64
+                          minimum: 0
+                          type: integer
+                        reason:
+                          description: |-
+                            reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                            Producers of specific condition types may define expected values and meanings for this field,
+                            and whether the values are considered a guaranteed API.
+                            The value should be a CamelCase string.
+                            This field may not be empty.
+                          maxLength: 1024
+                          minLength: 1
+                          pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                          type: string
+                        status:
+                          description: status of the condition, one of True, False,
+                            Unknown.
+                          enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                          type: string
+                        type:
+                          description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                          maxLength: 316
+                          pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                          type: string
+                      required:
+                      - lastTransitionTime
+                      - message
+                      - reason
+                      - status
+                      - type
+                      type: object
+                    maxItems: 32
+                    type: array
+                    x-kubernetes-list-map-keys:
+                    - type
+                    x-kubernetes-list-type: map
+                type: object
             required:
             - ready
             type: object