remove custom affinitygroup conversion

Author: wanyufe

api/v1beta1/cloudstackaffinitygroup_conversion.go

@@ -17,15 +17,7 @@ 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"
 )
 
@@ -38,70 +30,3 @@ 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/zz_generated.conversion.go

@@ -489,7 +489,7 @@ func (r *ReconciliationRunner) NewChildObjectMeta(name string) metav1.ObjectMeta
 		Name:      strings.ToLower(name),
 		Namespace: r.Request.Namespace,
 		Labels: map[string]string{clusterv1.ClusterLabelName: r.CAPICluster.Name,
-			infrav1.CloudStackClusterLabelName: r.CSCluster.Name},
+			infrav1.CloudStackClusterLabelName: r.CAPICluster.Name},
 		OwnerReferences: []metav1.OwnerReference{
 			*metav1.NewControllerRef(r.ReconciliationSubject, ownerGVK),
 		},