From 6504097a461da2680d1b7d15277d94b2cd811e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= <mickael.canevet@gmail.com>
Date: Sat, 5 Dec 2020 10:20:14 +0100
Subject: [PATCH] Upgrade to ArgoCD 1.7.10

---
 .github/workflows/pull-request.yml | 8 ++++----
 .github/workflows/push.yml         | 2 +-
 .gitlab-ci/pipeline.yaml           | 2 +-
 argocd/argocd/values.yaml          | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 604e7f2eb9..024b6714ea 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -19,7 +19,7 @@ jobs:
           entrypoint: scripts/gh-deploy-cluster.sh
           args: ${{ matrix.flavor }} ${{ github.actor }} ${{ github.head_ref }}
       - name: Wait for App of Apps
-        uses: docker://argoproj/argocd:v1.7.6
+        uses: docker://argoproj/argocd:v1.7.10
         with:
           entrypoint: scripts/gh-wait-for-app-of-apps.sh
           args: ${{ matrix.flavor }}
@@ -44,7 +44,7 @@ jobs:
           entrypoint: scripts/gh-deploy-cluster.sh
           args: ${{ matrix.flavor }} camptocamp ${{ github.base_ref }}
       - name: Wait for App of Apps
-        uses: docker://argoproj/argocd:v1.7.6
+        uses: docker://argoproj/argocd:v1.7.10
         with:
           entrypoint: scripts/gh-wait-for-app-of-apps.sh
           args: ${{ matrix.flavor }}
@@ -58,7 +58,7 @@ jobs:
           entrypoint: scripts/gh-plan.sh
           args: ${{ matrix.flavor }} ${{ github.actor }} ${{ github.head_ref }}
       - name: App-diff on ref
-        uses: docker://argoproj/argocd:v1.7.6
+        uses: docker://argoproj/argocd:v1.7.10
         with:
           entrypoint: scripts/gh-app-diff.sh
           args: ${{ matrix.flavor }}
@@ -68,7 +68,7 @@ jobs:
           entrypoint: scripts/gh-deploy-cluster.sh
           args: ${{ matrix.flavor }} ${{ github.actor }} ${{ github.head_ref }}
       - name: Wait for App of Apps
-        uses: docker://argoproj/argocd:v1.7.6
+        uses: docker://argoproj/argocd:v1.7.10
         with:
           entrypoint: scripts/gh-wait-for-app-of-apps.sh
           args: ${{ matrix.flavor }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 46f5e2f42c..3c945ba330 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -19,7 +19,7 @@ jobs:
           entrypoint: scripts/gh-deploy-cluster.sh
           args: ${{ matrix.flavor }} $GITHUB_SERVER_URL/$GITHUB_ACTOR/camptocamp-devops-stack.git $GITHUB_HEAD_REF
       - name: Wait for App of Apps
-        uses: docker://argoproj/argocd:v1.7.6
+        uses: docker://argoproj/argocd:v1.7.10
         with:
           entrypoint: scripts/gh-wait-for-app-of-apps.sh
           args: ${{ matrix.flavor }}
diff --git a/.gitlab-ci/pipeline.yaml b/.gitlab-ci/pipeline.yaml
index 649e8198fe..7f2d901046 100644
--- a/.gitlab-ci/pipeline.yaml
+++ b/.gitlab-ci/pipeline.yaml
@@ -1,6 +1,6 @@
 ---
 variables:
-  ARGOCD_VERSION: "1.7.6"
+  ARGOCD_VERSION: "1.7.10"
   TERRAFORM_VERSION: "0.13.5"
   CAMPTOCAMP_DEVOPS_STACK_VERSION: "0.15.0"
 
diff --git a/argocd/argocd/values.yaml b/argocd/argocd/values.yaml
index 2058c58574..9b2985d4ad 100644
--- a/argocd/argocd/values.yaml
+++ b/argocd/argocd/values.yaml
@@ -2,6 +2,8 @@
 argo-cd:
   installCRDs: false
   global:
+    image:
+      tag: v1.7.10
     securityContext:
       runAsUser: 999
       runAsGroup: 999