From 249262a79f60002717c11ed67349052d535f7cf5 Mon Sep 17 00:00:00 2001
From: Lucas Bickel <lucas.bickel@adfinis.com>
Date: Thu, 29 Jul 2021 21:25:46 +0200
Subject: [PATCH] fix(argo-cd): Replace server.staticAssets.enabled with
 automation

Signed-off-by: Lucas Bickel <lucas.bickel@adfinis.com>
---
 charts/argo-cd/Chart.yaml                              | 4 ++--
 charts/argo-cd/templates/argocd-server/deployment.yaml | 2 +-
 charts/argo-cd/values.yaml                             | 4 ----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 87e252a8..65fd9e68 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.0.5
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.11.1
+version: 3.11.2
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-cd/assets/logo.png
 keywords:
@@ -21,4 +21,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Changed]: Set server.staticAssets.enabled=true since Argo CD 2.0.5 still needs it"
+    - "[Changed]: Replace server.staticAssets.enabled with semverCompare based check"
diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
index ff86f5ec..8b59dc8c 100755
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -42,7 +42,7 @@ spec:
         imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.server.image.imagePullPolicy }}
         command:
         - argocd-server
-        {{ if .Values.server.staticAssets.enabled }}
+        {{- if semverCompare "< 2.1.0-0" (default .Values.global.image.tag .Values.server.image.tag) }}
         - --staticassets
         - /shared/app
         {{ end }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 06232342..f5979d24 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -431,10 +431,6 @@ server:
   extraArgs: []
   #  - --insecure
 
-  # This flag is used to either remove or pass the CLI flag --staticassets /shared/app to the argocd-server app
-  staticAssets:
-    enabled: true
-
   ## Environment variables to pass to argocd-server
   ##
   env: []