🌱 ipam: add spec.clusterName to IPAddressClaim (#10182)

* ipam: add spec.clusterName to IPAddressClaim

* fix fuzzy conversion tests and omit empty spec.ClusterName

Co-authored-by: Stefan Bueringer <[email protected]>

---------

Co-authored-by: Stefan Bueringer <[email protected]>

Author: schrej

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

@@ -17,8 +17,10 @@ limitations under the License.
 package v1alpha1
 
 import (
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	ipamv1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1"
 )
 
@@ -49,13 +51,46 @@ func (dst *IPAddressList) ConvertFrom(srcRaw conversion.Hub) error {
 func (src *IPAddressClaim) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*ipamv1.IPAddressClaim)
 
-	return Convert_v1alpha1_IPAddressClaim_To_v1beta1_IPAddressClaim(src, dst, nil)
+	if err := Convert_v1alpha1_IPAddressClaim_To_v1beta1_IPAddressClaim(src, dst, nil); err != nil {
+		return err
+	}
+
+	if src.ObjectMeta.Labels != nil {
+		dst.Spec.ClusterName = src.ObjectMeta.Labels[clusterv1.ClusterNameLabel]
+		if dst.ObjectMeta.Annotations != nil {
+			if clusterNameLabelWasSet, ok := dst.ObjectMeta.Annotations["conversion.cluster.x-k8s.io/cluster-name-label-set"]; ok {
+				if clusterNameLabelWasSet == "false" {
+					delete(dst.ObjectMeta.Labels, clusterv1.ClusterNameLabel)
+				}
+				delete(dst.ObjectMeta.Annotations, "conversion.cluster.x-k8s.io/cluster-name-label-set")
+			}
+		}
+	}
+
+	return nil
 }
 
 func (dst *IPAddressClaim) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*ipamv1.IPAddressClaim)
 
-	return Convert_v1beta1_IPAddressClaim_To_v1alpha1_IPAddressClaim(src, dst, nil)
+	if err := Convert_v1beta1_IPAddressClaim_To_v1alpha1_IPAddressClaim(src, dst, nil); err != nil {
+		return err
+	}
+
+	if src.Spec.ClusterName != "" {
+		if dst.ObjectMeta.Labels == nil {
+			dst.ObjectMeta.Labels = map[string]string{}
+		}
+		if _, ok := dst.ObjectMeta.Labels[clusterv1.ClusterNameLabel]; !ok {
+			if dst.ObjectMeta.Annotations == nil {
+				dst.ObjectMeta.Annotations = map[string]string{}
+			}
+			dst.ObjectMeta.Annotations["conversion.cluster.x-k8s.io/cluster-name-label-set"] = "false"
+		}
+		dst.ObjectMeta.Labels[clusterv1.ClusterNameLabel] = src.Spec.ClusterName
+	}
+
+	return nil
 }
 
 func (src *IPAddressClaimList) ConvertTo(dstRaw conversion.Hub) error {
@@ -69,3 +104,7 @@ func (dst *IPAddressClaimList) ConvertFrom(srcRaw conversion.Hub) error {
 
 	return Convert_v1beta1_IPAddressClaimList_To_v1alpha1_IPAddressClaimList(src, dst, nil)
 }
+
+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)
+}

exp/ipam/api/v1alpha1/conversion.go

@@ -25,6 +25,10 @@ import (
 
 // IPAddressClaimSpec is the desired state of an IPAddressClaim.
 type IPAddressClaimSpec struct {
+	// ClusterName is the name of the Cluster this object belongs to.
+	// +optional
+	ClusterName string `json:"clusterName,omitempty"`
+
 	// PoolRef is a reference to the pool from which an IP address should be created.
 	PoolRef corev1.TypedLocalObjectReference `json:"poolRef"`
 }