feat(argo-cd): Make metrics and serviceMonitors usable on an istio service mesh (#1270)

* feat(argo-cd): Make metrics and serviceMonitors usable on an istio service mesh

Signed-off-by: Christian Brauchli <chb@open.ch>

* change back default values

Signed-off-by: Christian Brauchli <chb@open.ch>

* update README

Signed-off-by: Christian Brauchli <chb@open.ch>

* change values to the values they where before

Signed-off-by: Christian Brauchli <chb@open.ch>

* fix lint

Signed-off-by: Christian Brauchli <chb@open.ch>

* adjust default portName to be istio compatible

Signed-off-by: Christian Brauchli <chb@open.ch>

* update docs

Signed-off-by: Christian Brauchli <chb@open.ch>

* Resolve copy-paste errors

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

* Restore dex/deployment.yaml and adapt dex/service.yaml

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

* Bump minor chart version and add port renaming to changelog

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

Co-authored-by: Christian Brauchli <chb@open.ch>
Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

charts/argo-cd/templates/argocd-application-controller/metrics-service.yaml

@@ -16,7 +16,7 @@ metadata:
   name: {{ template "argo-cd.controller.fullname" . }}-metrics
 spec:
   ports:
-  - name: metrics
+  - name: {{ .Values.controller.metrics.service.portName }}
     protocol: TCP
     port: {{ .Values.controller.metrics.service.servicePort }}
     targetPort: controller

charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml

@@ -16,7 +16,7 @@ metadata:
     {{- end }}
 spec:
   endpoints:
-    - port: metrics
+    - port: {{ .Values.controller.metrics.service.portName }}
       {{- with .Values.controller.metrics.serviceMonitor.interval }}
       interval: {{ . }}
       {{- end }}
@@ -29,6 +29,13 @@ spec:
       metricRelabelings:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.controller.metrics.serviceMonitor.scheme }}
+      scheme: {{ . }}
+      {{- end }}
+      {{- with .Values.controller.metrics.serviceMonitor.tlsConfig }}
+      tlsConfig:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}