From df3b2cf96a3f3ef775f611fa22d2c80b94444f7a Mon Sep 17 00:00:00 2001
From: Chris Vest <intellivision@pm.me>
Date: Fri, 16 Oct 2020 04:31:26 +0200
Subject: [PATCH] fix: Add annotations and labels to dex service [argo-cd]
 (#473)

* Add annotations to dex service

Currently `.Values.dex.metrics.service.annotations` is not used anywhere - this adds that to the template.

* Add labels to dex service

* Update chart version
---
 charts/argo-cd/Chart.yaml                 |  2 +-
 charts/argo-cd/templates/dex/service.yaml | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 2c338f4d..7ecd4ab6 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 1.7.6
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.9.2
+version: 2.9.3
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
diff --git a/charts/argo-cd/templates/dex/service.yaml b/charts/argo-cd/templates/dex/service.yaml
index b0567ead..f10a6d88 100644
--- a/charts/argo-cd/templates/dex/service.yaml
+++ b/charts/argo-cd/templates/dex/service.yaml
@@ -3,6 +3,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "argo-cd.dex.fullname" . }}
+{{- if .Values.dex.metrics.service.annotations }}
+  annotations:
+  {{- range $key, $value := .Values.dex.metrics.service.annotations }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
+{{- end }}
   labels:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
     helm.sh/chart: {{ include "argo-cd.chart" . }}
@@ -10,6 +16,9 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: argocd
     app.kubernetes.io/component: {{ .Values.dex.name }}
+{{- if .Values.dex.metrics.service.labels }}
+{{- toYaml .Values.dex.metrics.service.labels | nindent 4 }}
+{{- end }}
 spec:
   ports:
   - name: http
@@ -29,4 +38,4 @@ spec:
   selector:
     app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.dex.name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
\ No newline at end of file
+{{- end }}