Upgrade to Argo v3.0.7

chart/orkestra/Chart.lock

@@ -2,11 +2,11 @@ dependencies:
 - name: chartmuseum
   repository: https://chartmuseum.github.io/charts
   version: 2.15.0
-- name: argo
+- name: argo-workflows
   repository: https://argoproj.github.io/argo-helm
-  version: 0.16.8
+  version: 0.2.5
 - name: helm-controller
   repository: https://nitishm.github.io/charts
   version: 0.1.1
-digest: sha256:7f2f2e1f5efdec11d929472f4779a4ea014355570cf2294d6958b65765463cbb
-generated: "2021-05-14T12:59:31.637787-07:00"
+digest: sha256:a80ce307816cb3fe933327638e8fb094e1b69bc779157b0165ff5c9ca4cd7398
+generated: "2021-06-14T00:24:33.898916-07:00"

chart/orkestra/Chart.yaml

@@ -21,8 +21,8 @@ dependencies:
 - name: chartmuseum
   version: "2.15.0"
   repository: "https://chartmuseum.github.io/charts"
-- name: argo
-  version: "0.16.8"
+- name: argo-workflows
+  version: "0.2.5"
   repository: "https://argoproj.github.io/argo-helm"
 - name: helm-controller
   condition: helm-controller.enabled

chart/orkestra/values.yaml

@@ -60,7 +60,7 @@ chartmuseum:
     open:
       DISABLE_API: false
 
-argo:
+argo-workflows:
   images:
     pullPolicy: IfNotPresent
 
@@ -84,8 +84,9 @@ argo:
   server:
     enabled: true
     name: argo-server
-    serviceAccount: *serviceAccount
-    createServiceAccount: false
+    serviceAccount:
+      create: false
+      name: *serviceAccount
 
 helm-controller:
   concurrent: 5

controllers/appgroup_controller_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/Azure/Orkestra/api/v1alpha1"
 	"github.com/Azure/Orkestra/pkg/meta"
-	v1alpha12 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
+	v1alpha13 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
 	fluxhelmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -49,7 +49,7 @@ var _ = Describe("ApplicationGroup Controller", func() {
 		AfterEach(func() {
 			// Call delete on the HelmReleases for cleanup
 			_ = k8sClient.DeleteAllOf(ctx, &fluxhelmv2beta1.HelmRelease{}, client.InNamespace(name))
-			_ = k8sClient.DeleteAllOf(ctx, &v1alpha12.Workflow{}, client.InNamespace(name))
+			_ = k8sClient.DeleteAllOf(ctx, &v1alpha13.Workflow{}, client.InNamespace(name))
 		})
 
 		It("Should create Bookinfo spec successfully", func() {
@@ -78,10 +78,10 @@ var _ = Describe("ApplicationGroup Controller", func() {
 
 			By("Making sure that the workflow goes into a running state")
 			Eventually(func() bool {
-				workflow := &v1alpha12.Workflow{}
+				workflow := &v1alpha13.Workflow{}
 				workflowKey := types.NamespacedName{Name: applicationGroup.Name, Namespace: applicationGroup.Namespace}
 				_ = k8sClient.Get(ctx, workflowKey, workflow)
-				return workflow.Status.Phase == v1alpha12.NodeRunning
+				return string(workflow.Status.Phase) == string(v1alpha13.NodeRunning)
 			}, time.Minute, time.Second).Should(BeTrue())
 
 			By("Waiting for the bookinfo object to reach a succeeded reason")
@@ -393,10 +393,10 @@ var _ = Describe("ApplicationGroup Controller", func() {
 
 			By("Making sure that the workflow goes into a running state")
 			Eventually(func() bool {
-				workflow := &v1alpha12.Workflow{}
+				workflow := &v1alpha13.Workflow{}
 				workflowKey := types.NamespacedName{Name: applicationGroup.Name, Namespace: DefaultNamespace}
 				_ = k8sClient.Get(ctx, workflowKey, workflow)
-				return workflow.Status.Phase == v1alpha12.NodeRunning
+				return string(workflow.Status.Phase) == string(v1alpha13.NodeRunning)
 			}, time.Minute, time.Second).Should(BeTrue())
 
 			By("Waiting for the bookinfo object to reach a progressing reason")
@@ -427,7 +427,7 @@ var _ = Describe("ApplicationGroup Controller", func() {
 
 			By("Making sure that the workflow goes into a suspended state")
 			Eventually(func() bool {
-				workflow := &v1alpha12.Workflow{}
+				workflow := &v1alpha13.Workflow{}
 				workflowKey := types.NamespacedName{Name: applicationGroup.Name, Namespace: DefaultNamespace}
 				_ = k8sClient.Get(ctx, workflowKey, workflow)
 				return workflow.Spec.Suspend != nil && *workflow.Spec.Suspend
@@ -444,7 +444,7 @@ var _ = Describe("ApplicationGroup Controller", func() {
 
 			By("waiting for all the Workflows to be cleaned up from the cluster")
 			Eventually(func() bool {
-				workflowList := &v1alpha12.WorkflowList{}
+				workflowList := &v1alpha13.WorkflowList{}
 				if err := k8sClient.List(ctx, workflowList, client.InNamespace(name)); err != nil {
 					return false
 				}
@@ -483,7 +483,7 @@ var _ = Describe("ApplicationGroup Controller", func() {
 			By("Deleting the application group and deleting the workflow")
 			err = k8sClient.Delete(ctx, applicationGroup)
 			Expect(err).To(BeNil())
-			wf := &v1alpha12.Workflow{
+			wf := &v1alpha13.Workflow{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      name,
 					Namespace: DefaultNamespace,

controllers/suite_test.go

@@ -15,7 +15,7 @@ import (
 	orkestrav1alpha1 "github.com/Azure/Orkestra/api/v1alpha1"
 	"github.com/Azure/Orkestra/pkg/registry"
 	"github.com/Azure/Orkestra/pkg/workflow"
-	v1alpha12 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
+	v1alpha13 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
 	fluxhelmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -73,7 +73,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 	err = orkestrav1alpha1.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
-	err = v1alpha12.AddToScheme(scheme.Scheme)
+	err = v1alpha13.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 	err = fluxhelmv2beta1.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())