Failure domain fetches data and goes ready.

Joshua Reed · Joshua Reed · commit 917c20530cec · 2022-07-12T16:48:58.000-07:00
diff --git a/api/v1beta2/cloudstackcluster_webhook.go b/api/v1beta2/cloudstackcluster_webhook.go
@@ -45,14 +45,7 @@ func (r *CloudStackCluster) Default() {
 	// No defaulted values supported yet.
 }
 
-// +kubebuilder:webhook:
-// name=vcloudstackcluster.kb.io
-// groups=infrastructure.cluster.x-k8s.io,resources=cloudstackclusters
-// versions=v1beta2
-// verbs=create;update
-// path=/validate-infrastructure-cluster-x-k8s-io-v1beta2-cloudstackcluster
-// mutating=false,failurePolicy=fail,sideEffects=None
-// admissionReviewVersions=v1beta2
+// +kubebuilder:webhook:name=vcloudstackcluster.kb.io,groups=infrastructure.cluster.x-k8s.io,resources=cloudstackclusters,versions=v1beta2,verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta2-cloudstackcluster,mutating=false,failurePolicy=fail,sideEffects=None,admissionReviewVersions=v1beta1
 
 var _ webhook.Validator = &CloudStackCluster{}
 
@@ -83,6 +76,11 @@ func (r *CloudStackCluster) ValidateCreate() error {
 					field.NewPath("spec", "FailureDomains", "Zone", "Network"),
 					"each Zone requires a Network specification"))
 			}
+			if fdSpec.ACSEndpoint.Name == "" || fdSpec.ACSEndpoint.Namespace == "" {
+				errorList = append(errorList, field.Required(
+					field.NewPath("spec", "FailureDomains", "ACSEndpoint"),
+					"Name and Namespace are required"))
+			}
 		}
 	}
 
diff --git a/api/v1beta2/cloudstackfailuredomain_types.go b/api/v1beta2/cloudstackfailuredomain_types.go
@@ -43,7 +43,7 @@ type CloudStackFailureDomainSpec struct {
 
 	// Apache CloudStack Endpoint secret reference.
 	// +optional
-	ACSEndpoint corev1.SecretReference `json:"ACSEndpoint,omitempty"`
+	ACSEndpoint corev1.SecretReference `json:"acsendpoint,omitempty"`
 }
 
 // CloudStackFailureDomainStatus defines the observed state of CloudStackFailureDomain
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackclusters.yaml
@@ -226,7 +226,10 @@ spec:
                   description: CloudStackFailureDomainSpec defines the desired state
                     of CloudStackFailureDomain
                   properties:
-                    ACSEndpoint:
+                    account:
+                      description: CloudStack account.
+                      type: string
+                    acsendpoint:
                       description: Apache CloudStack Endpoint secret reference.
                       properties:
                         name:
@@ -238,9 +241,6 @@ spec:
                             secret name must be unique.
                           type: string
                       type: object
-                    account:
-                      description: CloudStack account.
-                      type: string
                     domain:
                       description: CloudStack domain.
                       type: string
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackfailuredomains.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackfailuredomains.yaml
@@ -38,7 +38,10 @@ spec:
             description: CloudStackFailureDomainSpec defines the desired state of
               CloudStackFailureDomain
             properties:
-              ACSEndpoint:
+              account:
+                description: CloudStack account.
+                type: string
+              acsendpoint:
                 description: Apache CloudStack Endpoint secret reference.
                 properties:
                   name:
@@ -50,9 +53,6 @@ spec:
                       name must be unique.
                     type: string
                 type: object
-              account:
-                description: CloudStack account.
-                type: string
               domain:
                 description: CloudStack domain.
                 type: string
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackisolatednetworks.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackisolatednetworks.yaml
@@ -122,7 +122,10 @@ spec:
                 description: FailureDomain -- the FailureDomain the network is placed
                   in.
                 properties:
-                  ACSEndpoint:
+                  account:
+                    description: CloudStack account.
+                    type: string
+                  acsendpoint:
                     description: Apache CloudStack Endpoint secret reference.
                     properties:
                       name:
@@ -134,9 +137,6 @@ spec:
                           secret name must be unique.
                         type: string
                     type: object
-                  account:
-                    description: CloudStack account.
-                    type: string
                   domain:
                     description: CloudStack domain.
                     type: string
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackmachines.yaml
@@ -387,7 +387,10 @@ spec:
                 description: FailureDomain -- the FailureDomain the machine is placed
                   in.
                 properties:
-                  ACSEndpoint:
+                  account:
+                    description: CloudStack account.
+                    type: string
+                  acsendpoint:
                     description: Apache CloudStack Endpoint secret reference.
                     properties:
                       name:
@@ -399,9 +402,6 @@ spec:
                           secret name must be unique.
                         type: string
                     type: object
-                  account:
-                    description: CloudStack account.
-                    type: string
                   domain:
                     description: CloudStack domain.
                     type: string
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackmachinetemplates.yaml
@@ -340,7 +340,10 @@ spec:
                         description: FailureDomain -- the FailureDomain the machine
                           is placed in.
                         properties:
-                          ACSEndpoint:
+                          account:
+                            description: CloudStack account.
+                            type: string
+                          acsendpoint:
                             description: Apache CloudStack Endpoint secret reference.
                             properties:
                               name:
@@ -352,9 +355,6 @@ spec:
                                   the secret name must be unique.
                                 type: string
                             type: object
-                          account:
-                            description: CloudStack account.
-                            type: string
                           domain:
                             description: CloudStack domain.
                             type: string
diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
@@ -34,6 +34,26 @@ metadata:
   creationTimestamp: null
   name: validating-webhook-configuration
 webhooks:
+- admissionReviewVersions:
+  - v1beta1
+  clientConfig:
+    service:
+      name: webhook-service
+      namespace: system
+      path: /validate-infrastructure-cluster-x-k8s-io-v1beta2-cloudstackcluster
+  failurePolicy: Fail
+  name: vcloudstackcluster.kb.io
+  rules:
+  - apiGroups:
+    - infrastructure.cluster.x-k8s.io
+    apiVersions:
+    - v1beta2
+    operations:
+    - CREATE
+    - UPDATE
+    resources:
+    - cloudstackclusters
+  sideEffects: None
 - admissionReviewVersions:
   - v1beta1
   clientConfig:
diff --git a/controllers/cloudstackcluster_controller.go b/controllers/cloudstackcluster_controller.go
@@ -88,9 +88,9 @@ func (r *CloudStackClusterReconciliationRunner) Reconcile() (res ctrl.Result, re
 	return r.RunReconciliationStages(
 		r.RequeueIfMissingBaseCRs,
 		r.CreateFailureDomains(r.ReconciliationSubject.Spec.FailureDomains),
-		r.CheckOwnedCRDsForReadiness(infrav1.GroupVersion.WithKind("CloudStackZone")),
+		r.CheckOwnedCRDsForReadiness(infrav1.GroupVersion.WithKind("CloudStackFailureDomain")),
 		r.GetFailureDomains(r.FailureDomains),
-		r.VerifyZoneCRDs,
+		r.VerifyFailureDomainCRDs,
 		r.SetFailureDomains,
 		r.SetReady)
 }
@@ -102,16 +102,16 @@ func (r *CloudStackClusterReconciliationRunner) SetReady() (ctrl.Result, error)
 	return ctrl.Result{}, nil
 }
 
-// VerifyFailureDomainCRDs verifies the Zone CRDs found match against those requested.
-func (r *CloudStackClusterReconciliationRunner) VerifyZoneCRDs() (ctrl.Result, error) {
+// VerifyFailureDomainCRDs verifies the FailureDomains found match against those requested.
+func (r *CloudStackClusterReconciliationRunner) VerifyFailureDomainCRDs() (ctrl.Result, error) {
 	expected := len(r.ReconciliationSubject.Spec.FailureDomains)
 	actual := len(r.FailureDomains.Items)
 	if expected != actual {
-		return r.RequeueWithMessage(fmt.Sprintf("Expected %d Zones, but found %d", expected, actual))
+		return r.RequeueWithMessage(fmt.Sprintf("Expected %d FailureDomains, but found %d", expected, actual))
 	}
 	for _, fd := range r.FailureDomains.Items {
 		if !fd.Status.Ready {
-			return r.RequeueWithMessage(fmt.Sprintf("Zone %s/%s not ready, requeueing.", fd.Namespace, fd.Name))
+			return r.RequeueWithMessage(fmt.Sprintf("FailureDomains %s/%s not ready, requeueing.", fd.Namespace, fd.Name))
 		}
 	}
 	return ctrl.Result{}, nil
@@ -138,7 +138,7 @@ func (r *CloudStackClusterReconciliationRunner) ReconcileDelete() (ctrl.Result,
 				return ctrl.Result{}, err
 			}
 		}
-		return r.RequeueWithMessage("Child Zones still present, requeueing.")
+		return r.RequeueWithMessage("Child FailureDomains still present, requeueing.")
 	}
 	controllerutil.RemoveFinalizer(r.ReconciliationSubject, infrav1.ClusterFinalizer)
 	return ctrl.Result{}, nil
diff --git a/controllers/utils/failuredomains.go b/controllers/utils/failuredomains.go
@@ -90,19 +90,33 @@ func (r *ReconciliationRunner) AsFailureDomainUser(fdSpec infrav1.CloudStackFail
 			return ctrl.Result{}, errors.Wrapf(err, "getting ACSEndpoint secret with ref: %v", fdSpec.ACSEndpoint)
 		}
 
+		config := map[string]interface{}{}
+		for k, v := range endpointCredentials.Data {
+			config[k] = string(v)
+		}
+		// TODO change secret parsing manner.
+		if val, present := config["verify-ssl"]; present {
+			if val == "true" {
+				config["verify-ssl"] = true
+			} else if val == "false" {
+				config["verify-ssl"] = false
+			}
+		}
+
 		var err error
-		if r.CSClient, err = cloud.NewClientFromMap(endpointCredentials.StringData); err != nil {
+		if r.CSClient, err = cloud.NewClientFromMap(config); err != nil {
 			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 r.CSCluster.Spec.Account != "" {
 				fdSpec.Account = r.CSCluster.Spec.Account
 				fdSpec.Domain = r.CSCluster.Spec.Domain
 			}
 		}
 
-		if r.CSCluster.Spec.Account != "" {
+		if r.CSCluster.Spec.Account != "" { // Set r.CSUser CloudStack Client per Account and Domain.
 			user := &cloud.User{}
 			user.Account.Domain.Path = r.CSCluster.Spec.Domain
 			user.Account.Name = r.CSCluster.Spec.Account
@@ -112,7 +126,7 @@ func (r *ReconciliationRunner) AsFailureDomainUser(fdSpec infrav1.CloudStackFail
 				return ctrl.Result{}, errors.Errorf("could not find sufficient user (with API keys) in domain/account %s/%s",
 					r.CSCluster.Spec.Domain, r.CSCluster.Spec.Account)
 			}
-			newUser := endpointCredentials.StringData
+			newUser := config
 			newUser["api-key"] = user.APIKey
 			newUser["secret-key"] = user.SecretKey
 
@@ -121,6 +135,8 @@ func (r *ReconciliationRunner) AsFailureDomainUser(fdSpec infrav1.CloudStackFail
 				return ctrl.Result{}, err
 			}
 			r.CSUser = client
+		} else { // Set r.CSUser CloudStack Client to r.CSClient since Account & Domain weren't provided.
+			r.CSUser = r.CSClient
 		}
 
 		return ctrl.Result{}, nil
diff --git a/main.go b/main.go
@@ -41,7 +41,7 @@ import (
 
 	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
 
-	infrav1b1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
+	//infrav1b1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
 	infrav1b2 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
 	"sigs.k8s.io/cluster-api-provider-cloudstack/controllers"
 	"sigs.k8s.io/cluster-api-provider-cloudstack/controllers/utils"
@@ -57,7 +57,7 @@ func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 	utilruntime.Must(clusterv1.AddToScheme(scheme))
 	utilruntime.Must(controlplanev1.AddToScheme(scheme))
-	utilruntime.Must(infrav1b1.AddToScheme(scheme))
+	//utilruntime.Must(infrav1b1.AddToScheme(scheme))
 	utilruntime.Must(infrav1b2.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }
@@ -190,10 +190,6 @@ func setupReconcilers(base utils.ReconcilerBase, mgr manager.Manager) {
 		setupLog.Error(err, "unable to create controller", "controller", "CloudStackCluster")
 		os.Exit(1)
 	}
-	if err := (&controllers.CloudStackZoneReconciler{ReconcilerBase: base}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "CloudStackZone")
-		os.Exit(1)
-	}
 	if err := (&controllers.CloudStackMachineReconciler{ReconcilerBase: base}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "CloudStackMachine")
 		os.Exit(1)
diff --git a/pkg/cloud/client.go b/pkg/cloud/client.go
@@ -49,7 +49,7 @@ type Config struct {
 }
 
 // Creates a new Cloud Client form a map of strings to strings.
-func NewClientFromMap(rawCfg map[string]string) (Client, error) {
+func NewClientFromMap(rawCfg map[string]interface{}) (Client, error) {
 	cfg := Config{VerifySSL: true} // Set sane defautl for verify-ssl.
 	// Use JSON methods to enforce schema in parsing.
 	if bytes, err := json.Marshal(rawCfg); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -45,14 +45,7 @@ func (r *CloudStackCluster) Default() {`
`45`	`45`	`// No defaulted values supported yet.`
`46`	`46`	`}`
`47`	`47`
`48`		`-// +kubebuilder:webhook:`
`49`		`-// name=vcloudstackcluster.kb.io`
`50`		`-// groups=infrastructure.cluster.x-k8s.io,resources=cloudstackclusters`
`51`		`-// versions=v1beta2`
`52`		`-// verbs=create;update`
`53`		`-// path=/validate-infrastructure-cluster-x-k8s-io-v1beta2-cloudstackcluster`
`54`		`-// mutating=false,failurePolicy=fail,sideEffects=None`
`55`		`-// admissionReviewVersions=v1beta2`
	`48`	`+// +kubebuilder:webhook:name=vcloudstackcluster.kb.io,groups=infrastructure.cluster.x-k8s.io,resources=cloudstackclusters,versions=v1beta2,verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta2-cloudstackcluster,mutating=false,failurePolicy=fail,sideEffects=None,admissionReviewVersions=v1beta1`
`56`	`49`
`57`	`50`	`var _ webhook.Validator = &CloudStackCluster{}`
`58`	`51`
`@@ -83,6 +76,11 @@ func (r *CloudStackCluster) ValidateCreate() error {`
`83`	`76`	`field.NewPath("spec", "FailureDomains", "Zone", "Network"),`
`84`	`77`	`"each Zone requires a Network specification"))`
`85`	`78`	`}`
	`79`	`+ if fdSpec.ACSEndpoint.Name == "" \|\| fdSpec.ACSEndpoint.Namespace == "" {`
	`80`	`+ errorList = append(errorList, field.Required(`
	`81`	`+ field.NewPath("spec", "FailureDomains", "ACSEndpoint"),`
	`82`	`+ "Name and Namespace are required"))`
	`83`	`+ }`
`86`	`84`	`}`
`87`	`85`	`}`
`88`	`86`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ type CloudStackFailureDomainSpec struct {`
`43`	`43`
`44`	`44`	`// Apache CloudStack Endpoint secret reference.`
`45`	`45`	`// +optional`
`46`		- ACSEndpoint corev1.SecretReference `json:"ACSEndpoint,omitempty"`
	`46`	+ ACSEndpoint corev1.SecretReference `json:"acsendpoint,omitempty"`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// CloudStackFailureDomainStatus defines the observed state of CloudStackFailureDomain`
Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,9 @@ func (r *CloudStackClusterReconciliationRunner) Reconcile() (res ctrl.Result, re`
`88`	`88`	`return r.RunReconciliationStages(`
`89`	`89`	`r.RequeueIfMissingBaseCRs,`
`90`	`90`	`r.CreateFailureDomains(r.ReconciliationSubject.Spec.FailureDomains),`
`91`		`- r.CheckOwnedCRDsForReadiness(infrav1.GroupVersion.WithKind("CloudStackZone")),`
	`91`	`+ r.CheckOwnedCRDsForReadiness(infrav1.GroupVersion.WithKind("CloudStackFailureDomain")),`
`92`	`92`	`r.GetFailureDomains(r.FailureDomains),`
`93`		`- r.VerifyZoneCRDs,`
	`93`	`+ r.VerifyFailureDomainCRDs,`
`94`	`94`	`r.SetFailureDomains,`
`95`	`95`	`r.SetReady)`
`96`	`96`	`}`
`@@ -102,16 +102,16 @@ func (r *CloudStackClusterReconciliationRunner) SetReady() (ctrl.Result, error)`
`102`	`102`	`return ctrl.Result{}, nil`
`103`	`103`	`}`
`104`	`104`
`105`		`-// VerifyFailureDomainCRDs verifies the Zone CRDs found match against those requested.`
`106`		`-func (r *CloudStackClusterReconciliationRunner) VerifyZoneCRDs() (ctrl.Result, error) {`
	`105`	`+// VerifyFailureDomainCRDs verifies the FailureDomains found match against those requested.`
	`106`	`+func (r *CloudStackClusterReconciliationRunner) VerifyFailureDomainCRDs() (ctrl.Result, error) {`
`107`	`107`	`expected := len(r.ReconciliationSubject.Spec.FailureDomains)`
`108`	`108`	`actual := len(r.FailureDomains.Items)`
`109`	`109`	`if expected != actual {`
`110`		`- return r.RequeueWithMessage(fmt.Sprintf("Expected %d Zones, but found %d", expected, actual))`
	`110`	`+ return r.RequeueWithMessage(fmt.Sprintf("Expected %d FailureDomains, but found %d", expected, actual))`
`111`	`111`	`}`
`112`	`112`	`for _, fd := range r.FailureDomains.Items {`
`113`	`113`	`if !fd.Status.Ready {`
`114`		`- return r.RequeueWithMessage(fmt.Sprintf("Zone %s/%s not ready, requeueing.", fd.Namespace, fd.Name))`
	`114`	`+ return r.RequeueWithMessage(fmt.Sprintf("FailureDomains %s/%s not ready, requeueing.", fd.Namespace, fd.Name))`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`return ctrl.Result{}, nil`
`@@ -138,7 +138,7 @@ func (r *CloudStackClusterReconciliationRunner) ReconcileDelete() (ctrl.Result,`
`138`	`138`	`return ctrl.Result{}, err`
`139`	`139`	`}`
`140`	`140`	`}`
`141`		`- return r.RequeueWithMessage("Child Zones still present, requeueing.")`
	`141`	`+ return r.RequeueWithMessage("Child FailureDomains still present, requeueing.")`
`142`	`142`	`}`
`143`	`143`	`controllerutil.RemoveFinalizer(r.ReconciliationSubject, infrav1.ClusterFinalizer)`
`144`	`144`	`return ctrl.Result{}, nil`