fix(argo-cd): Fix repo-server honorLabels config template (#3075)

* FIX: move honorLabels config out of  condition

Signed-off-by: symaras <simosmeih@gmail.com>

* update changelog

Signed-off-by: symaras <simosmeih@gmail.com>

* bump chart version

Signed-off-by: symaras <simosmeih@gmail.com>

* adjust changelog

Signed-off-by: symaras <simosmeih@gmail.com>

---------

Signed-off-by: symaras <simosmeih@gmail.com>

charts/argo-cd/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: v2.13.1
 kubeVersion: ">=1.25.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 7.7.8
+version: 7.7.9
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -26,5 +26,5 @@ annotations:
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: changed
-      description: Bump argocd-extension-installer to v0.0.8
+    - kind: fixed
+      description: Fix honorLabels config template

charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml

@@ -34,8 +34,8 @@ spec:
       metricRelabelings:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.repoServer.metrics.serviceMonitor.scheme }}
       honorLabels: {{ .Values.repoServer.metrics.serviceMonitor.honorLabels }}
+      {{- with .Values.repoServer.metrics.serviceMonitor.scheme }}
       scheme: {{ . }}
       {{- end }}
       {{- with .Values.repoServer.metrics.serviceMonitor.tlsConfig }}