Secrets ref create and fetch test added.

Joshua Reed · Joshua Reed · commit bf98d11b2d22 · 2022-07-07T16:51:02.000-07:00
diff --git a/api/v1beta2/cloudstackfailuredomain_types.go b/api/v1beta2/cloudstackfailuredomain_types.go
@@ -17,9 +17,14 @@ limitations under the License.
 package v1beta2
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+const (
+	FailuDomainFinalizer = "cloudstackzone.infrastructure.cluster.x-k8s.io"
+)
+
 // CloudStackFailureDomainSpec defines the desired state of CloudStackFailureDomain
 type CloudStackFailureDomainSpec struct {
 	// The failure domain unique name.
@@ -36,9 +41,9 @@ type CloudStackFailureDomainSpec struct {
 	// +optional
 	Domain string `json:"domain,omitempty"`
 
-	// Apache CloudStack Endpoint.
+	// Apache CloudStack Endpoint secret reference.
 	// +optional
-	ACSEndpoint string `json:"ACSEndpoint,omitempty"`
+	ACSEndpoint corev1.SecretReference `json:"ACSEndpoint,omitempty"`
 }
 
 // CloudStackFailureDomainStatus defines the observed state of CloudStackFailureDomain
diff --git a/api/v1beta2/zz_generated.deepcopy.go b/api/v1beta2/zz_generated.deepcopy.go
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackclusters.yaml
@@ -227,8 +227,17 @@ spec:
                     of CloudStackFailureDomain
                   properties:
                     ACSEndpoint:
-                      description: Apache CloudStack Endpoint.
-                      type: string
+                      description: Apache CloudStack Endpoint secret reference.
+                      properties:
+                        name:
+                          description: Name is unique within a namespace to reference
+                            a secret resource.
+                          type: string
+                        namespace:
+                          description: Namespace defines the space within which the
+                            secret name must be unique.
+                          type: string
+                      type: object
                     account:
                       description: CloudStack account.
                       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
@@ -39,8 +39,17 @@ spec:
               CloudStackFailureDomain
             properties:
               ACSEndpoint:
-                description: Apache CloudStack Endpoint.
-                type: string
+                description: Apache CloudStack Endpoint secret reference.
+                properties:
+                  name:
+                    description: Name is unique within a namespace to reference a
+                      secret resource.
+                    type: string
+                  namespace:
+                    description: Namespace defines the space within which the secret
+                      name must be unique.
+                    type: string
+                type: object
               account:
                 description: CloudStack account.
                 type: string
diff --git a/controllers/cloudstackaffinitygroup_controller.go b/controllers/cloudstackaffinitygroup_controller.go
@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+	"github.com/onsi/ginkgo/v2"
 
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -54,6 +55,7 @@ func NewCSAGReconciliationRunner() *CloudStackAGReconciliationRunner {
 }
 
 func (reconciler *CloudStackAffinityGroupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	defer ginkgo.GinkgoRecover()
 	return NewCSAGReconciliationRunner().
 		UsingBaseReconciler(reconciler.ReconcilerBase).
 		ForRequest(req).
@@ -62,6 +64,7 @@ func (reconciler *CloudStackAffinityGroupReconciler) Reconcile(ctx context.Conte
 }
 
 func (r *CloudStackAGReconciliationRunner) Reconcile() (ctrl.Result, error) {
+	defer ginkgo.GinkgoRecover()
 	controllerutil.AddFinalizer(r.ReconciliationSubject, infrav1.AffinityGroupFinalizer)
 	affinityGroup := &cloud.AffinityGroup{Name: r.ReconciliationSubject.Spec.Name, Type: r.ReconciliationSubject.Spec.Type}
 	if err := r.CSUser.GetOrCreateAffinityGroup(affinityGroup); err != nil {
diff --git a/controllers/cloudstackcluster_controller.go b/controllers/cloudstackcluster_controller.go
@@ -19,6 +19,7 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"github.com/onsi/ginkgo/v2"
 	"reflect"
 
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -76,6 +77,7 @@ func NewCSClusterReconciliationRunner() *CloudStackClusterReconciliationRunner {
 
 // Reconcile is the method k8s will call upon a reconciliation request.
 func (reconciler *CloudStackClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (retRes ctrl.Result, retErr error) {
+	defer ginkgo.GinkgoRecover()
 	return NewCSClusterReconciliationRunner().
 		UsingBaseReconciler(reconciler.ReconcilerBase).
 		ForRequest(req).
@@ -85,6 +87,7 @@ func (reconciler *CloudStackClusterReconciler) Reconcile(ctx context.Context, re
 
 // Reconcile actually reconciles the CloudStackCluster.
 func (r *CloudStackClusterReconciliationRunner) Reconcile() (res ctrl.Result, reterr error) {
+	defer ginkgo.GinkgoRecover()
 	return r.RunReconciliationStages(
 		r.RequeueIfMissingBaseCRs,
 		r.CreateFailureDomains(r.ReconciliationSubject.Spec.FailureDomains),
diff --git a/controllers/cloudstackfailuredomain_controller.go b/controllers/cloudstackfailuredomain_controller.go
@@ -19,7 +19,12 @@ package controllers
 import (
 	"context"
 
+	"github.com/onsi/ginkgo/v2"
+
+	"github.com/pkg/errors"
+	corev1 "k8s.io/api/core/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
 	csCtrlrUtils "sigs.k8s.io/cluster-api-provider-cloudstack/controllers/utils"
@@ -54,6 +59,7 @@ func NewCSFailureDomainReconciliationRunner() *CloudStackFailureDomainReconcilia
 
 // Reconcile is the method k8s will call upon a reconciliation request.
 func (reconciler *CloudStackFailureDomainReconciler) Reconcile(ctx context.Context, req ctrl.Request) (retRes ctrl.Result, retErr error) {
+	defer ginkgo.GinkgoRecover()
 	return NewCSFailureDomainReconciliationRunner().
 		UsingBaseReconciler(reconciler.ReconcilerBase).
 		ForRequest(req).
@@ -63,7 +69,45 @@ func (reconciler *CloudStackFailureDomainReconciler) Reconcile(ctx context.Conte
 
 // Reconcile on the ReconciliationRunner actually attempts to modify or create the reconciliation subject.
 func (r *CloudStackFailureDomainReconciliationRunner) Reconcile() (retRes ctrl.Result, retErr error) {
-	r.Log.Info("blah2")
+	defer ginkgo.GinkgoRecover()
+	endpointCredentials := &corev1.Secret{}
+	ref := r.ReconciliationSubject.Spec.ACSEndpoint
+	key := client.ObjectKey{Name: ref.Name, Namespace: ref.Namespace}
+	if err := r.K8sClient.Get(r.RequestCtx, key, endpointCredentials); err != nil {
+		return ctrl.Result{}, errors.Wrapf(err, "getting ACSEndpoint secret with ref: %v", ref)
+	}
+	// Prevent premature deletion.
+	controllerutil.AddFinalizer(r.ReconciliationSubject, infrav1.)
+
+	// Start by purely data fetching information about the zone and specified network.
+	if err := r.CSUser.ResolveZone(r.ReconciliationSubject); err != nil {
+		return ctrl.Result{}, errors.Wrap(err, "resolving CloudStack zone information")
+	}
+	if err := r.CSUser.ResolveNetworkForZone(r.ReconciliationSubject); err != nil &&
+		!csCtrlrUtils.ContainsNoMatchSubstring(err) {
+		return ctrl.Result{}, errors.Wrap(err, "resolving Cloudstack network information")
+	}
+
+	// Address Isolated Networks.
+	// Check if the passed network was an isolated network or the network was missing. In either case, create a
+	// CloudStackIsolatedNetwork to manage the many intricacies and wait until CloudStackIsolatedNetwork is ready.
+	if r.ReconciliationSubject.Spec.Network.ID == "" || r.ReconciliationSubject.Spec.Network.Type == infrav1.NetworkTypeIsolated {
+		netName := r.ReconciliationSubject.Spec.Network.Name
+		if res, err := r.GenerateIsolatedNetwork(netName)(); r.ShouldReturn(res, err) {
+			return res, err
+		} else if res, err := r.GetObjectByName(r.IsoNetMetaName(netName), r.IsoNet)(); r.ShouldReturn(res, err) {
+			return res, err
+		}
+		if r.IsoNet.Name == "" {
+			return r.RequeueWithMessage("Couldn't find isolated network.")
+		}
+		if !r.IsoNet.Status.Ready {
+			return r.RequeueWithMessage("Isolated network dependency not ready.")
+		}
+	}
+	r.ReconciliationSubject.Status.Ready = true
+	return ctrl.Result{}, nil
+}
 	r.ReconciliationSubject.Status.Ready = true
 	return ctrl.Result{}, nil
 }
diff --git a/controllers/cloudstackfailuredomain_controller_test.go b/controllers/cloudstackfailuredomain_controller_test.go
@@ -33,6 +33,7 @@ var _ = Describe("CloudStackFailureDomainReconciler", func() {
 		})
 
 		It("Should set failure domain Status.Ready to true.", func() {
+			Ω(k8sClient.Create(ctx, dummies.ACSEndpointSecret1))
 			Ω(k8sClient.Create(ctx, dummies.CSFailureDomain1))
 
 			tempfd := &infrav1.CloudStackFailureDomain{}
diff --git a/controllers/cloudstackisolatednetwork_controller.go b/controllers/cloudstackisolatednetwork_controller.go
@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+	"github.com/onsi/ginkgo/v2"
 	"strings"
 
 	"sigs.k8s.io/cluster-api/util/patch"
@@ -57,6 +58,7 @@ func NewCSIsoNetReconciliationRunner() *CloudStackIsoNetReconciliationRunner {
 }
 
 func (reconciler *CloudStackIsoNetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.Result, retErr error) {
+	defer ginkgo.GinkgoRecover()
 	return NewCSIsoNetReconciliationRunner().
 		UsingBaseReconciler(reconciler.ReconcilerBase).
 		ForRequest(req).
@@ -65,6 +67,7 @@ func (reconciler *CloudStackIsoNetReconciler) Reconcile(ctx context.Context, req
 }
 
 func (r *CloudStackIsoNetReconciliationRunner) Reconcile() (retRes ctrl.Result, retErr error) {
+	defer ginkgo.GinkgoRecover()
 	if res, err := r.RequeueIfMissingBaseCRs(); r.ShouldReturn(res, err) {
 		return res, err
 	}
diff --git a/controllers/cloudstackmachine_controller.go b/controllers/cloudstackmachine_controller.go
@@ -19,6 +19,7 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"github.com/onsi/ginkgo/v2"
 	"math/rand"
 	"reflect"
 
@@ -81,6 +82,7 @@ func NewCSMachineReconciliationRunner() *CloudStackMachineReconciliationRunner {
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
 func (reconciler *CloudStackMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.Result, retErr error) {
+	defer ginkgo.GinkgoRecover()
 	return NewCSMachineReconciliationRunner().
 		UsingBaseReconciler(reconciler.ReconcilerBase).
 		ForRequest(req).
@@ -89,6 +91,7 @@ func (reconciler *CloudStackMachineReconciler) Reconcile(ctx context.Context, re
 }
 
 func (r *CloudStackMachineReconciliationRunner) Reconcile() (retRes ctrl.Result, reterr error) {
+	defer ginkgo.GinkgoRecover()
 	return r.RunReconciliationStages(
 		r.GetZonesAndRequeueIfMissing(r.Zones),
 		r.GetParent(r.ReconciliationSubject, r.CAPIMachine),
diff --git a/controllers/cloudstackmachinestatechecker_controller.go b/controllers/cloudstackmachinestatechecker_controller.go
@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+	"github.com/onsi/ginkgo/v2"
 	"strings"
 	"time"
 
@@ -59,6 +60,7 @@ func NewCSMachineStateCheckerReconciliationRunner() *CloudStackMachineStateCheck
 }
 
 func (r *CloudStackMachineStateCheckerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	defer ginkgo.GinkgoRecover()
 	return NewCSMachineStateCheckerReconciliationRunner().
 		UsingBaseReconciler(r.ReconcilerBase).
 		ForRequest(req).
@@ -67,6 +69,7 @@ func (r *CloudStackMachineStateCheckerReconciler) Reconcile(ctx context.Context,
 }
 
 func (r *CloudStackMachineStateCheckerReconciliationRunner) Reconcile() (ctrl.Result, error) {
+	defer ginkgo.GinkgoRecover()
 	if res, err := r.GetParent(r.ReconciliationSubject, r.CSMachine)(); r.ShouldReturn(res, err) {
 		return res, err
 	}
diff --git a/controllers/cloudstackzone_controller.go b/controllers/cloudstackzone_controller.go
@@ -19,6 +19,8 @@ package controllers
 import (
 	"context"
 
+	"github.com/onsi/ginkgo/v2"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
@@ -57,6 +59,7 @@ func NewCSZoneReconciliationRunner() *CloudStackZoneReconciliationRunner {
 
 // Reconciler Reconcile adapts the runner to the runner to what k8s expects.
 func (reconciler *CloudStackZoneReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.Result, retErr error) {
+	defer ginkgo.GinkgoRecover()
 	return NewCSZoneReconciliationRunner().
 		UsingBaseReconciler(reconciler.ReconcilerBase).
 		ForRequest(req).
@@ -73,8 +76,9 @@ func (reconciler *CloudStackZoneReconciler) SetupWithManager(mgr ctrl.Manager) e
 
 // Reconcile attempts to move the state of CRs to the requested state.
 func (r *CloudStackZoneReconciliationRunner) Reconcile() (retRes ctrl.Result, reterr error) {
+	defer ginkgo.GinkgoRecover()
 	// Prevent premature deletion.
-	controllerutil.AddFinalizer(r.ReconciliationSubject, infrav1.ZoneFinalizer)
+	controllerutil.AddFinalizer(r.ReconciliationSubject, infrav1.FailuDomainFinalizer)
 
 	// Start by purely data fetching information about the zone and specified network.
 	if err := r.CSUser.ResolveZone(r.ReconciliationSubject); err != nil {
diff --git a/controllers/controllers_suite_test.go b/controllers/controllers_suite_test.go
@@ -215,7 +215,7 @@ func SetupTestEnvironment() {
 
 	// See reconciliation results. Left commented as it's noisy otherwise.
 	// TODO: find a way to see controller output without the additional setup output.
-	// ctrl.SetLogger(logger)
+	ctrl.SetLogger(logger)
 
 	DeferCleanup(func() {
 		// Cancelling the context shuts down any outstanding requests and the test environment.

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ package controllers`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"context"`
	`21`	`+ "github.com/onsi/ginkgo/v2"`
`21`	`22`	`"strings"`
`22`	`23`
`23`	`24`	`"sigs.k8s.io/cluster-api/util/patch"`
`@@ -57,6 +58,7 @@ func NewCSIsoNetReconciliationRunner() *CloudStackIsoNetReconciliationRunner {`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`func (reconciler *CloudStackIsoNetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.Result, retErr error) {`
	`61`	`+ defer ginkgo.GinkgoRecover()`
`60`	`62`	`return NewCSIsoNetReconciliationRunner().`
`61`	`63`	`UsingBaseReconciler(reconciler.ReconcilerBase).`
`62`	`64`	`ForRequest(req).`
`@@ -65,6 +67,7 @@ func (reconciler *CloudStackIsoNetReconciler) Reconcile(ctx context.Context, req`
`65`	`67`	`}`
`66`	`68`
`67`	`69`	`func (r *CloudStackIsoNetReconciliationRunner) Reconcile() (retRes ctrl.Result, retErr error) {`
	`70`	`+ defer ginkgo.GinkgoRecover()`
`68`	`71`	`if res, err := r.RequeueIfMissingBaseCRs(); r.ShouldReturn(res, err) {`
`69`	`72`	`return res, err`
`70`	`73`	`}`