fix(argo-cd): make ServiceMonitor annotations in ArgoCD server conditional (#2273)
* fix: add argocd servicemonitor annotations conditionally Signed-off-by: Mats Willemsen <mats.willemsen@ah.nl> * chore(argo-cd): add changelog Signed-off-by: Mats Willemsen <mats.willemsen@ah.nl> --------- Signed-off-by: Mats Willemsen <mats.willemsen@ah.nl>
This commit is contained in:
parent
8d00bec86e
commit
5626d0536f
2 changed files with 5 additions and 5 deletions
|
@ -3,7 +3,7 @@ appVersion: v2.8.4
|
||||||
kubeVersion: ">=1.23.0-0"
|
kubeVersion: ">=1.23.0-0"
|
||||||
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: 5.46.4
|
version: 5.46.5
|
||||||
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
|
||||||
sources:
|
sources:
|
||||||
|
@ -27,4 +27,4 @@ annotations:
|
||||||
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
|
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
|
||||||
artifacthub.io/changes: |
|
artifacthub.io/changes: |
|
||||||
- kind: fixed
|
- kind: fixed
|
||||||
description: Align redis-ha's affinity type to upstream due to warnings
|
description: fixed issue with argocd-server servicemonitor annotation attribute being added even when no annotations where defined
|
||||||
|
|
|
@ -12,10 +12,10 @@ metadata:
|
||||||
{{- with .Values.server.metrics.serviceMonitor.additionalLabels }}
|
{{- with .Values.server.metrics.serviceMonitor.additionalLabels }}
|
||||||
{{- toYaml . | nindent 4 }}
|
{{- toYaml . | nindent 4 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- with .Values.server.metrics.serviceMonitor.annotations }}
|
||||||
annotations:
|
annotations:
|
||||||
{{- range $key, $value := .Values.server.metrics.serviceMonitor.annotations }}
|
{{- toYaml . | nindent 4 }}
|
||||||
{{ $key }}: {{ $value | quote }}
|
{{- end }}
|
||||||
{{- end }}
|
|
||||||
spec:
|
spec:
|
||||||
endpoints:
|
endpoints:
|
||||||
- port: {{ .Values.server.metrics.service.portName }}
|
- port: {{ .Values.server.metrics.service.portName }}
|
||||||
|
|
Loading…
Reference in a new issue