Mount to correct server

Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com>

charts/argo-cd/templates/_helpers.tpl

@@ -167,6 +167,6 @@ Merge Argo Configuration with Preset Configuration
 */}}
 {{- define "argo-cd.config" -}}
   {{- if .Values.server.configEnabled -}}
-{{- toYaml (mergeOverwrite .Values.server.config (default dict (fromYaml (include "argo-cd.config.presets" $)))) }}
+{{- toYaml (mergeOverwrite (default dict (fromYaml (include "argo-cd.config.presets" $))) .Values.server.config) }}
   {{- end -}}
 {{- end -}}

charts/argo-cd/templates/argocd-configs/argocd-styles-cm.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "argo-cd.repoServer.fullname" . }}-styles-cm
+  name: argocd-custom-styles
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
 data:

charts/argo-cd/templates/argocd-repo-server/deployment.yaml

@@ -73,11 +73,6 @@ spec:
         {{- end }}
         - mountPath: /app/config/gpg/keys
           name: gpg-keyring
-        {{- if .Values.configs.styles }}
-        - mountPath: /shared/app/custom
-          subPath: "custom.styles.css"
-          name: custom-styles
-        {{- end }}
         {{- if .Values.configs.knownHosts }}
         - mountPath: /app/config/ssh
           name: ssh-known-hosts
@@ -136,11 +131,6 @@ spec:
       {{- if .Values.repoServer.volumes }}
 {{- toYaml .Values.repoServer.volumes | nindent 6}}
       {{- end }}
-      {{- if .Values.configs.styles }}
-      - configMap:
-          name: {{ template "argo-cd.repoServer.fullname" . }}-styles-cm
-        name: custom-styles
-      {{- end }}
       - emptyDir: {}
         name: gpg-keyring
       {{- if .Values.configs.knownHosts }}

charts/argo-cd/templates/argocd-server/deployment.yaml

@@ -80,6 +80,11 @@ spec:
         - mountPath: /app/config/tls
           name: tls-certs
         {{- end }}
+        {{- if .Values.configs.styles }}
+        - mountPath: "/shared/app/custom/custom.styles.css"
+          subPath: "custom.styles.css"
+          name: custom-styles
+        {{- end }}
         ports:
         - name: {{ .Values.server.name }}
           containerPort: {{ .Values.server.containerPort }}
@@ -139,6 +144,11 @@ spec:
       {{- end }}
       - emptyDir: {}
         name: static-files
+      {{- if .Values.configs.styles }}
+      - configMap:
+          name: argocd-custom-styles
+        name: custom-styles
+      {{- end }}
       {{- if .Values.configs.knownHosts }}
       - configMap:
           name: argocd-ssh-known-hosts-cm

charts/argo-cd/values.yaml

@@ -880,6 +880,7 @@ configs:
   #  .nav-bar {
   #    background: linear-gradient(to bottom, #999, #777, #333, #222, #111);
   #  }
+
   ## External Cluster Credentials
   ## reference:
   ## - https://argoproj.github.io/argo-cd/operator-manual/declarative-setup/#clusters
@@ -1006,7 +1007,7 @@ configs:
 
     # Argo expects the password in the secret to be bcrypt hashed. You can create this hash with
     # `htpasswd -nbBC 10 "" $ARGO_PWD | tr -d ':\n' | sed 's/$2y/$2a/'`
-    # argocdServerAdminPassword:
+    # argocdServerAdminPassword: ""
     # Password modification time defaults to current time if not set
     # argocdServerAdminPasswordMtime: "2006-01-02T15:04:05Z"