merge upstream

Author: wanyufe

Makefile

@@ -1,6 +1,10 @@
 # Image URL to use all building/pushing image targets
-IMG ?= public.ecr.aws/a4z9h2b1/cluster-api-provider-capc:latest
-IMG_LOCAL ?= localhost:5000/cluster-api-provider-cloudstack:latest
+STAGING_REGISTRY := gcr.io/k8s-staging-capi-cloudstack
+REGISTRY ?= $(STAGING_REGISTRY)
+IMAGE_NAME ?= capi-cloudstack-controller
+TAG ?= dev
+IMG ?= $(REGISTRY)/$(IMAGE_NAME):$(TAG)
+IMG_LOCAL ?= localhost:5000/$(IMAGE_NAME):$(TAG)
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -45,7 +49,7 @@ help: ## Display this help.
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
  MANIFEST_GEN_INPUTS=$(shell find ./api ./controllers -type f -name "*test*" -prune -o -name "*zz_generated*" -prune -o -print)
- 
+
 # Using a flag file here as config output is too complicated to be a target.
 # The following triggers manifest building if $(IMG) differs from that found in config/default/manager_image_patch.yaml.
 $(shell	grep -qs "$(IMG)" config/default/manager_image_patch_edited.yaml || rm -f config/.flag.mk)
@@ -58,7 +62,7 @@ config/.flag.mk: bin/controller-gen $(MANIFEST_GEN_INPUTS)
 
 .PHONY: release-manifests
 RELEASE_MANIFEST_TARGETS=$(RELEASE_DIR)/infrastructure-components.yaml $(RELEASE_DIR)/metadata.yaml
-RELEASE_MANIFEST_INPUTS=bin/kustomize config/.flag.mk $(shell find config) 
+RELEASE_MANIFEST_INPUTS=bin/kustomize config/.flag.mk $(shell find config)
 release-manifests: $(RELEASE_MANIFEST_TARGETS) ## Create kustomized release manifest in $RELEASE_DIR (defaults to out).
 $(RELEASE_DIR)/%: $(RELEASE_MANIFEST_INPUTS)
 	@mkdir -p $(RELEASE_DIR)
@@ -150,13 +154,13 @@ binaries: bin/controller-gen bin/conversion-gen bin/kustomize bin/ginkgo bin/gol
 bin/controller-gen: ## Install controller-gen to bin.
 	GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/[email protected]
 bin/conversion-gen: ## Install conversion-gen to bin.
-    GOBIN=$(PROJECT_DIR)/bin go install k8s.io/code-generator/cmd/conversion-gen@0.23.0
+    GOBIN=$(PROJECT_DIR)/bin go install k8s.io/code-generator/cmd/conversion-gen@v0.23.0
 bin/golangci-lint: ## Install golangci-lint to bin.
 	GOBIN=$(PROJECT_DIR)/bin go install github.com/golangci/golangci-lint/cmd/[email protected]
 bin/staticcheck: ## Install staticcheck to bin.
 	GOBIN=$(PROJECT_DIR)/bin go install honnef.co/go/tools/cmd/[email protected]
 bin/ginkgo: bin/ginkgo_v1 bin/ginkgo_v2 ## Install ginkgo to bin.
-bin/ginkgo_v2: 
+bin/ginkgo_v2:
 	GOBIN=$(PROJECT_DIR)/bin go install github.com/onsi/ginkgo/v2/[email protected]
 	mv $(PROJECT_DIR)/bin/ginkgo $(PROJECT_DIR)/bin/ginkgo_v2
 bin/ginkgo_v1:
@@ -199,7 +203,7 @@ pkg/mocks/mock%.go: $(shell find ./pkg/cloud -type f -name "*test*" -prune -o -p
 
 ##@ Tilt
 
-.PHONY: tilt-up 
+.PHONY: tilt-up
 tilt-up: cluster-api kind-cluster cluster-api/tilt-settings.json manifests cloud-config ## Setup and run tilt for development.
 	export CLOUDSTACK_B64ENCODED_SECRET=$$(base64 -w0 -i cloud-config 2>/dev/null || base64 -b 0 -i cloud-config) && cd cluster-api && tilt up
 

api/v1beta1/cloudstackaffinitygroup_conversion.go

@@ -17,7 +17,15 @@ limitations under the License.
 package v1beta1
 
 import (
+	"context"
+	"fmt"
+	"github.com/apache/cloudstack-go/v2/cloudstack"
+	"github.com/pkg/errors"
+	corev1 "k8s.io/api/core/v1"
+	conv "k8s.io/apimachinery/pkg/conversion"
 	"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
+	"sigs.k8s.io/cluster-api/api/v1beta1"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
@@ -30,3 +38,70 @@ func (dst *CloudStackAffinityGroup) ConvertFrom(srcRaw conversion.Hub) error { /
 	src := srcRaw.(*v1beta2.CloudStackAffinityGroup)
 	return Convert_v1beta2_CloudStackAffinityGroup_To_v1beta1_CloudStackAffinityGroup(src, dst, nil)
 }
+
+//nolint:golint,revive,stylecheck
+func Convert_v1beta1_CloudStackAffinityGroup_To_v1beta2_CloudStackAffinityGroup(in *CloudStackAffinityGroup, out *v1beta2.CloudStackAffinityGroup, s conv.Scope) error {
+	out.ObjectMeta = in.ObjectMeta
+	zoneID, zoneName, err := getAffinityGroupZone(in.ObjectMeta.Namespace, in.Spec.ID)
+	if err != nil {
+		return err
+	}
+	failureDomainName, err := GetDefaultFailureDomainName(in.ObjectMeta.Namespace, in.ObjectMeta.Labels[v1beta1.ClusterLabelName], zoneID, zoneName)
+	if err != nil {
+		return err
+	}
+	out.Spec = v1beta2.CloudStackAffinityGroupSpec{
+		Type:              in.Spec.Type,
+		Name:              in.Spec.Name,
+		ID:                in.Spec.ID,
+		FailureDomainName: failureDomainName,
+	}
+	out.Status = v1beta2.CloudStackAffinityGroupStatus{
+		Ready: in.Status.Ready,
+	}
+	return nil
+}
+
+//nolint:golint,revive,stylecheck
+func Convert_v1beta2_CloudStackAffinityGroup_To_v1beta1_CloudStackAffinityGroup(in *v1beta2.CloudStackAffinityGroup, out *CloudStackAffinityGroup, s conv.Scope) error {
+	out.ObjectMeta = in.ObjectMeta
+	out.Spec = CloudStackAffinityGroupSpec{
+		Type: in.Spec.Type,
+		Name: in.Spec.Name,
+		ID:   in.Spec.ID,
+	}
+	out.Status = CloudStackAffinityGroupStatus{
+		Ready: in.Status.Ready,
+	}
+	return nil
+}
+
+func getAffinityGroupZone(namespace string, affinityGroupID string) (zoneID string, zoneName string, err error) {
+	config, err := GetCloudStackConfig(namespace)
+	if err != nil {
+		return "", "", err
+	}
+	endpointCredentials := &corev1.Secret{}
+	key := client.ObjectKey{Name: DefaultEndpointCredential, Namespace: namespace}
+	if err := v1beta2.K8sClient.Get(context.TODO(), key, endpointCredentials); err != nil {
+		return "", "", err
+	}
+
+	csClient := cloudstack.NewAsyncClient(fmt.Sprint(config["api-url"]), fmt.Sprint(config["api-key"]), fmt.Sprint(config["secret-key"]), fmt.Sprint(config["verify-ssl"]) == "true")
+
+	parameters := csClient.VirtualMachine.NewListVirtualMachinesParams()
+	parameters.SetAffinitygroupid(affinityGroupID)
+	listVMResponse, err := csClient.VirtualMachine.ListVirtualMachines(parameters)
+	if err != nil {
+		return "", "", err
+	}
+	for _, vm := range listVMResponse.VirtualMachines {
+		for _, ag := range vm.Affinitygroup {
+			if ag.Id == affinityGroupID {
+				return vm.Zoneid, vm.Zonename, nil
+			}
+		}
+	}
+
+	return "", "", errors.Errorf("zone id and name could not found for affinity group id %s", affinityGroupID)
+}

api/v1beta1/cloudstackmachine_types.go

@@ -79,8 +79,8 @@ type CloudStackMachineSpec struct {
 	// +optional
 	ProviderID *string `json:"providerID,omitempty"`
 
-	// +k8s:conversion-gen=false
 	// Optionally settable Zone ID to land the machine in.
+	// +k8s:conversion-gen=false
 	ZoneID string `json:"zoneID,omitempty"`
 
 	// +k8s:conversion-gen=false
@@ -89,6 +89,7 @@ type CloudStackMachineSpec struct {
 
 	// IdentityRef is a reference to an identity to be used when reconciling this cluster
 	// +optional
+	// +k8s:conversion-gen=false
 	IdentityRef *CloudStackIdentityReference `json:"identityRef,omitempty"`
 }
 
@@ -124,6 +125,7 @@ type InstanceState string
 type CloudStackMachineStatus struct {
 	// Zone ID is used so that the zone can be computed once per reconcile and then propagate.
 	// +optional
+	// +k8s:conversion-gen=false
 	ZoneID string `json:"zoneID,omitempty"`
 
 	// Addresses contains a CloudStack VM instance's IP addresses.

api/v1beta1/cloudstackzone_conversion.go

@@ -46,7 +46,7 @@ type CloudStackZoneStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-
+//+k8s:conversion-gen=false
 // CloudStackZone is the Schema for the cloudstackzones API
 type CloudStackZone struct {
 	metav1.TypeMeta   `json:",inline"`

api/v1beta1/cloudstackzone_types.go

@@ -50,67 +50,28 @@ func Convert_v1beta1_CloudStackCluster_To_v1beta2_CloudStackCluster(in *CloudSta
 		FailureDomains:       failureDomains,
 		Account:              in.Spec.Account,
 		Domain:               in.Spec.Domain,
-		IdentityRef:          identifyRef,
 	}
 
-	zoneStatusMap := v1beta2.ZoneStatusMap{}
-	for zoneKey, zone := range in.Status.Zones {
-		zoneV1 := zone
-		zoneV2 := &v1beta2.Zone{}
-		err := Convert_v1beta1_Zone_To_v1beta2_Zone(&zoneV1, zoneV2, nil)
-		if err != nil {
-			return err
-		}
-		zoneStatusMap[zoneKey] = *zoneV2
-	}
 	out.Status = v1beta2.CloudStackClusterStatus{
-		Zones: zoneStatusMap,
-		FailureDomains:    in.Status.FailureDomains,
-		PublicIPID:        in.Status.PublicIPID,
-		PublicIPNetworkID: in.Status.PublicIPNetworkID,
-		LBRuleID:          in.Status.LBRuleID,
-		Ready:             in.Status.Ready,
+		FailureDomains: in.Status.FailureDomains,
+		Ready:          in.Status.Ready,
 	}
 	return nil
 }
 
 //nolint:golint,revive,stylecheck
 func Convert_v1beta2_CloudStackCluster_To_v1beta1_CloudStackCluster(in *v1beta2.CloudStackCluster, out *CloudStackCluster, scope conv.Scope) error {
 	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.Spec = CloudStackClusterSpec{
 		Zones:                getZones(in),
 		ControlPlaneEndpoint: in.Spec.ControlPlaneEndpoint,
 		Account:              in.Spec.Account,
 		Domain:               in.Spec.Domain,
-		IdentityRef:          identifyRef,
 	}
 
-	zoneStatusMap := ZoneStatusMap{}
-	for zoneKey, zone := range in.Status.Zones {
-		zonev1 := &Zone{}
-		zonev2 := zone
-		err := Convert_v1beta2_Zone_To_v1beta1_Zone(&zonev2, zonev1, nil)
-		if err != nil {
-			return err
-		}
-		zoneStatusMap[zoneKey] = *zonev1
-	}
 	out.Status = CloudStackClusterStatus{
-		Zones:             zoneStatusMap,
-		FailureDomains:    in.Status.FailureDomains,
-		Ready:             in.Status.Ready,
-		DomainID:          in.Status.DomainID,
-		PublicIPID:        in.Status.PublicIPID,
-		PublicIPNetworkID: in.Status.PublicIPNetworkID,
-		LBRuleID:          in.Status.LBRuleID,
+		FailureDomains: in.Status.FailureDomains,
+		Ready:          in.Status.Ready,
 	}
 	return nil
 }
@@ -172,20 +133,24 @@ func getFailureDomains(csCluster *CloudStackCluster) ([]v1beta2.CloudStackFailur
 // When upgrading cluster using clusterctl directly, zoneID is fetched directly from kubernetes cluster in cloudstackzones.
 func GetDefaultFailureDomainName(namespace string, clusterName string, zoneID string, zoneName string) (string, error) {
 	if len(zoneID) > 0 {
-		return zoneID, nil
+		return zoneID + "-" + clusterName, nil
 	}
 
 	// try fetch zoneID using zoneName through cloudstack client
 	zoneID, err := fetchZoneIDUsingCloudStack(namespace, zoneName)
 	if err == nil {
-		return zoneID, nil
+		return zoneID + "-" + clusterName, nil
 	}
 
-	return fetchZoneIDUsingK8s(namespace, clusterName, zoneName)
+	zoneID, err = fetchZoneIDUsingK8s(namespace, clusterName, zoneName)
+	if err != nil {
+		return "", nil
+	}
+	return zoneID + "-" + clusterName, nil
 }
 
 func fetchZoneIDUsingK8s(namespace string, clusterName string, zoneName string) (string, error) {
-	zones := &v1beta2.CloudStackZoneList{}
+	zones := &CloudStackZoneList{}
 	capiClusterLabel := map[string]string{clusterv1.ClusterLabelName: clusterName}
 	if err := v1beta2.K8sClient.List(
 		context.TODO(),
@@ -206,10 +171,27 @@ func fetchZoneIDUsingK8s(namespace string, clusterName string, zoneName string)
 }
 
 func fetchZoneIDUsingCloudStack(namespace string, zoneName string) (string, error) {
+	config, err := GetCloudStackConfig(namespace)
+	if err != nil {
+		return "", err
+	}
+
+	csClient := cloudstack.NewAsyncClient(fmt.Sprint(config["api-url"]), fmt.Sprint(config["api-key"]), fmt.Sprint(config["secret-key"]), fmt.Sprint(config["verify-ssl"]) == "true")
+
+	if zoneID, count, err := csClient.Zone.GetZoneID(zoneName); err != nil {
+		return "", err
+	} else if count != 1 {
+		return "", errors.Errorf("%v zones found for zone name %s", count, zoneName)
+	} else {
+		return zoneID, nil
+	}
+}
+
+func GetCloudStackConfig(namespace string) (map[string]interface{}, error) {
 	endpointCredentials := &corev1.Secret{}
 	key := client.ObjectKey{Name: DefaultEndpointCredential, Namespace: namespace}
 	if err := v1beta2.K8sClient.Get(context.TODO(), key, endpointCredentials); err != nil {
-		return "", err
+		return nil, err
 	}
 
 	config := map[string]interface{}{}
@@ -224,14 +206,5 @@ func fetchZoneIDUsingCloudStack(namespace string, zoneName string) (string, erro
 			config["verify-ssl"] = false
 		}
 	}
-
-	csClient := cloudstack.NewAsyncClient(fmt.Sprint(config["api-url"]), fmt.Sprint(config["api-key"]), fmt.Sprint(config["secret-key"]), fmt.Sprint(config["verify-ssl"]) == "true")
-
-	if zoneID, count, err := csClient.Zone.GetZoneID(zoneName); err != nil {
-		return "", err
-	} else if count != 1 {
-		return "", errors.Errorf("%v zones found for zone name %s", count, zoneName)
-	} else {
-		return zoneID, nil
-	}
+	return config, nil
 }