Update to latest Argo versions (#71)

Azure-Samples · Jul 9, 2024 · 0d54034 · 0d54034
1 parent b057fe5
commit 0d54034
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 26 deletions.
diff --git a/gitops/apps/infra/argo-rollouts.yaml b/gitops/apps/infra/argo-rollouts.yaml
@@ -9,7 +9,7 @@ spec:
     - chart: argo-rollouts
       repoURL: https://argoproj.github.io/argo-helm/
       helm:
-        version: v3      
+        version: v3
   destination:
     namespace: argocd
     server: https://kubernetes.default.svc
diff --git a/gitops/bootstrap/control-plane/addons/oss/addons-argo-cd-appset.yaml b/gitops/bootstrap/control-plane/addons/oss/addons-argo-cd-appset.yaml
@@ -14,14 +14,11 @@ spec:
               values:
                 addonChart: argo-cd
                 # anything not staging or prod use this version
-                addonChartVersion: 6.11.1
+                addonChartVersion: 7.3.4
                 addonChartRepositoryNamespace: argocd
                 addonChartRepository: https://argoproj.github.io/argo-helm
               selector:
                 matchExpressions:
-                  - key: akuity.io/argo-cd-cluster-name
-                    operator: NotIn
-                    values: [in-cluster]
                   - key: enable_argocd
                     operator: In
                     values: ['true']
@@ -30,13 +27,13 @@ spec:
                 matchLabels:
                   environment: control-plane
               values:
-                addonChartVersion: 6.11.1
+                addonChartVersion: 7.3.4
           - clusters:
               selector:
                 matchLabels:
                   environment: prod
               values:
-                addonChartVersion: 6.11.1
+                addonChartVersion: 7.3.4
   template:
     metadata:
       name: addon-{{name}}-{{values.addonChart}}

diff --git a/gitops/bootstrap/control-plane/addons/oss/addons-argo-events-appset.yaml b/gitops/bootstrap/control-plane/addons/oss/addons-argo-events-appset.yaml
@@ -14,13 +14,10 @@ spec:
               values:
                 addonChart: argo-events
                 # anything not staging or prod use this version
-                addonChartVersion: 2.4.4
+                addonChartVersion: 2.4.7
                 addonChartRepository: https://argoproj.github.io/argo-helm
               selector:
                 matchExpressions:
-                  - key: akuity.io/argo-cd-cluster-name
-                    operator: NotIn
-                    values: [in-cluster]
                   - key: enable_argo_events
                     operator: In
                     values: ['true']
@@ -29,13 +26,13 @@ spec:
                 matchLabels:
                   environment: staging
               values:
-                addonChartVersion: 2.4.4
+                addonChartVersion: 2.4.7
           - clusters:
               selector:
                 matchLabels:
                   environment: prod
               values:
-                addonChartVersion: 2.4.4
+                addonChartVersion: 2.4.7
   template:
     metadata:
       name: addon-{{name}}-{{values.addonChart}}

diff --git a/gitops/bootstrap/control-plane/addons/oss/addons-argo-rollouts-appset.yaml b/gitops/bootstrap/control-plane/addons/oss/addons-argo-rollouts-appset.yaml
@@ -14,13 +14,10 @@ spec:
               values:
                 addonChart: argo-rollouts
                 # anything not staging or prod use this version
-                addonChartVersion: 2.35.3
+                addonChartVersion: 2.37.2
                 addonChartRepository: https://argoproj.github.io/argo-helm
               selector:
                 matchExpressions:
-                  - key: akuity.io/argo-cd-cluster-name
-                    operator: NotIn
-                    values: [in-cluster]
                   - key: enable_argo_rollouts
                     operator: In
                     values: ['true']
@@ -29,13 +26,13 @@ spec:
                 matchLabels:
                   environment: staging
               values:
-                addonChartVersion: 2.35.3
+                addonChartVersion: 2.37.2
           - clusters:
               selector:
                 matchLabels:
                   environment: prod
               values:
-                addonChartVersion: 2.35.3
+                addonChartVersion: 2.37.2
   template:
     metadata:
       name: addon-{{name}}-{{values.addonChart}}

diff --git a/gitops/bootstrap/control-plane/addons/oss/addons-argo-workflows-appset.yaml b/gitops/bootstrap/control-plane/addons/oss/addons-argo-workflows-appset.yaml
@@ -15,13 +15,10 @@ spec:
               values:
                 addonChart: argo-workflows
                 # anything not staging or prod use this version
-                addonChartVersion: 0.41.6
+                addonChartVersion: 0.41.11
                 addonChartRepository: https://argoproj.github.io/argo-helm
               selector:
                 matchExpressions:
-                  - key: akuity.io/argo-cd-cluster-name
-                    operator: NotIn
-                    values: [in-cluster]
                   - key: enable_argo_workflows
                     operator: In
                     values: ['true']
@@ -30,13 +27,13 @@ spec:
                 matchLabels:
                   environment: staging
               values:
-                addonChartVersion: 0.41.6
+                addonChartVersion: 0.41.11
           - clusters:
               selector:
                 matchLabels:
                   environment: prod
               values:
-                addonChartVersion: 0.41.6
+                addonChartVersion: 0.41.11
   template:
     metadata:
       name: addon-{{.name}}-{{.values.addonChart}}

diff --git a/gitops/clusters/crossplane/base/cluster/aks-composition.yaml b/gitops/clusters/crossplane/base/cluster/aks-composition.yaml
@@ -329,7 +329,7 @@ spec:
             chart:
               name: argo-cd
               repository: https://argoproj.github.io/argo-helm
-              version:  6.7.2
+              version:  7.3.4
             namespace: argocd   
           providerConfigRef:
             name: helm-provider