From 3da431157cb73a6c3d9298657ab307b55a13c306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Cabrera=20Mi=C3=B1agorri?=
 <mcabrera@vmware.com>
Date: Thu, 18 Nov 2021 10:11:53 +0100
Subject: [PATCH] [bitnami/argo-cd] Fix issue with server.config (#8173)

* [bitnami/argo-cd] Fix issue with server.config

* Re-generate README
---
 bitnami/argo-cd/README.md                | 2 +-
 bitnami/argo-cd/templates/argocd-cm.yaml | 3 +++
 bitnami/argo-cd/values.yaml              | 9 +++------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bitnami/argo-cd/README.md b/bitnami/argo-cd/README.md
index 774a4ef604..5e5474ad4e 100644
--- a/bitnami/argo-cd/README.md
+++ b/bitnami/argo-cd/README.md
@@ -200,7 +200,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `server.logLevel`                                    | ArgoCD server logs level                                                                                                        | `info`                   |
 | `server.configEnabled`                               | Enable Argo CD server config                                                                                                    | `true`                   |
 | `server.url`                                         | Argo CD server base URL. Required when configuring SSO. Required when enabling dex.                                             | `""`                     |
-| `server.config`                                      | Argo CD server configuration that will end on the argocd-cm Config Map                                                          | `""`                     |
+| `server.config`                                      | Argo CD server configuration that will end on the argocd-cm Config Map                                                          | `{}`                     |
 | `server.ingress.enabled`                             | Enable the creation of an ingress for the Argo CD server                                                                        | `false`                  |
 | `server.ingress.pathType`                            | Path type for the Argo CD server ingress                                                                                        | `ImplementationSpecific` |
 | `server.ingress.apiVersion`                          | Ingress API version for the Argo CD server ingress                                                                              | `""`                     |
diff --git a/bitnami/argo-cd/templates/argocd-cm.yaml b/bitnami/argo-cd/templates/argocd-cm.yaml
index 1a721635f0..01632db052 100644
--- a/bitnami/argo-cd/templates/argocd-cm.yaml
+++ b/bitnami/argo-cd/templates/argocd-cm.yaml
@@ -17,5 +17,8 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
+  {{- if .Values.config.styles }}
+  ui.cssurl: "./custom/custom.styles.css"
+  {{- end }}
   {{- include "common.tplvalues.render" ( dict "value" .Values.server.config "context" $ ) | nindent 2 }}
 {{- end }}
diff --git a/bitnami/argo-cd/values.yaml b/bitnami/argo-cd/values.yaml
index 76dc7a1ca6..b8aab22a04 100644
--- a/bitnami/argo-cd/values.yaml
+++ b/bitnami/argo-cd/values.yaml
@@ -536,7 +536,7 @@ server:
   url: ""
 
   ## Argo CD server config. This object will be directly rendered
-  ## @param server.config [string] Argo CD server configuration that will end on the argocd-cm Config Map
+  ## @param server.config [object] Argo CD server configuration that will end on the argocd-cm Config Map
   ## Ref: https://argoproj.github.io/argo-cd/operator-manual/user-management/
   ## E.g:
   ## repositories:
@@ -573,15 +573,12 @@ server:
   ##          clientSecret: $dex.github.clientSecret
   ##          orgs:
   ##          - name: your-github-org
-  config: |
-    {{- if .Values.config.styles }}
-    ui.cssurl: "./custom/custom.styles.css"
-    {{- end }}
+  config:
     ## Argo CD external base URL. Required when configuring SSO. Required when enabling dex.
     ## E.g:
     ## url: https://argocd.example.com
     ##
-    url: {{ .Values.server.url | quote }}
+    url: "{{ .Values.server.url }}"
     ## Argo CD instance label key
     ##
     application.instanceLabelKey: argocd.argoproj.io/instance