From 9b6802b3c93885b1905ec222ede64700cf875bef Mon Sep 17 00:00:00 2001
From: Aditya Menon <aditya.menon@spin.pm>
Date: Mon, 23 Aug 2021 14:13:41 +0200
Subject: [PATCH] fix(argo-cd): Remove ArgoCD repo server entrypoint script
 from command block and drop --staticassets field (#886)

---
 charts/argo-cd/Chart.yaml                                  | 7 ++++---
 charts/argo-cd/README.md                                   | 4 ++++
 .../argo-cd/templates/argocd-repo-server/deployment.yaml   | 3 +--
 charts/argo-cd/templates/argocd-server/deployment.yaml     | 4 ----
 charts/argo-cd/values.yaml                                 | 6 +-----
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 322cd0c0..0b4ec162 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 2.0.5
+appVersion: 2.1.0
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.12.1
+version: 3.13.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-cd/assets/logo.png
 keywords:
@@ -21,4 +21,5 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: redis-ha.nameOverride / redis-ha.fullnameOverride breaks the ArgoCD helm chart"
+    - "[Fixed]: Remove ArgoCD Repo Server entrypoint file from command block. Defers to entrypoint defined in the Dockerfile"
+    - "[Fixed]: Remove deprecated static assets flag"
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index c73299f9..e9c661bf 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -34,6 +34,10 @@ Changes in the `CustomResourceDefinition` resources shall be fixed easily by cop
 
 ## Upgrading
 
+### 3.13.0
+
+This release removes the flag `--staticassets` from argocd server as it has been dropped upstream. If this flag needs to be enabled e.g for older releases of ArgoCD, it can be passed via the `extraArgs` field 
+
 ### 3.10.2
 
 ArgoCD has recently deprecated the flag `--staticassets` and from chart version `3.10.2` has been disabled by default
diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index 30082b2d..d89440a2 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -40,8 +40,7 @@ spec:
       - name: {{ .Values.repoServer.name }}
         image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default .Values.global.image.tag .Values.repoServer.image.tag }}
         imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
-        command:
-        - uid_entrypoint.sh
+        args:
         - argocd-repo-server
         {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
         - --redis
diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
index ff86f5ec..3ef5bb62 100755
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -42,10 +42,6 @@ spec:
         imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.server.image.imagePullPolicy }}
         command:
         - argocd-server
-        {{ if .Values.server.staticAssets.enabled }}
-        - --staticassets
-        - /shared/app
-        {{ end }}
         - --repo-server
         - {{ template "argo-cd.repoServer.fullname" . }}:{{ .Values.repoServer.service.port }}
         {{- if .Values.dex.enabled }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 4a6172ef..8e637966 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -8,7 +8,7 @@ kubeVersionOverride: ""
 global:
   image:
     repository: quay.io/argoproj/argocd
-    tag: v2.0.5
+    tag: v2.1.0
     imagePullPolicy: IfNotPresent
   securityContext: {}
   #  runAsUser: 999
@@ -435,10 +435,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: []