DevFW-CICD/argocd-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(argo-cd): proper selectors for notifications metrics (#1176)

Browse source 
* fix(argo-cd): proper selectors for notifications metrics

Signed-off-by: Lucas Bickel <lucas.bickel@adfinis.com>

* fix(argo-cd): harmonize selectors with appset

Signed-off-by: Lucas Bickel <lucas.bickel@adfinis.com>

* fix(argo-cd): simplify selector in service

Signed-off-by: Lucas Bickel <lucas.bickel@adfinis.com>

* fix(argo-cd): proper label for servicemonitor and suffixed service name

Signed-off-by: Lucas Bickel <lucas.bickel@adfinis.com>
This commit is contained in:
Lucas Bickel 2022-03-17 13:53:53 +01:00 • committed by GitHub
parent 32a06059c3
commit 8e51693a82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
charts/argo-cd/templates/argocd-notifications/service-metrics.yaml
View file

@ -4,7 +4,7 @@ kind: Service
metadata:
name: {{ template "argo-cd.notifications.fullname" . }}-metrics
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" .Values.notifications.name) | nindent 4 }}
{{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" "metrics") | nindent 4 }}
{{- with .Values.notifications.metrics.service.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
@ -14,7 +14,7 @@ metadata:
{{- end }}
spec:
selector:
{{- include "argo-cd.selectorLabels" (dict "context" . "component" .Values.notifications.name "name" "metrics") | nindent 6 }}
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 6 }}
ports:
- name: metrics
port: {{ .Values.notifications.metrics.port }}

2
charts/argo-cd/templates/argocd-notifications/servicemonitor.yaml
View file

@ -2,7 +2,7 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ template "argo-cd.notifications.fullname" . }}-metrics
name: {{ template "argo-cd.notifications.fullname" . }}
{{- if .Values.notifications.metrics.serviceMonitor.namespace }}
namespace: {{ .Values.notifications.metrics.serviceMonitor.namespace }}
{{- end }}