Add syncWithACS to control creation of external managed cluster on ACS

Author: vishesh92

api/v1beta3/cloudstackcluster_types.go

@@ -34,6 +34,8 @@ type CloudStackClusterSpec struct {
 
 	// The kubernetes control plane endpoint.
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
+
+	SyncWithACS bool `json:"syncWithACS,omitempty"`
 }
 
 // The status of the CloudStackCluster object.

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

@@ -412,6 +412,8 @@ spec:
                   - zone
                   type: object
                 type: array
+              syncWithACS:
+                type: boolean
             required:
             - controlPlaneEndpoint
             - failureDomains

controllers/cloudstackcluster_controller.go

@@ -105,14 +105,18 @@ func (r *CloudStackClusterReconciliationRunner) GetOrCreateUnmanagedCluster() (c
 	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 {
+
+		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
 }

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/ReneKroon/ttlcache v1.7.0
-	github.com/apache/cloudstack-go/v2 v2.15.0
+	github.com/apache/cloudstack-go/v2 v2.16.0
 	github.com/go-logr/logr v1.2.4
 	github.com/golang/mock v1.6.0
 	github.com/hashicorp/go-multierror v1.1.1

go.sum

@@ -26,6 +26,8 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd
 github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves=
 github.com/apache/cloudstack-go/v2 v2.15.0 h1:oojn1qx0+wBwrFSSmA2rL8XjWd4BXqwYo0RVCrAXoHk=
 github.com/apache/cloudstack-go/v2 v2.15.0/go.mod h1:Mc+tXpujtslBuZFk5atoGT2LanVxOrXS2GGgidAoz1A=
+github.com/apache/cloudstack-go/v2 v2.16.0 h1:qK4/mtgmhzFU99WHAHM/1FhAM3cWV8gplOAGODwHyPM=
+github.com/apache/cloudstack-go/v2 v2.16.0/go.mod h1:EPMwvwKMvmIFajmDCqSR747l/439DuKvKY8jbFOE/qE=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=

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)

test/e2e/go.mod

@@ -4,8 +4,9 @@ go 1.19
 
 require (
 	github.com/Shopify/toxiproxy/v2 v2.5.0
-	github.com/apache/cloudstack-go/v2 v2.15.0
+	github.com/apache/cloudstack-go/v2 v2.16.0
 	github.com/blang/semver v3.5.1+incompatible
+	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/ginkgo/v2 v2.11.0
 	github.com/onsi/gomega v1.27.8
 	gopkg.in/yaml.v3 v3.0.1
@@ -79,6 +80,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
@@ -112,6 +114,7 @@ require (
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/apiextensions-apiserver v0.26.1 // indirect
 	k8s.io/apiserver v0.26.1 // indirect