add: appwrapper condition check for scale-up

project-codeflare · Dec 12, 2023 · 97b3a2f · 97b3a2f
1 parent fafee56
commit 97b3a2f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/controllers/appwrapper_controller.go b/controllers/appwrapper_controller.go
@@ -120,17 +120,22 @@ func (r *AppWrapperReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, nil
 	}
 
-	demandPerInstanceType := r.discoverInstanceTypes(ctx, &appwrapper)
-	if ocmSecretRef := r.Config.OCMSecretRef; ocmSecretRef != nil {
-		return r.scaleMachinePool(ctx, &appwrapper, demandPerInstanceType)
-	} else {
-		switch strings.ToLower(r.Config.MachineSetsStrategy) {
-		case "reuse":
-			return r.reconcileReuseMachineSet(ctx, &appwrapper, demandPerInstanceType)
-		case "duplicate":
-			return r.reconcileCreateMachineSet(ctx, &appwrapper, demandPerInstanceType)
+	status := appwrapper.Status.State
+	allconditions := appwrapper.Status.Conditions
+	if status == "Pending" && containsInsufficientCondition(allconditions) {
+		demandPerInstanceType := r.discoverInstanceTypes(ctx, &appwrapper)
+		if ocmSecretRef := r.Config.OCMSecretRef; ocmSecretRef != nil {
+			return r.scaleMachinePool(ctx, &appwrapper, demandPerInstanceType)
+		} else {
+			switch strings.ToLower(r.Config.MachineSetsStrategy) {
+			case "reuse":
+				return r.reconcileReuseMachineSet(ctx, &appwrapper, demandPerInstanceType)
+			case "duplicate":
+				return r.reconcileCreateMachineSet(ctx, &appwrapper, demandPerInstanceType)
+			}
 		}
 	}
+
 	return ctrl.Result{}, nil
 }
 

diff --git a/controllers/utils.go b/controllers/utils.go
@@ -5,9 +5,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/rand"
+	"strings"
 	"time"
 
 	machinev1 "github.com/openshift/api/machine/v1beta1"
+	arbv1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
@@ -19,6 +21,15 @@ func resyncPeriod() func() time.Duration {
 	}
 }
 
+func containsInsufficientCondition(allconditions []arbv1.AppWrapperCondition) bool {
+	for _, condition := range allconditions {
+		if strings.Contains(condition.Message, "Insufficient") {
+			return true
+		}
+	}
+	return false
+}
+
 // ProviderSpecFromRawExtension unmarshals the JSON-encoded spec
 func ProviderSpecFromRawExtension(ctx context.Context, rawExtension *runtime.RawExtension) (*machinev1.AWSMachineProviderConfig, error) {
 	logger := ctrl.LoggerFrom(ctx)