From ae13f015ff4c108d5719117857c0ef4c27adafc6 Mon Sep 17 00:00:00 2001
From: Johan van der Geest <jvdgeest@users.noreply.github.com>
Date: Mon, 13 Apr 2020 14:54:06 +0200
Subject: [PATCH] fix: implementing server service labels (#304)

* Adding custom labels to the argocd-server service when specified in the Helm values.yaml

* Updated argo-cd chart version to 2.2.2 due to argocd-server service labeling implementation
---
 charts/argo-cd/Chart.yaml                           | 2 +-
 charts/argo-cd/templates/argocd-server/service.yaml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 390cabc3..cbad77a5 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.5.1"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.2.1
+version: 2.2.2
 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/argocd-server/service.yaml b/charts/argo-cd/templates/argocd-server/service.yaml
index 673461b2..8c13a4e6 100644
--- a/charts/argo-cd/templates/argocd-server/service.yaml
+++ b/charts/argo-cd/templates/argocd-server/service.yaml
@@ -15,6 +15,9 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: argocd
     app.kubernetes.io/component: {{ .Values.server.name }}
+{{- if .Values.server.service.labels }}
+{{- toYaml .Values.server.service.labels | nindent 4 }}
+{{- end }}
 spec:
   type: {{ .Values.server.service.type }}
   ports: