Merge pull request #83 from aws/fix/add-cluster-to-cr-naming

Prepend Cluster Name to Zone and Iso Network CRs

Author: rejoshed

controllers/cloudstackmachine_controller.go

@@ -96,7 +96,7 @@ func (r *CloudStackMachineReconciliationRunner) Reconcile() (retRes ctrl.Result,
 		r.RequeueIfCloudStackClusterNotReady,
 		r.ConsiderAffinity,
 		r.SetFailureDomainOnCSMachine,
-		r.GetObjectByName("placeholder", r.IsoNet, func() string { return r.FailureDomain.Spec.Network.Name }),
+		r.GetObjectByName("placeholder", r.IsoNet, func() string { return r.IsoNetMetaName(r.FailureDomain.Spec.Network.Name) }),
 		r.GetOrCreateVMInstance,
 		r.RequeueIfInstanceNotRunning,
 		r.AddToLBIfNeeded,

controllers/cloudstackzone_controller.go

@@ -96,7 +96,7 @@ func (r *CloudStackZoneReconciliationRunner) Reconcile() (retRes ctrl.Result, re
 		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(netName, r.IsoNet)(); r.ShouldReturn(res, err) {
+		} else if res, err := r.GetObjectByName(r.IsoNetMetaName(netName), r.IsoNet)(); r.ShouldReturn(res, err) {
 			return res, err
 		}
 		if r.IsoNet.Name == "" {

controllers/utils/affinity_group.go

@@ -31,6 +31,7 @@ import (
 // GenerateIsolatedNetwork of the passed name that's owned by the ReconciliationSubject.
 func (r *ReconciliationRunner) GetOrCreateAffinityGroup(name string, affinityType string, ag *infrav1.CloudStackAffinityGroup) CloudStackReconcilerMethod {
 	return func() (ctrl.Result, error) {
+
 		// Start by attempting a fetch.
 		lowerName := strings.ToLower(name)
 		namespace := r.ReconciliationSubject.GetNamespace()

controllers/utils/isolated_network.go

@@ -17,18 +17,24 @@ limitations under the License.
 package utils
 
 import (
+	"fmt"
 	"strings"
 
 	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1beta1"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
+func (r *ReconciliationRunner) IsoNetMetaName(name string) string {
+	return fmt.Sprintf("%s-%s", r.CSCluster.Name, strings.ToLower(name))
+}
+
 // GenerateIsolatedNetwork of the passed name that's owned by the ReconciliationSubject.
 func (r *ReconciliationRunner) GenerateIsolatedNetwork(name string) CloudStackReconcilerMethod {
 	return func() (ctrl.Result, error) {
 		lowerName := strings.ToLower(name)
+		metaName := fmt.Sprintf("%s-%s", r.CSCluster.Name, lowerName)
 		csIsoNet := &infrav1.CloudStackIsolatedNetwork{}
-		csIsoNet.ObjectMeta = r.NewChildObjectMeta(lowerName)
+		csIsoNet.ObjectMeta = r.NewChildObjectMeta(metaName)
 		csIsoNet.Spec.Name = lowerName
 		csIsoNet.Spec.ControlPlaneEndpoint.Host = r.CSCluster.Spec.ControlPlaneEndpoint.Host
 		csIsoNet.Spec.ControlPlaneEndpoint.Port = r.CSCluster.Spec.ControlPlaneEndpoint.Port

controllers/utils/zones.go

@@ -17,6 +17,7 @@ limitations under the License.
 package utils
 
 import (
+	"fmt"
 	"strings"
 
 	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1beta1"
@@ -28,12 +29,18 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
-// CreateZone generates a specified CloudStackZone CRD owned by the ReconcilationSubject.
-func (r *ReconciliationRunner) CreateZone(zoneSpec infrav1.Zone) error {
+// ZoneMetaName creates a meta name for a zone based on the cluster and zone information.
+func (r *ReconciliationRunner) ZoneMetaName(zoneSpec infrav1.Zone) string {
 	metaName := zoneSpec.Name
 	if metaName == "" {
 		metaName = zoneSpec.ID
 	}
+	return fmt.Sprintf("%s-%s", r.CSCluster.Name, metaName)
+}
+
+// CreateZone generates a specified CloudStackZone CRD owned by the ReconcilationSubject.
+func (r *ReconciliationRunner) CreateZone(zoneSpec infrav1.Zone) error {
+	metaName := r.ZoneMetaName(zoneSpec)
 	csZone := &infrav1.CloudStackZone{
 		ObjectMeta: r.NewChildObjectMeta(metaName),
 		Spec:       infrav1.CloudStackZoneSpec(zoneSpec),