add: naming convention adjustments to nodepools, and machinepools

Author: VanillaSpoon

controllers/appwrapper_controller.go

@@ -43,14 +43,15 @@ type MachineType string
 // AppWrapperReconciler reconciles a AppWrapper object
 type AppWrapperReconciler struct {
 	client.Client
-	Scheme        *runtime.Scheme
-	Config        config.InstaScaleConfiguration
-	kubeClient    *kubernetes.Clientset
-	ocmClusterID  string
-	ocmToken      string
-	ocmConnection *ocmsdk.Connection
-	MachineType   MachineType
-	machineCheck  bool
+	Scheme                    *runtime.Scheme
+	Config                    config.InstaScaleConfiguration
+	kubeClient                *kubernetes.Clientset
+	ocmClusterID              string
+	ocmToken                  string
+	ocmConnection             *ocmsdk.Connection
+	MachineType               MachineType
+	machineCheck              bool
+	machineNameCharacterLimit int
 }
 
 var (
@@ -164,6 +165,7 @@ func (r *AppWrapperReconciler) setMachineType(ctx context.Context) error {
 	}
 	if hypershiftEnabled {
 		r.MachineType = MachineTypeNodePool
+		r.machineNameCharacterLimit = 15
 	}
 	r.machineCheck = true
 	return nil
@@ -223,6 +225,7 @@ func (r *AppWrapperReconciler) finalizeScalingDownMachines(ctx context.Context,
 // SetupWithManager sets up the controller with the Manager.
 func (r *AppWrapperReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
 	restConfig := mgr.GetConfig()
+	r.machineNameCharacterLimit = 30
 
 	var err error
 	r.kubeClient, err = kubernetes.NewForConfig(restConfig)

controllers/machinepools.go

@@ -3,11 +3,9 @@ package controllers
 import (
 	"context"
 	"fmt"
-	"os"
-	"strings"
-
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 	arbv1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
+	"os"
 
 	"k8s.io/klog"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -44,13 +42,13 @@ func (r *AppWrapperReconciler) scaleMachinePool(ctx context.Context, aw *arbv1.A
 			m[aw.Name] = aw.Name
 			klog.Infof("The instanceRequired array: %v", userRequestedInstanceType)
 
-			machinePoolID := strings.ReplaceAll(aw.Name+"-"+userRequestedInstanceType, ".", "-")
-			createMachinePool, err := cmv1.NewMachinePool().ID(machinePoolID).InstanceType(userRequestedInstanceType).Replicas(replicas).Labels(m).Build()
+			machinePoolID := r.generateMachineName(aw.Name)
+			machinePool, err := cmv1.NewMachinePool().ID(machinePoolID).InstanceType(userRequestedInstanceType).Replicas(replicas).Labels(m).Build()
 			if err != nil {
 				klog.Errorf(`Error building MachinePool: %v`, err)
 			}
-			klog.Infof("Built MachinePool with instance type %v and name %v", userRequestedInstanceType, createMachinePool.ID())
-			response, err := clusterMachinePools.Add().Body(createMachinePool).SendContext(ctx)
+			klog.Infof("Built MachinePool with instance type %v and name %v", userRequestedInstanceType, machinePool.ID())
+			response, err := clusterMachinePools.Add().Body(machinePool).SendContext(ctx)
 			if err != nil {
 				klog.Errorf(`Error creating MachinePool: %v`, err)
 			}
@@ -73,15 +71,17 @@ func (r *AppWrapperReconciler) deleteMachinePool(ctx context.Context, aw *arbv1.
 	machinePoolsListResponse, _ := machinePoolsConnection.Send()
 	machinePoolsList := machinePoolsListResponse.Items()
 	machinePoolsList.Range(func(index int, item *cmv1.MachinePool) bool {
-		id, _ := item.GetID()
-		if strings.Contains(id, aw.Name) {
+		if hasAwLabel(item.Labels(), aw) {
+			id, _ := item.GetID()
 			targetMachinePool, err := connection.ClustersMgmt().V1().Clusters().Cluster(r.ocmClusterID).MachinePools().MachinePool(id).Delete().SendContext(ctx)
 			if err != nil {
 				klog.Infof("Error deleting target machinepool %v", targetMachinePool)
+			} else {
+				klog.Infof("Successfully scaled down target machinepool %v", id)
 			}
-			klog.Infof("Successfully Scaled down target machinepool %v", id)
 		}
 		return true
 	})
+
 	return ctrl.Result{Requeue: false}, nil
 }

controllers/nodepools.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"strings"
 
 	cmv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
 	arbv1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
@@ -45,14 +44,13 @@ func (r *AppWrapperReconciler) scaleNodePool(ctx context.Context, aw *arbv1.AppW
 			m[aw.Name] = aw.Name
 			klog.Infof("The instanceRequired array: %v", userRequestedInstanceType)
 
-			nodePoolID := strings.ReplaceAll(aw.Name+"-"+userRequestedInstanceType, ".", "-")
-
-			createNodePool, err := cmv1.NewNodePool().AWSNodePool(cmv1.NewAWSNodePool().InstanceType(userRequestedInstanceType)).ID(nodePoolID).Replicas(replicas).Labels(m).Build()
+			nodePoolID := r.generateMachineName(aw.Name)
+			nodePool, err := cmv1.NewNodePool().AWSNodePool(cmv1.NewAWSNodePool().InstanceType(userRequestedInstanceType)).ID(nodePoolID).Replicas(replicas).Labels(m).Build()
 			if err != nil {
 				klog.Errorf(`Error building NodePool: %v`, err)
 			}
-			klog.Infof("Built NodePool with instance type %v and name %v", userRequestedInstanceType, createNodePool.ID())
-			response, err := clusterNodePools.Add().Body(createNodePool).SendContext(ctx)
+			klog.Infof("Built NodePool with instance type %v and name %v", userRequestedInstanceType, nodePool.ID())
+			response, err := clusterNodePools.Add().Body(nodePool).SendContext(ctx)
 			if err != nil {
 				klog.Errorf(`Error creating NodePool: %v`, err)
 			}
@@ -75,13 +73,14 @@ func (r *AppWrapperReconciler) deleteNodePool(ctx context.Context, aw *arbv1.App
 	nodePoolsListResponse, _ := nodePoolsConnection.Send()
 	nodePoolsList := nodePoolsListResponse.Items()
 	nodePoolsList.Range(func(index int, item *cmv1.NodePool) bool {
-		id, _ := item.GetID()
-		if strings.Contains(id, aw.Name) {
+		if hasAwLabel(item.Labels(), aw) {
+			id, _ := item.GetID()
 			targetNodePool, err := connection.ClustersMgmt().V1().Clusters().Cluster(r.ocmClusterID).NodePools().NodePool(id).Delete().SendContext(ctx)
 			if err != nil {
 				klog.Infof("Error deleting target nodepool %v", targetNodePool)
+			} else {
+				klog.Infof("Successfully scaled down target nodepool %v", id)
 			}
-			klog.Infof("Successfully Scaled down target nodepool %v", id)
 		}
 		return true
 	})

controllers/utils.go

@@ -68,3 +68,17 @@ func hasAwLabel(labels map[string]string, aw *arbv1.AppWrapper) bool {
 	value, ok := labels[aw.Name]
 	return ok && value == aw.Name
 }
+
+func (r *AppWrapperReconciler) generateMachineName(awName string) string {
+	const randomSuffixLength = 4
+	maxBaseNameLength := r.machineNameCharacterLimit - randomSuffixLength - 1
+
+	// Truncate the base name if it exceeds the maximum length.
+	if len(awName) > maxBaseNameLength {
+		truncatedName := awName[:maxBaseNameLength]
+		klog.Infof("instance name exceeds %v character limit. Name has been truncated to %v", r.machineNameCharacterLimit, truncatedName)
+		awName = truncatedName
+	}
+
+	return fmt.Sprintf("%s-%04x", awName, rand.Intn(1<<16))
+}