Merge pull request #148 from maxdrib/conversion-acc-dom

Addressing bug where account/domain was lost with v1beta2 to v1beta1 conversion

Author: maxdrib

api/v1beta1/conversion.go

@@ -18,6 +18,7 @@ package v1beta1
 
 import (
 	"context"
+	"fmt"
 
 	corev1 "k8s.io/api/core/v1"
 	conv "k8s.io/apimachinery/pkg/conversion"
@@ -49,8 +50,13 @@ func Convert_v1beta1_CloudStackCluster_To_v1beta2_CloudStackCluster(in *CloudSta
 
 //nolint:golint,revive,stylecheck
 func Convert_v1beta2_CloudStackCluster_To_v1beta1_CloudStackCluster(in *v1beta2.CloudStackCluster, out *CloudStackCluster, scope conv.Scope) error {
+	if len(in.Spec.FailureDomains) < 1 {
+		return fmt.Errorf("v1beta2 to v1beta1 conversion not supported when < 1 failure domain is provided. Input CloudStackCluster spec %s", in.Spec)
+	}
 	out.ObjectMeta = in.ObjectMeta
 	out.Spec = CloudStackClusterSpec{
+		Account:              in.Spec.FailureDomains[0].Account,
+		Domain:               in.Spec.FailureDomains[0].Domain,
 		Zones:                getZones(in),
 		ControlPlaneEndpoint: in.Spec.ControlPlaneEndpoint,
 	}

api/v1beta1/conversion_test.go

@@ -26,6 +26,8 @@ import (
 	capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
 
+
+
 var _ = Describe("Conversion", func() {
 	BeforeEach(func() { // Reset test vars to initial state.
 	})
@@ -75,4 +77,83 @@ var _ = Describe("Conversion", func() {
 			Ω(failureDomains).Should(Equal(expectedResult))
 		})
 	})
+
+	Context("v1beta2 to v1beta1 function", func() {
+		It("Converts v1beta2 cluster spec to v1beta1 zone based cluster spec", func() {
+			csCluster := &v1beta2.CloudStackCluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "cluster1",
+					Namespace: "namespace1",
+				},
+				Spec: v1beta2.CloudStackClusterSpec{
+					FailureDomains: []v1beta2.CloudStackFailureDomainSpec{
+						{
+							Name: "76472a84-d23f-4e97-b154-ee1b975ed936",
+							Zone: v1beta2.CloudStackZoneSpec{
+								ID:      "76472a84-d23f-4e97-b154-ee1b975ed936",
+								Network: v1beta2.Network{Name: "network1"},
+							},
+							Account: "account1",
+							Domain:  "domain1",
+							ACSEndpoint: corev1.SecretReference{
+								Name:      "global",
+								Namespace: "namespace1",
+							},
+						},
+					},
+					ControlPlaneEndpoint: capiv1.APIEndpoint{
+						Host: "endpoint1",
+						Port: 443,
+					},
+				},
+				Status: v1beta2.CloudStackClusterStatus{},
+			}
+			converted := &v1beta1.CloudStackCluster{}
+			err := v1beta1.Convert_v1beta2_CloudStackCluster_To_v1beta1_CloudStackCluster(csCluster, converted, nil)
+			expectedResult := &v1beta1.CloudStackCluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "cluster1",
+					Namespace: "namespace1",
+				},
+				Spec: v1beta1.CloudStackClusterSpec{
+					Zones: []v1beta1.Zone{
+						{
+							ID: "76472a84-d23f-4e97-b154-ee1b975ed936",
+							Network: v1beta1.Network{
+								Name: "network1",
+							},
+						},
+					},
+					ControlPlaneEndpoint: capiv1.APIEndpoint{
+						Host: "endpoint1",
+						Port: 443,
+					},
+					Account: "account1",
+					Domain:  "domain1",
+				},
+				Status: v1beta1.CloudStackClusterStatus{},
+			}
+
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(converted).Should(Equal(expectedResult))
+		})
+
+		It("Returns error when len(failureDomains) < 1", func() {
+			csCluster := &v1beta2.CloudStackCluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "cluster1",
+					Namespace: "namespace1",
+				},
+				Spec: v1beta2.CloudStackClusterSpec{
+					ControlPlaneEndpoint: capiv1.APIEndpoint{
+						Host: "endpoint1",
+						Port: 443,
+					},
+				},
+				Status: v1beta2.CloudStackClusterStatus{},
+			}
+			err := v1beta1.Convert_v1beta2_CloudStackCluster_To_v1beta1_CloudStackCluster(csCluster, nil, nil)
+			Ω(err).Should(HaveOccurred())
+		})
+	})
 })