v1beta2 initial - 1

Author: wanyufe

Makefile

@@ -73,7 +73,7 @@ generate-deepcopy: $(DEEPCOPY_GEN_TARGETS) ## Generate code containing DeepCopy,
 api/%/zz_generated.deepcopy.go: bin/controller-gen $(DEEPCOPY_GEN_INPUTS)
 	controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
-CONVERSION_GEN_TARGET=$(shell find api -type d -name "v*" -exec echo {}\/zz_generated.conversion.go \;)
+CONVERSION_GEN_TARGET=$(shell find api -type d -name "v*1" -exec echo {}\/zz_generated.conversion.go \;)
 CONVERSION_GEN_INPUTS=$(shell find ./api -name "*test*" -prune -o -name "*zz_generated*" -prune -o -type f -print)
 .PHONY: generate-conversion
 generate-conversion: $(CONVERSION_GEN_TARGET) ## Generate code to convert api/v1beta1 to api/v1beta2
@@ -194,7 +194,7 @@ test: generate-mocks lint bin/ginkgo bin/kubectl bin/kube-apiserver bin/etcd ##
 		./hack/testing_ginkgo_recover_statements.sh --remove; exit $$EXIT_STATUS
 
 .PHONY: generate-mocks
-generate-mocks: bin/mockgen generate-deepcopy generate-conversion pkg/mocks/mock_client.go $(shell find ./pkg/mocks -type f -name "mock*.go") ## Generate mocks needed for testing. Primarily mocks of the cloud package.
+generate-mocks: bin/mockgen generate-deepcopy pkg/mocks/mock_client.go $(shell find ./pkg/mocks -type f -name "mock*.go") ## Generate mocks needed for testing. Primarily mocks of the cloud package.
 pkg/mocks/mock%.go: $(shell find ./pkg/cloud -type f -name "*test*" -prune -o -print)
 	go generate ./...
 

api/v1beta1/cloudstackcluster_types.go

@@ -24,11 +24,11 @@ import (
 )
 
 const (
-	ClusterFinalizer = "cloudstackcluster.infrastructure.cluster.x-k8s.io"
-	//defaultIdentityRefKind     = "Secret"
+	ClusterFinalizer           = "cloudstackcluster.infrastructure.cluster.x-k8s.io"
+	DefaultIdentityRefKind     = "Secret"
 	CloudStackClusterLabelName = "cloudstackcluster.infrastructure.cluster.x-k8s.io/name"
 	NetworkTypeIsolated        = "Isolated"
-	NetworkTypeShared          = "Shared"
+	// NetworkTypeShared          = "Shared"
 )
 
 // CloudStackIdentityReference is a reference to an infrastructure

api/v1beta1/conversion.go

@@ -17,33 +17,30 @@ limitations under the License.
 package v1beta1
 
 import (
+	"fmt"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conv "k8s.io/apimachinery/pkg/conversion"
 	"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
-	"strings"
 )
 
 //nolint:golint,revive,stylecheck
 func Convert_v1beta1_CloudStackCluster_To_v1beta2_CloudStackCluster(in *CloudStackCluster, out *v1beta2.CloudStackCluster, s conv.Scope) error {
-	out.Kind = in.Kind
-	out.APIVersion = strings.ReplaceAll(in.APIVersion, "v1beta1", "v1beta2")
-	out.Finalizers = in.Finalizers
-	out.Labels = in.Labels
-	out.Name = in.Name
-	out.Namespace = in.Namespace
-	out.OwnerReferences = in.OwnerReferences
-
+	out.ObjectMeta = in.ObjectMeta
+	var identifyRef *v1beta2.CloudStackIdentityReference
+	if in.Spec.IdentityRef != nil {
+		identifyRef = &v1beta2.CloudStackIdentityReference{}
+		err := Convert_v1beta1_CloudStackIdentityReference_To_v1beta2_CloudStackIdentityReference(in.Spec.IdentityRef, identifyRef, nil)
+		if err != nil {
+			return err
+		}
+	}
 	out.Spec = v1beta2.CloudStackClusterSpec{
 		ControlPlaneEndpoint: in.Spec.ControlPlaneEndpoint,
 		FailureDomains:       getFailureDomains(in),
 		Account:              in.Spec.Account,
 		Domain:               in.Spec.Domain,
-		IdentityRef: &v1beta2.CloudStackIdentityReference{
-			Kind: in.Spec.IdentityRef.Kind,
-			Name: in.Spec.IdentityRef.Name,
-		},
+		IdentityRef:          identifyRef,
 	}
 
 	out.Status = v1beta2.CloudStackClusterStatus{
@@ -59,63 +56,64 @@ 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 {
-	out.Kind = in.Kind
-	out.APIVersion = strings.ReplaceAll(in.APIVersion, "v1beta2", "v1beta1")
-	out.Finalizers = in.Finalizers
-	out.Labels = in.Labels
-	out.Name = in.Name
-	out.Namespace = in.Namespace
-	out.OwnerReferences = in.OwnerReferences
-
-	if len(in.Spec.FailureDomains) > 0 {
-		var zones []Zone
-		for _, failureDomains := range in.Spec.FailureDomains {
-			zones = append(zones, Zone{
-				Name: failureDomains.Spec.Zone.Name,
-				ID:   failureDomains.Spec.Zone.ID,
-				Network: Network{
-					Name: failureDomains.Spec.Zone.Network.Name,
-					ID:   failureDomains.Spec.Zone.Network.ID,
-					Type: failureDomains.Spec.Zone.Network.Type,
-				},
-			})
-		}
-		out.Spec = CloudStackClusterSpec{
-			zones,
-			in.Spec.ControlPlaneEndpoint,
-			in.Spec.FailureDomains[0].Spec.Account,
-			in.Spec.FailureDomains[0].Spec.Domain,
-			&CloudStackIdentityReference{
-				Kind: in.Spec.FailureDomains[0].Spec.CredentialsRef.Kind,
-				Name: in.Spec.FailureDomains[0].Spec.CredentialsRef.Name,
-			},
-		}
-		zoneMap, err := getZoneMap(in)
-		if err != nil {
-			return err
-		}
-		domainId, err := getDomainID(in)
+	out.ObjectMeta = in.ObjectMeta
+	var identifyRef *CloudStackIdentityReference
+	if in.Spec.IdentityRef != nil {
+		identifyRef = &CloudStackIdentityReference{}
+		err := Convert_v1beta2_CloudStackIdentityReference_To_v1beta1_CloudStackIdentityReference(in.Spec.IdentityRef, identifyRef, nil)
 		if err != nil {
 			return err
 		}
-		out.Status = CloudStackClusterStatus{
-			zoneMap,
-			in.Status.FailureDomains,
-			in.Status.Ready,
-			domainId,
-			in.Status.PublicIPID,
-			in.Status.PublicIPNetworkID,
-			in.Status.LBRuleID,
-		}
 	}
-
+	out.Spec = CloudStackClusterSpec{
+		getZones(in),
+		in.Spec.ControlPlaneEndpoint,
+		in.Spec.Account,
+		in.Spec.Domain,
+		identifyRef,
+	}
+	zoneMap, err := getZoneMap(in)
+	if err != nil {
+		return err
+	}
+	domainId, err := getDomainID(in)
+	if err != nil {
+		return err
+	}
+	out.Status = CloudStackClusterStatus{
+		zoneMap,
+		in.Status.FailureDomains,
+		in.Status.Ready,
+		domainId,
+		in.Status.PublicIPID,
+		in.Status.PublicIPNetworkID,
+		in.Status.LBRuleID,
+	}
 	return nil
 }
 
-func getZoneMap(src *v1beta2.CloudStackCluster) (map[string]Zone, error) {
+// getZones maps failure domains to zones
+func getZones(csCluster *v1beta2.CloudStackCluster) []Zone {
+	var zones []Zone
+	for _, failureDomain := range csCluster.Spec.FailureDomains {
+		zone := failureDomain.Zone
+		zones = append(zones, Zone{
+			Name: zone.Name,
+			ID:   zone.ID,
+			Network: Network{
+				Name: zone.Network.Name,
+				ID:   zone.Network.ID,
+				Type: zone.Network.Type,
+			},
+		})
+	}
+	return zones
+}
+
+func getZoneMap(csCluster *v1beta2.CloudStackCluster) (map[string]Zone, error) {
 	zoneMap := map[string]Zone{}
-	for key := range src.Status.CloudStackFailureDomainStatusMap {
-		zone, err := getZoneByMetaName(src, key)
+	for key := range csCluster.Status.CloudStackFailureDomainStatusMap {
+		zone, err := getZoneByMetaName(csCluster, key)
 		if err != nil {
 			return nil, err
 		}
@@ -124,9 +122,9 @@ func getZoneMap(src *v1beta2.CloudStackCluster) (map[string]Zone, error) {
 	return zoneMap, nil
 }
 
-func getDomainID(src *v1beta2.CloudStackCluster) (string, error) {
+func getDomainID(csCluster *v1beta2.CloudStackCluster) (string, error) {
 	var domainID string
-	for _, value := range src.Status.CloudStackFailureDomainStatusMap {
+	for _, value := range csCluster.Status.CloudStackFailureDomainStatusMap {
 		if domainID == "" {
 			domainID = value.DomainID
 		} else if domainID != value.DomainID {
@@ -136,75 +134,99 @@ func getDomainID(src *v1beta2.CloudStackCluster) (string, error) {
 	return domainID, nil
 }
 
-func getZoneByMetaName(src *v1beta2.CloudStackCluster, metaName string) (Zone, error) {
+func getZoneByMetaName(csCluster *v1beta2.CloudStackCluster, metaName string) (Zone, error) {
 	var zone Zone
 	err := errors.Errorf("zone with meta %s not found", metaName)
-	for _, failureDomains := range src.Spec.FailureDomains {
-		if failureDomains.Spec.Zone.MetaName() == metaName {
+	for _, failureDomain := range csCluster.Spec.FailureDomains {
+		if failureDomain.Zone.MetaName() == metaName {
 			err = nil
 			zone = Zone{
-				ID:   failureDomains.Spec.Zone.ID,
-				Name: failureDomains.Spec.Zone.Name,
+				ID:   failureDomain.Zone.ID,
+				Name: failureDomain.Zone.Name,
 				Network: Network{
-					ID:   failureDomains.Spec.Zone.Network.ID,
-					Name: failureDomains.Spec.Zone.Network.Name,
-					Type: failureDomains.Spec.Zone.Network.Type,
+					ID:   failureDomain.Zone.Network.ID,
+					Name: failureDomain.Zone.Network.Name,
+					Type: failureDomain.Zone.Network.Type,
 				},
 			}
 		}
 	}
 	return zone, err
 }
 
-func getFailureDomains(src *CloudStackCluster) []v1beta2.CloudStackFailureDomain {
-	failureDomains := make([]v1beta2.CloudStackFailureDomain, len(src.Spec.Zones))
-	for _, zone := range src.Spec.Zones {
-		typeMeta := metav1.TypeMeta{
-			Kind:       src.Kind,
-			APIVersion: strings.ReplaceAll(src.APIVersion, "v1beta1", "v1beta2"),
-		}
-		objectMeta := metav1.ObjectMeta{
-			Finalizers:      src.Finalizers,
-			Labels:          src.Labels,
-			Name:            src.Name,
-			Namespace:       src.Namespace,
-			OwnerReferences: src.OwnerReferences,
-		}
-		failureDomains = append(failureDomains, v1beta2.CloudStackFailureDomain{
-			TypeMeta:   typeMeta,
-			ObjectMeta: objectMeta,
-			Spec: v1beta2.CloudStackFailureDomainSpec{
-				Zone: v1beta2.Zone{
-					Name: zone.Name,
-					ID:   zone.ID,
-					Network: v1beta2.Network{
-						ID:   zone.Network.ID,
-						Name: zone.Network.Name,
-						Type: zone.Network.Type,
-					},
-				},
-				Account: src.Spec.Account,
-				Domain:  src.Spec.Domain,
-				CredentialsRef: &corev1.ObjectReference{
-					Kind: src.Spec.IdentityRef.Kind,
-					Name: src.Spec.IdentityRef.Name,
+// getFailureDomains maps v1beta1 zones to v1beta2 failure domains
+func getFailureDomains(csCluster *CloudStackCluster) []v1beta2.FailureDomain {
+	var failureDomains []v1beta2.FailureDomain
+	index := 0
+	for _, zone := range csCluster.Spec.Zones {
+		index = index + 1
+		name := fmt.Sprintf("%s-%s-%d", csCluster.Name, "failuredomain", index)
+		//objectMeta := metav1.ObjectMeta{
+		//	Finalizers: []string{v1beta2.FailureDomainFinalizer},
+		//	Labels: map[string]string{
+		//		"cloudstackcluster.infrastructure.cluster.x-k8s.io/name": csCluster.Name,
+		//		"cluster.x-k8s.io/cluster-name":                          csCluster.Name,
+		//	},
+		//	Name:      fmt.Sprintf("%s-%s-%d", csCluster.Name, "failuredomain", index),
+		//	Namespace: csCluster.Namespace,
+		//	OwnerReferences: []metav1.OwnerReference{
+		//		{
+		//			APIVersion:         "infrastructure.cluster.x-k8s.io/v1beta2",
+		//			BlockOwnerDeletion: func(b bool) *bool { return &b }(true),
+		//			Controller:         func(b bool) *bool { return &b }(true),
+		//			Kind:               "CloudStackCluster",
+		//			Name:               csCluster.Name,
+		//		},
+		//	},
+		//}
+		failureDomains = append(failureDomains, v1beta2.FailureDomain{
+			Zone: v1beta2.Zone{
+				ID:   zone.ID,
+				Name: zone.Name,
+				Network: v1beta2.Network{
+					ID:   zone.Network.ID,
+					Name: zone.Network.Name,
+					Type: zone.Network.Type,
 				},
 			},
-			Status: v1beta2.CloudStackFailureDomainStatus{
-				DomainID: src.Status.DomainID,
-				Ready:    src.Status.Ready,
+			Domain:  csCluster.Spec.Domain,
+			Account: csCluster.Spec.Account,
+			CredentialsRef: &corev1.ObjectReference{
+				Kind: DefaultIdentityRefKind,
+				Name: name,
 			},
+			//Spec: v1beta2.CloudStackFailureDomainSpec{
+			//	Zone: v1beta2.Zone{
+			//		Name: zone.Name,
+			//		ID:   zone.ID,
+			//		Network: v1beta2.Network{
+			//			ID:   zone.Network.ID,
+			//			Name: zone.Network.Name,
+			//			Type: zone.Network.Type,
+			//		},
+			//	},
+			//	Account: csCluster.Spec.Account,
+			//	Domain:  csCluster.Spec.Domain,
+			//	CredentialsRef: &corev1.ObjectReference{
+			//		Kind: DefaultIdentityRefKind,
+			//		Name: objectMeta.Name,
+			//	},
+			//},
+			//Status: v1beta2.CloudStackFailureDomainStatus{
+			//	DomainID: csCluster.Status.DomainID,
+			//	Ready:    csCluster.Status.Ready,
+			//},
 		})
 	}
 	return failureDomains
 }
 
-func getFailureDomainsStatusMap(src *CloudStackCluster) map[string]v1beta2.CloudStackFailureDomainStatus {
+func getFailureDomainsStatusMap(csCluster *CloudStackCluster) map[string]v1beta2.CloudStackFailureDomainStatus {
 	failureDomainsStatusMap := map[string]v1beta2.CloudStackFailureDomainStatus{}
-	for _, zone := range src.Spec.Zones {
+	for _, zone := range csCluster.Spec.Zones {
 		failureDomainsStatusMap[zone.MetaName()] = v1beta2.CloudStackFailureDomainStatus{
-			DomainID: src.Status.DomainID,
-			Ready:    src.Status.Ready,
+			DomainID: csCluster.Status.DomainID,
+			Ready:    csCluster.Status.Ready,
 		}
 	}
 	return failureDomainsStatusMap

api/v1beta2/cloudstackcluster_types.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1beta2
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"strings"
@@ -81,9 +82,26 @@ func (z *Zone) MetaName() string {
 	return strings.ToLower(s)
 }
 
+type FailureDomain struct {
+
+	// The ACS Zone for this failure domain.
+	Zone Zone `json:"zone"`
+
+	// CloudStack account.
+	// +optional
+	Account string `json:"account,omitempty"`
+
+	// CloudStack domain.
+	// +optional
+	Domain string `json:"domain,omitempty"`
+
+	// +k8s:conversion-gen=false
+	CredentialsRef *corev1.ObjectReference `json:"credentialsRef"`
+}
+
 // CloudStackClusterSpec defines the desired state of CloudStackCluster.
 type CloudStackClusterSpec struct {
-	FailureDomains []CloudStackFailureDomain `json:"failureDomains"`
+	FailureDomains []FailureDomain `json:"failureDomains"`
 
 	// The kubernetes control plane endpoint.
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
@@ -153,5 +171,5 @@ type CloudStackClusterList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&CloudStackFailureDomain{}, &CloudStackFailureDomainList{})
+	SchemeBuilder.Register(&CloudStackCluster{}, &CloudStackClusterList{})
 }