Add syncWithACS to control creation of external managed cluster on ACS

Author: vishesh92

api/v1beta1/conversion.go

@@ -51,7 +51,7 @@ func Convert_v1beta1_CloudStackCluster_To_v1beta3_CloudStackCluster(in *CloudSta
 //nolint:golint,revive,stylecheck
 func Convert_v1beta3_CloudStackCluster_To_v1beta1_CloudStackCluster(in *v1beta3.CloudStackCluster, out *CloudStackCluster, scope conv.Scope) error {
 	if len(in.Spec.FailureDomains) < 1 {
-		return fmt.Errorf("v1beta3 to v1beta1 conversion not supported when < 1 failure domain is provided. Input CloudStackCluster spec %s", in.Spec)
+		return fmt.Errorf("v1beta3 to v1beta1 conversion not supported when < 1 failure domain is provided. Input CloudStackCluster spec %s", fmt.Sprintf("%v", in.Spec))
 	}
 	out.ObjectMeta = in.ObjectMeta
 	out.Spec = CloudStackClusterSpec{

api/v1beta3/cloudstackcluster_types.go

@@ -34,6 +34,10 @@ type CloudStackClusterSpec struct {
 
 	// The kubernetes control plane endpoint.
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
+
+	// SyncWithACS determines if an externalManaged CKS cluster should be created on ACS.
+	// +optional
+	SyncWithACS bool `json:"syncWithACS"`
 }
 
 // The status of the CloudStackCluster object.

config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackclusters.yaml

@@ -415,6 +415,10 @@ spec:
                   - zone
                   type: object
                 type: array
+              syncWithACS:
+                description: SyncWithACS determines if an externalManaged CKS cluster
+                  should be created on ACS.
+                type: boolean
             required:
             - controlPlaneEndpoint
             - failureDomains

controllers/cloudstackcluster_controller.go

@@ -101,18 +101,21 @@ func (r *CloudStackClusterReconciliationRunner) Reconcile() (res ctrl.Result, re
 
 // GetOrCreateUnmanagedCluster checks if an unmanaged cluster is present in Cloudstack else creates one.
 func (r *CloudStackClusterReconciliationRunner) GetOrCreateUnmanagedCluster() (ctrl.Result, error) {
-	res, err := r.AsFailureDomainUser(&r.CSCluster.Spec.FailureDomains[0])()
-	if r.ShouldReturn(res, err) {
-		return res, err
-	}
-	err = r.CSUser.GetOrCreateUnmanagedCluster(r.CAPICluster, r.ReconciliationSubject, &r.FailureDomains.Items[0].Spec)
-	if err != nil {
-		if strings.Contains(err.Error(), "Kubernetes Service plugin is disabled") {
-			r.Log.Info("Kubernetes Service plugin is disabled on CloudStack. Skipping ExternalManaged kubernetes cluster creation")
-			return ctrl.Result{}, nil
+	if r.CSCluster.Spec.SyncWithACS {
+		res, err := r.AsFailureDomainUser(&r.CSCluster.Spec.FailureDomains[0])()
+		if r.ShouldReturn(res, err) {
+			return res, err
+		}
+
+		err = r.CSUser.GetOrCreateUnmanagedCluster(r.CAPICluster, r.ReconciliationSubject, &r.FailureDomains.Items[0].Spec)
+		if err != nil {
+			if strings.Contains(err.Error(), "Kubernetes Service plugin is disabled") {
+				r.Log.Info("Kubernetes Service plugin is disabled on CloudStack. Skipping ExternalManaged kubernetes cluster creation")
+				return ctrl.Result{}, nil
+			}
+			// Not requeueing the failure to support CloudStack v4.18 and before
+			r.Log.Info(fmt.Sprintf("Failed creating ExternalManaged kubernetes cluster on CloudStack. Error: %s", err.Error()))
 		}
-		// Not requeueing the failure to support CloudStack v4.18 and before
-		r.Log.Info(fmt.Sprintf("Failed creating ExternalManaged kubernetes cluster on CloudStack. Error: %s", err.Error()))
 	}
 	return ctrl.Result{}, nil
 }

pkg/cloud/cluster.go

@@ -85,7 +85,8 @@ func (c *client) GetOrCreateUnmanagedCluster(cluster *clusterv1.Cluster, csClust
 			}
 			accountName = user.Account
 		}
-		params := c.cs.Kubernetes.NewCreateKubernetesClusterParams(fmt.Sprintf("%s managed by CAPC", clusterName), clusterName, fd.Zone.ID)
+		// NewCreateKubernetesClusterParams(description string, kubernetesversionid string, name string, serviceofferingid string, size int64, zoneid string) *CreateKubernetesClusterParams
+		params := c.cs.Kubernetes.NewCreateKubernetesClusterParams(fmt.Sprintf("%s managed by CAPC", clusterName), "", clusterName, "", 0, fd.Zone.ID)
 
 		setIfNotEmpty(accountName, params.SetAccount)
 		setIfNotEmpty(domain.ID, params.SetDomainid)