From 9b3a65e2398df28558d13a96899a84c664b81e13 Mon Sep 17 00:00:00 2001
From: Laurent Lavaud <llavaud@users.noreply.github.com>
Date: Sun, 25 Sep 2022 19:02:42 +0200
Subject: [PATCH] fix(argo-cd): Add missing templating for some service labels
 (#1489)

---
 charts/argo-cd/Chart.yaml                                     | 4 ++--
 .../templates/argocd-application-controller/service.yaml      | 3 +++
 charts/argo-cd/templates/argocd-applicationset/service.yaml   | 3 +++
 charts/argo-cd/templates/argocd-repo-server/service.yaml      | 3 +++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index a585f90e..009543db 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.4.12
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.5.4
+version: 5.5.5
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
@@ -19,4 +19,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: Clarified documentation around CRD upgrades"
+    - "[Fixed]: Add missing templating for some service labels"
diff --git a/charts/argo-cd/templates/argocd-application-controller/service.yaml b/charts/argo-cd/templates/argocd-application-controller/service.yaml
index db563135..1d4340ff 100644
--- a/charts/argo-cd/templates/argocd-application-controller/service.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/service.yaml
@@ -10,6 +10,9 @@ metadata:
   name: {{ template "argo-cd.controller.fullname" . }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
+{{- with .Values.controller.service.labels }}
+{{- toYaml . | nindent 4 }}
+{{- end }}
 spec:
   ports:
   - name: {{ .Values.controller.service.portName }}
diff --git a/charts/argo-cd/templates/argocd-applicationset/service.yaml b/charts/argo-cd/templates/argocd-applicationset/service.yaml
index 4d2fd4eb..9e0de533 100644
--- a/charts/argo-cd/templates/argocd-applicationset/service.yaml
+++ b/charts/argo-cd/templates/argocd-applicationset/service.yaml
@@ -11,6 +11,9 @@ metadata:
   name: {{ template "argo-cd.applicationSet.fullname" . }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.applicationSet.name "name" .Values.applicationSet.name) | nindent 4 }}
+{{- with .Values.applicationSet.service.labels }}
+{{- toYaml . | nindent 4 }}
+{{- end }}
 spec:
   ports:
   - name: {{ .Values.applicationSet.service.portName }}
diff --git a/charts/argo-cd/templates/argocd-repo-server/service.yaml b/charts/argo-cd/templates/argocd-repo-server/service.yaml
index 6ab15747..541ea41e 100644
--- a/charts/argo-cd/templates/argocd-repo-server/service.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/service.yaml
@@ -9,6 +9,9 @@ metadata:
 {{- end }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
+{{- with .Values.repoServer.service.labels }}
+{{- toYaml . | nindent 4 }}
+{{- end }}
   name: {{ template "argo-cd.repoServer.fullname" . }}
 spec:
   ports: