Cleanup.

Author: Joshua Reed

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

@@ -284,22 +284,6 @@ spec:
                   - zone
                   type: object
                 type: array
-              identityRef:
-                description: CloudStackIdentityReference is a reference to an infrastructure
-                  provider identity to be used to provision cluster resources.
-                properties:
-                  kind:
-                    description: Kind of the identity. Must be supported by the infrastructure
-                      provider and may be either cluster or namespace-scoped.
-                    minLength: 1
-                    type: string
-                  name:
-                    description: Name of the infrastructure identity to be used.
-                    type: string
-                required:
-                - kind
-                - name
-                type: object
             required:
             - controlPlaneEndpoint
             - failureDomains

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

@@ -390,22 +390,6 @@ spec:
               id:
                 description: ID.
                 type: string
-              identityRef:
-                description: IdentityRef is a reference to a identity to be used when
-                  reconciling this cluster
-                properties:
-                  kind:
-                    description: Kind of the identity. Must be supported by the infrastructure
-                      provider and may be either cluster or namespace-scoped.
-                    minLength: 1
-                    type: string
-                  name:
-                    description: Name of the infrastructure identity to be used.
-                    type: string
-                required:
-                - kind
-                - name
-                type: object
               instanceID:
                 description: Instance ID. Should only be useful to modify an existing
                   instance.
@@ -476,11 +460,8 @@ spec:
               ready:
                 description: Ready indicates the readiness of the provider resource.
                 type: boolean
-              zoneID:
-                description: Zone ID is used so that the zone can be computed once
-                  per reconcile and then propagate.
-                type: string
             required:
+            - addresses
             - ready
             type: object
         type: object

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

@@ -343,24 +343,6 @@ spec:
                       id:
                         description: ID.
                         type: string
-                      identityRef:
-                        description: IdentityRef is a reference to a identity to be
-                          used when reconciling this cluster
-                        properties:
-                          kind:
-                            description: Kind of the identity. Must be supported by
-                              the infrastructure provider and may be either cluster
-                              or namespace-scoped.
-                            minLength: 1
-                            type: string
-                          name:
-                            description: Name of the infrastructure identity to be
-                              used.
-                            type: string
-                        required:
-                        - kind
-                        - name
-                        type: object
                       instanceID:
                         description: Instance ID. Should only be useful to modify
                           an existing instance.

controllers/utils/base_reconciler.go

@@ -78,9 +78,9 @@ type ReconciliationRunner struct {
 type ConcreteRunner interface {
 	ReconcileDelete() (ctrl.Result, error)
 	Reconcile() (ctrl.Result, error)
-	GetReconcilationSubject() client.Object
 }
 
+// NewRunner creates a new ReconciliationRunner pointing to the concrete reconciliation subject.
 func NewRunner(concreteRunner ConcreteRunner, subject client.Object, kind string) *ReconciliationRunner {
 	r := ReconciliationRunner{ReconcilerBase: &ReconcilerBase{}}
 	r.CSCluster = &infrav1.CloudStackCluster{}
@@ -92,13 +92,11 @@ func NewRunner(concreteRunner ConcreteRunner, subject client.Object, kind string
 	return &r
 }
 
-func (r *ReconciliationRunner) GetReconcilationSubject() client.Object {
-	return r.ReconciliationSubject
-}
-
+// UsingBaseReconciler sets up the reconciler to use base reconciler data and either default or alternative
+// feature implementations.
 func (r *ReconciliationRunner) UsingBaseReconciler(base ReconcilerBase) *ReconciliationRunner {
 	*r.ReconcilerBase = base
-	// Now that we have the base either register the base fed extensions or default ones.
+	// Either register the base fed extensions or default ones.
 	if base.CloudClientExtension == nil {
 		r.CloudClientExtension = (&CloudClientImplementation{}).RegisterExtension(r)
 	} else {
@@ -148,6 +146,7 @@ func (r *ReconciliationRunner) RunIf(conditional func() bool, fn CloudStackRecon
 	}
 }
 
+// Else can be used to run a different stage if a previous conditional was false.
 func (r *ReconciliationRunner) Else(fn CloudStackReconcilerMethod) CloudStackReconcilerMethod {
 	return func() (ctrl.Result, error) {
 		if !r.ConditionalResult {