remove unnecessary changes

Author: wanyufe

api/v1beta1/cloudstackcluster_types.go

@@ -25,7 +25,6 @@ import (
 
 const (
 	ClusterFinalizer           = "cloudstackcluster.infrastructure.cluster.x-k8s.io"
-	DefaultIdentityRefKind     = "Secret"
 	CloudStackClusterLabelName = "cloudstackcluster.infrastructure.cluster.x-k8s.io/name"
 	NetworkTypeIsolated        = "Isolated"
 	NetworkTypeShared          = "Shared"

api/v1beta1/conversion.go

@@ -33,14 +33,6 @@ const DefaultEndpointCredential = "global"
 //nolint:golint,revive,stylecheck
 func Convert_v1beta1_CloudStackCluster_To_v1beta2_CloudStackCluster(in *CloudStackCluster, out *v1beta2.CloudStackCluster, s conv.Scope) error {
 	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
-		}
-	}
 	failureDomains, err := getFailureDomains(in)
 	if err != nil {
 		return err

api/v1beta1/zz_generated.conversion.go

@@ -20,7 +20,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"strings"
 )
 
 const (
@@ -30,43 +29,6 @@ const (
 
 var K8sClient client.Client
 
-// CloudStackIdentityReference is a reference to an infrastructure
-// provider identity to be used to provision cluster resources.
-type CloudStackIdentityReference struct {
-	// Kind of the identity. Must be supported by the infrastructure provider
-	// and may be either cluster or namespace-scoped.
-	// +kubebuilder:validation:MinLength=1
-	Kind string `json:"kind"`
-
-	// Name of the infrastructure identity to be used.
-	Name string `json:"name"`
-}
-
-type ZoneStatusMap map[string]Zone
-
-type Zone struct {
-	// Name.
-	//+optional
-	Name string `json:"name,omitempty"`
-
-	// ID.
-	//+optional
-	ID string `json:"id,omitempty"`
-
-	// The network within the Zone to use.
-	Network Network `json:"network"`
-}
-
-// MetaName returns a lower cased name to be used in a k8s object meta.
-// It prefers the zone's name, but will use the ID if that's the only present identifier.
-func (z *Zone) MetaName() string {
-	s := z.Name
-	if s == "" {
-		s = z.ID
-	}
-	return strings.ToLower(s)
-}
-
 // CloudStackClusterSpec defines the desired state of CloudStackCluster.
 type CloudStackClusterSpec struct {
 	FailureDomains []CloudStackFailureDomainSpec `json:"failureDomains"`

api/v1beta2/cloudstackcluster_types.go

@@ -33,7 +33,7 @@ import (
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	//+kubebuilder:scaffold:imports
 	"k8s.io/apimachinery/pkg/runtime"
-	infrav2 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
+	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
@@ -78,7 +78,7 @@ var _ = BeforeSuite(func() {
 	Expect(cfg).NotTo(BeNil())
 
 	scheme := runtime.NewScheme()
-	err = infrav2.AddToScheme(scheme)
+	err = infrav1.AddToScheme(scheme)
 	Expect(err).NotTo(HaveOccurred())
 
 	err = admissionv1beta1.AddToScheme(scheme)
@@ -102,9 +102,9 @@ var _ = BeforeSuite(func() {
 	})
 	Expect(err).NotTo(HaveOccurred())
 
-	Ω((&infrav2.CloudStackCluster{}).SetupWebhookWithManager(mgr)).Should(Succeed())
-	Ω((&infrav2.CloudStackMachine{}).SetupWebhookWithManager(mgr)).Should(Succeed())
-	Ω((&infrav2.CloudStackMachineTemplate{}).SetupWebhookWithManager(mgr)).Should(Succeed())
+	Ω((&infrav1.CloudStackCluster{}).SetupWebhookWithManager(mgr)).Should(Succeed())
+	Ω((&infrav1.CloudStackMachine{}).SetupWebhookWithManager(mgr)).Should(Succeed())
+	Ω((&infrav1.CloudStackMachineTemplate{}).SetupWebhookWithManager(mgr)).Should(Succeed())
 
 	//+kubebuilder:scaffold:webhook
 

api/v1beta2/webhook_suite_test.go

@@ -12,5 +12,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: public.ecr.aws/j9l9l0k3/cluster-api-provider-capc
+  newName: localhost:5000/cluster-api-provider-cloudstack
   newTag: latest

api/v1beta2/zz_generated.deepcopy.go

@@ -88,8 +88,7 @@ func (r *ReconciliationRunner) RemoveExtraneousFailureDomains(fds *infrav1.Cloud
 		// Send a deletion request for each FailureDomain no speced for.
 		for _, fd := range fds.Items {
 			_fd := fd
-			name := fd.Name
-			if _, present := fdPresenceByName[name]; !present {
+			if _, present := fdPresenceByName[fd.Name]; !present {
 				if err := r.K8sClient.Delete(r.RequestCtx, &_fd); err != nil {
 					return ctrl.Result{}, errors.Wrap(err, "failed to delete obsolete failure domain")
 				}