From c3eb2efc561e6983c038e6fef36a3a4af7a353e4 Mon Sep 17 00:00:00 2001
From: Aaron Jones <aaron.jones@fundingcircle.com>
Date: Thu, 10 Mar 2022 11:49:07 +0000
Subject: [PATCH] application controller metrics application labels changed
 from map to list. Updated templating to set the correct arguments.

Signed-off-by: Aaron Jones <aaron.jones@fundingcircle.com>
---
 charts/argo-cd/Chart.yaml                                     | 4 ++--
 charts/argo-cd/README.md                                      | 2 +-
 .../templates/argocd-application-controller/deployment.yaml   | 4 ++--
 charts/argo-cd/values.yaml                                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index daefad15..be669043 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.2.5
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.35.3
+version: 3.35.4
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
@@ -21,4 +21,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: Create service account for repo server by default"
+    - "[Fixed]: ArgoCD application controller metric application label templating"
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index 8e075386..a25383d9 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -263,7 +263,7 @@ NAME: my-release
 | controller.logFormat | string | `"text"` | Application controller log format. Either `text` or `json` |
 | controller.logLevel | string | `"info"` | Application controller log level |
 | controller.metrics.applicationLabels.enabled | bool | `false` | Enables additional labels in argocd_app_labels metric |
-| controller.metrics.applicationLabels.labels | object | `{}` | Additional labels |
+| controller.metrics.applicationLabels.labels | list | `[]` | Additional labels |
 | controller.metrics.enabled | bool | `false` | Deploy metrics service |
 | controller.metrics.rules.enabled | bool | `false` | Deploy a PrometheusRule for the application controller |
 | controller.metrics.rules.spec | list | `[]` | PrometheusRule.Spec for the application controller |
diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
index 9c88c444..cf62bb7f 100755
--- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@@ -57,9 +57,9 @@ spec:
         - --loglevel
         - {{ .Values.controller.logLevel }}
         {{- if .Values.controller.metrics.applicationLabels.enabled }}
-        - --metrics-application-labels
         {{- range .Values.controller.metrics.applicationLabels.labels }}
-        - {{- toYaml . | nindent 8 }}
+        - --metrics-application-labels
+        - {{ . }}
         {{- end }}
         {{- end }}
         {{- if or (and .Values.redis.enabled (not $redisHa.enabled)) (and $redisHa.enabled $redisHa.haproxy.enabled) }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index fcd2a3dc..daefd898 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -251,7 +251,7 @@ controller:
       # -- Enables additional labels in argocd_app_labels metric
       enabled: false
       # -- Additional labels
-      labels: {}
+      labels: []
     service:
       # -- Metrics service annotations
       annotations: {}