Removed account and domain from cluster type.

Author: Joshua Reed

api/v1beta2/cloudstackcluster_types.go

@@ -31,14 +31,6 @@ type CloudStackClusterSpec struct {
 
 	// The kubernetes control plane endpoint.
 	ControlPlaneEndpoint clusterv1.APIEndpoint `json:"controlPlaneEndpoint"`
-
-	// CloudStack account.
-	// +optional
-	Account string `json:"account,omitempty"`
-
-	// CloudStack domain.
-	// +optional
-	Domain string `json:"domain,omitempty"`
 }
 
 // The status of the CloudStackCluster object.

api/v1beta2/cloudstackcluster_webhook.go

@@ -55,11 +55,6 @@ func (r *CloudStackCluster) ValidateCreate() error {
 
 	var errorList field.ErrorList
 
-	if (r.Spec.Account != "") && (r.Spec.Domain == "") {
-		errorList = append(errorList, field.Required(
-			field.NewPath("spec", "account"), "specifying account requires additionally specifying domain"))
-	}
-
 	// Require FailureDomains and their respective sub-fields.
 	if len(r.Spec.FailureDomains) <= 0 {
 		errorList = append(errorList, field.Required(field.NewPath("spec", "FailureDomains"), "FailureDomains"))

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

@@ -201,9 +201,6 @@ spec:
           spec:
             description: CloudStackClusterSpec defines the desired state of CloudStackCluster.
             properties:
-              account:
-                description: CloudStack account.
-                type: string
               controlPlaneEndpoint:
                 description: The kubernetes control plane endpoint.
                 properties:
@@ -218,9 +215,6 @@ spec:
                 - host
                 - port
                 type: object
-              domain:
-                description: CloudStack domain.
-                type: string
               failureDomains:
                 items:
                   description: CloudStackFailureDomainSpec defines the desired state

controllers/utils/failuredomains.go

@@ -126,9 +126,6 @@ func (c *CloudClientImplementation) RegisterExtension(r *ReconciliationRunner) C
 // AsFailureDomainUser uses the credentials specified in the failure domain to set the ReconciliationSubject's CSUser client.
 func (c *CloudClientImplementation) AsFailureDomainUser(fdSpec *infrav1.CloudStackFailureDomainSpec) CloudStackReconcilerMethod {
 	return func() (ctrl.Result, error) {
-		if !strings.HasSuffix(fdSpec.Name, "-"+c.CAPICluster.Name) { // Add cluster name suffix if missing.
-			fdSpec.Name = fdSpec.Name + "-" + c.CAPICluster.Name
-		}
 		endpointCredentials := &corev1.Secret{}
 		key := client.ObjectKey{Name: fdSpec.ACSEndpoint.Name, Namespace: fdSpec.ACSEndpoint.Namespace}
 		if err := c.K8sClient.Get(c.RequestCtx, key, endpointCredentials); err != nil {
@@ -144,14 +141,6 @@ func (c *CloudClientImplementation) AsFailureDomainUser(fdSpec *infrav1.CloudSta
 			return ctrl.Result{}, errors.Wrapf(err, "parsing ACSEndpoint secret with ref: %v", fdSpec.ACSEndpoint)
 		}
 
-		// Transfer Cluster Domain & Account to FailureDomain as needed.
-		if fdSpec.Account == "" {
-			if c.CSCluster.Spec.Account != "" {
-				fdSpec.Account = c.CSCluster.Spec.Account
-				fdSpec.Domain = c.CSCluster.Spec.Domain
-			}
-		}
-
 		if fdSpec.Account != "" { // Set r.CSUser CloudStack Client per Account and Domain.
 			client, err := c.CSClient.NewClientInDomainAndAccount(fdSpec.Domain, fdSpec.Account)
 			if err != nil {