Merge pull request #11971 from sbueringer/pr-ipaddressclaimv1beta2conditions

🌱 Add v1beta2 conditions to IPAddressClaim

Author: k8s-ci-robot

config/crd/bases/ipam.cluster.x-k8s.io_ipaddressclaims.yaml

@@ -22,6 +22,7 @@ import (
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1"
+	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 
 func (src *IPAddress) ConvertTo(dstRaw conversion.Hub) error {
@@ -67,6 +68,14 @@ func (src *IPAddressClaim) ConvertTo(dstRaw conversion.Hub) error {
 		}
 	}
 
+	// Manually restore data.
+	restored := &ipamv1.IPAddressClaim{}
+	if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
+		return err
+	}
+
+	dst.Status.V1Beta2 = restored.Status.V1Beta2
+
 	return nil
 }
 
@@ -90,6 +99,11 @@ func (dst *IPAddressClaim) ConvertFrom(srcRaw conversion.Hub) error {
 		dst.ObjectMeta.Labels[clusterv1.ClusterNameLabel] = src.Spec.ClusterName
 	}
 
+	// Preserve Hub data on down-conversion except for metadata
+	if err := utilconversion.MarshalData(src, dst); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -108,3 +122,7 @@ func (dst *IPAddressClaimList) ConvertFrom(srcRaw conversion.Hub) error {
 func Convert_v1beta1_IPAddressClaimSpec_To_v1alpha1_IPAddressClaimSpec(from *ipamv1.IPAddressClaimSpec, to *IPAddressClaimSpec, scope apiconversion.Scope) error {
 	return autoConvert_v1beta1_IPAddressClaimSpec_To_v1alpha1_IPAddressClaimSpec(from, to, scope)
 }
+
+func Convert_v1beta1_IPAddressClaimStatus_To_v1alpha1_IPAddressClaimStatus(from *ipamv1.IPAddressClaimStatus, to *IPAddressClaimStatus, scope apiconversion.Scope) error {
+	return autoConvert_v1beta1_IPAddressClaimStatus_To_v1alpha1_IPAddressClaimStatus(from, to, scope)
+}

exp/ipam/api/v1alpha1/conversion.go

@@ -45,6 +45,21 @@ type IPAddressClaimStatus struct {
 	// conditions summarises the current state of the IPAddressClaim
 	// +optional
 	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
+
+	// v1beta2 groups all the fields that will be added or modified in IPAddressClaim's status with the V1Beta2 version.
+	// +optional
+	V1Beta2 *IPAddressClaimV1Beta2Status `json:"v1beta2,omitempty"`
+}
+
+// IPAddressClaimV1Beta2Status groups all the fields that will be added or modified in IPAddressClaimStatus 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 IPAddressClaimV1Beta2Status struct {
+	// conditions represents the observations of a IPAddressClaim's current state.
+	// +optional
+	// +listType=map
+	// +listMapKey=type
+	// +kubebuilder:validation:MaxItems=32
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -81,6 +96,22 @@ func (m *IPAddressClaim) SetConditions(conditions clusterv1.Conditions) {
 	m.Status.Conditions = conditions
 }
 
+// GetV1Beta2Conditions returns the set of conditions for this object.
+func (m *IPAddressClaim) GetV1Beta2Conditions() []metav1.Condition {
+	if m.Status.V1Beta2 == nil {
+		return nil
+	}
+	return m.Status.V1Beta2.Conditions
+}
+
+// SetV1Beta2Conditions sets conditions for an API object.
+func (m *IPAddressClaim) SetV1Beta2Conditions(conditions []metav1.Condition) {
+	if m.Status.V1Beta2 == nil {
+		m.Status.V1Beta2 = &IPAddressClaimV1Beta2Status{}
+	}
+	m.Status.V1Beta2.Conditions = conditions
+}
+
 // +kubebuilder:object:root=true
 
 // IPAddressClaimList is a list of IPAddressClaims.