Merge branch 'main' into test-pkg-workflow

Azure · Jun 23, 2021 · 3396ccf · 3396ccf
2 parents 250a9ba + 49631d9
commit 3396ccf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/chart/orkestra/values.yaml b/chart/orkestra/values.yaml
@@ -75,18 +75,20 @@ argo-workflows:
       enabled: false
 
   controller:
-    # serviceAccount: *serviceAccount
+    serviceAccount:
+      create: false
+      name: *serviceAccount
     name: workflow-controller
     # workflowNamespaces:
       # - *namespace
     containerRuntimeExecutor: k8sapi # Most Secure - https://argoproj.github.io/argo-workflows/workflow-executors/#kubernetes-api-k8sapi
 
   server:
-    enabled: true
-    name: argo-server
     serviceAccount:
       create: false
       name: *serviceAccount
+    enabled: true
+    name: argo-server
 
 helm-controller:
   concurrent: 5

diff --git a/controllers/appgroup_controller.go b/controllers/appgroup_controller.go
@@ -113,7 +113,7 @@ func (r *ApplicationGroupReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		return result, err
 	}
 	// Add finalizer if it doesn't already exist
-	if controllerutil.ContainsFinalizer(appGroup, v1alpha1.AppGroupFinalizer) {
+	if !controllerutil.ContainsFinalizer(appGroup, v1alpha1.AppGroupFinalizer) {
 		controllerutil.AddFinalizer(appGroup, v1alpha1.AppGroupFinalizer)
 		if err := r.Patch(ctx, appGroup, patch); err != nil {
 			logr.Error(err, "failed to patch the release with the appgroup finalizer")

diff --git a/pkg/helpers/reconcile.go b/pkg/helpers/reconcile.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
+
 	"github.com/Azure/Orkestra/api/v1alpha1"
 	"github.com/Azure/Orkestra/pkg/meta"
 	"github.com/Azure/Orkestra/pkg/registry"
@@ -13,7 +15,6 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/jinzhu/copier"
 	"helm.sh/helm/v3/pkg/chart"
-	"os"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -110,7 +111,7 @@ func (helper *ReconcileHelper) Reverse(ctx context.Context) (ctrl.Result, error)
 	} else if isSucceeded {
 		return ctrl.Result{}, nil
 	}
-	return ctrl.Result{RequeueAfter: v1alpha1.DefaultProgressingRequeue}, nil
+	return ctrl.Result{Requeue: true, RequeueAfter: v1alpha1.DefaultProgressingRequeue}, nil
 }
 
 func (helper *ReconcileHelper) reconcileApplications() error {