Added check for Completed AppWrappers

Author: Bobbins228

controllers/appwrapper_controller.go

@@ -102,15 +102,15 @@ func (r *AppWrapperReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	}
 
 	// Adds finalizer to the appwrapper if it doesn't exist
-	if !controllerutil.ContainsFinalizer(&appwrapper, finalizerName) {
+	if !controllerutil.ContainsFinalizer(&appwrapper, finalizerName) && appwrapper.Status.State != "Completed" {
 		controllerutil.AddFinalizer(&appwrapper, finalizerName)
 		if err := r.Update(ctx, &appwrapper); err != nil {
 			return ctrl.Result{}, err
 		}
 		return ctrl.Result{}, nil
 	}
 
-	if !appwrapper.ObjectMeta.DeletionTimestamp.IsZero() {
+	if !appwrapper.ObjectMeta.DeletionTimestamp.IsZero() || appwrapper.Status.State == "Completed" {
 		if err := r.finalizeScalingDownMachines(ctx, &appwrapper); err != nil {
 			return ctrl.Result{}, err
 		}
@@ -126,22 +126,13 @@ func (r *AppWrapperReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	if useMachineSets {
 		if reuse {
 			res, err := r.reconcileReuseMachineSet(ctx, &appwrapper, demandPerInstanceType)
-			if err != nil {
-				klog.Infof("Error reconciling MachineSet: %s", err)
-			}
 			return res, err
 		} else {
 			res, err := r.reconcileCreateMachineSet(ctx, &appwrapper, demandPerInstanceType)
-			if err != nil {
-				klog.Infof("Error reconciling MachineSet: %s", err)
-			}
 			return res, err
 		}
 	} else {
 		res, err := r.scaleMachinePool(ctx, &appwrapper, demandPerInstanceType)
-		if err != nil {
-			klog.Infof("Error reconciling MachinePool: %s", err)
-		}
 		return res, err
 	}
 }

controllers/machinepools.go

@@ -35,32 +35,6 @@ func createOCMConnection() (*ocmsdk.Connection, error) {
 	return connection, nil
 }
 
-func scaleMachinePool(aw *arbv1.AppWrapper, userRequestedInstanceType string, replicas int) {
-	connection, err := createOCMConnection()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error creating OCM connection: %v", err)
-		return
-	}
-	defer connection.Close()
-
-	clusterMachinePools := connection.ClustersMgmt().V1().Clusters().Cluster(ocmClusterID).MachinePools()
-
-	m := make(map[string]string)
-	m[aw.Name] = aw.Name
-
-	machinePoolID := strings.ReplaceAll(aw.Name+"-"+userRequestedInstanceType, ".", "-")
-	createMachinePool, 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(context.Background())
-	if err != nil {
-		klog.Errorf(`Error creating MachinePool: %v`, err)
-	}
-	klog.Infof("Created MachinePool: %v", response)
-}
-
 func hasAwLabel(machinePool *cmv1.MachinePool, aw *arbv1.AppWrapper) bool {
 	labels := machinePool.Labels()
 	for key, value := range labels {