Skip to content

Commit b54469d

Browse files
committed
fix fuzzy conversion tests
1 parent 9960dda commit b54469d

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

exp/ipam/api/v1alpha1/conversion.go

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ func (src *IPAddressClaim) ConvertTo(dstRaw conversion.Hub) error {
5454
return err
5555
}
5656

57-
dst.Spec.ClusterName = src.ObjectMeta.Labels["cluster.x-k8s.io/cluster-name"]
57+
if src.ObjectMeta.Labels != nil {
58+
dst.Spec.ClusterName = src.ObjectMeta.Labels["cluster.x-k8s.io/cluster-name"]
59+
if dst.ObjectMeta.Annotations != nil && dst.ObjectMeta.Annotations["conversion.cluster.x-k8s.io/cluster-name-label-set"] != "" {
60+
delete(src.ObjectMeta.Labels, "cluster.x-k8s.io/cluster-name")
61+
delete(src.ObjectMeta.Annotations, "conversion.cluster.x-k8s.io/cluster-name-label-set")
62+
}
63+
}
5864

5965
return nil
6066
}
@@ -67,6 +73,15 @@ func (dst *IPAddressClaim) ConvertFrom(srcRaw conversion.Hub) error {
6773
}
6874

6975
if src.Spec.ClusterName != "" {
76+
if dst.ObjectMeta.Labels == nil {
77+
dst.ObjectMeta.Labels = map[string]string{}
78+
}
79+
if _, ok := dst.ObjectMeta.Labels["cluster.x-k8s.io/cluster-name"]; !ok {
80+
if dst.ObjectMeta.Annotations == nil {
81+
dst.ObjectMeta.Annotations = map[string]string{}
82+
}
83+
dst.ObjectMeta.Annotations["conversion.cluster.x-k8s.io/cluster-name-label-set"] = "false"
84+
}
7085
dst.ObjectMeta.Labels["cluster.x-k8s.io/cluster-name"] = src.Spec.ClusterName
7186
}
7287

0 commit comments

Comments
 (0)