feat(argo-cd): Create optional annotations and labels for redis service (#955)

* Create optional serviceAnnotations value for redis in helm chart

Signed-off-by: arunkumar.anandhan <arunkumar.anandhan@niceincontact.com>

* Uncomment accidentally commented lines

Signed-off-by: arunkumar.anandhan <arunkumar.anandhan@niceincontact.com>

* update chart version

Signed-off-by: arunkumar.anandhan <arunkumar.anandhan@niceincontact.com>

* update service annotation key for redis

Signed-off-by: arunkumar.anandhan <arunkumar.anandhan@niceincontact.com>

* Update L24 with appropriate description

Signed-off-by: arunkumar.anandhan <arunkumar.anandhan@niceincontact.com>

* Move redis.service key occurence in values

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* Also implement additional labels

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* Add documentation

- Changelog annotations
- Add new values to README

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* fix: Use correct value for redis service targetPort

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

charts/argo-cd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.1.2
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.22.1
+version: 3.23.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-cd/assets/logo.png
 keywords:
@@ -21,4 +21,6 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: repoServer.extraContainers unused"
+    - "[Added]: Ability to provide annotations on redis service"
+    - "[Added]: Ability to provide additional labels on redis service"
+    - "[Fixed]: Use correct value for redis service targetPort"

charts/argo-cd/README.md

@@ -475,6 +475,8 @@ through `xxx.extraArgs`
 | redis.resources | Resource limits and requests for redis | `{}` |
 | redis.securityContext | Redis Pod Security Context | See [values.yaml](values.yaml) |
 | redis.servicePort | Redis service port | `6379` |
+| redis.service.annotations | Redis service annotations | `{}` |
+| redis.service.labels | Additional redis service labels | `{}` |
 | redis.tolerations | [Tolerations for use with node taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | `[]` |
 | redis.metrics.enabled | Deploy metrics service and redis-exporter sidecar | `false` |
 | redis.metrics.image.repository | redis-exporter image repository | `quay.io/bitnami/redis-exporter` |

charts/argo-cd/templates/redis/service.yaml

@@ -6,10 +6,17 @@ metadata:
   name: {{ template "argo-cd.redis.fullname" . }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.redis.name "name" .Values.redis.name) | nindent 4 }}
+    {{- with .Values.redis.service.labels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.redis.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   ports:
   - port: {{ .Values.redis.servicePort }}
-    targetPort: {{ .Values.redis.servicePort }}
+    targetPort: {{ .Values.redis.containerPort }}
   selector:
     {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.redis.name) | nindent 4 }}
 {{- end }}

charts/argo-cd/values.yaml

@@ -451,6 +451,10 @@ redis:
   ## Additional containers to be added to the redis pod.
   extraContainers: []
 
+  service:
+    annotations: {}
+    labels: {}
+
   metrics:
     enabled: false
     image: