DevFW-CICD/argocd-helm
14
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
charts/argo-cd/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v2.3.1 appVersion: v2.3.1
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 4.0.0 version: 4.0.1
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
keywords: keywords:
@ -21,5 +21,5 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Changed]: Update to Argo CD v2.3.1" - "[Fixed]: make notification-metrics service target pods properly"
- "[Changed]: Sync CRDs of Argo CD v2.3.1" - "[Fixed]: make notification-metrics servicemonitor target service properly"

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

@ -4,7 +4,7 @@ kind: Service
metadata: metadata:
name: {{ template "argo-cd.notifications.fullname" . }}-metrics name: {{ template "argo-cd.notifications.fullname" . }}-metrics
labels: 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 }} {{- with .Values.notifications.metrics.service.labels }}
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
@ -14,7 +14,7 @@ metadata:
{{- end }} {{- end }}
spec: spec:
selector: 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: ports:
- name: metrics - name: metrics
port: {{ .Values.notifications.metrics.port }} 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 apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor kind: ServiceMonitor
metadata: metadata:
name: {{ template "argo-cd.notifications.fullname" . }}-metrics name: {{ template "argo-cd.notifications.fullname" . }}
{{- if .Values.notifications.metrics.serviceMonitor.namespace }} {{- if .Values.notifications.metrics.serviceMonitor.namespace }}
namespace: {{ .Values.notifications.metrics.serviceMonitor.namespace }} namespace: {{ .Values.notifications.metrics.serviceMonitor.namespace }}
{{- end }} {{- end }}