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

[charts/argo-cd] Fix servicemonitors (#180)

Browse source 
* Fixed servicemonitor templates
* Bump chart version
Signed-off-by: Igor Churmeev <igor.churmeev@gatech.global>
This commit is contained in:
Igor Churmeev 2019-12-05 05:47:15 +02:00 committed by Sean Johnson
parent 149049293f
commit ed873508ec
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "1.3.0" appVersion: "1.3.0"
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 1.3.0 version: 1.3.1
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
keywords: keywords:

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

@ -13,7 +13,9 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.controller.name }} app.kubernetes.io/component: {{ .Values.controller.name }}
{{- if .Values.controller.metrics.serviceMonitor.selector }}
{{- toYaml .Values.controller.metrics.serviceMonitor.selector | nindent 4 }} {{- toYaml .Values.controller.metrics.serviceMonitor.selector | nindent 4 }}
{{- end }}
{{- if .Values.controller.metrics.serviceMonitor.additionalLabels }} {{- if .Values.controller.metrics.serviceMonitor.additionalLabels }}
{{- toYaml .Values.controller.metrics.serviceMonitor.additionalLabels | nindent 4 }} {{- toYaml .Values.controller.metrics.serviceMonitor.additionalLabels | nindent 4 }}
{{- end }} {{- end }}
@ -30,3 +32,4 @@ spec:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-metrics app.kubernetes.io/name: {{ include "argo-cd.name" . }}-metrics
app.kubernetes.io/component: {{ .Values.controller.name }} app.kubernetes.io/component: {{ .Values.controller.name }}
{{- end }} {{- end }}

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

@ -13,7 +13,9 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.repoServer.name }} app.kubernetes.io/component: {{ .Values.repoServer.name }}
{{- if .Values.repoServer.metrics.serviceMonitor.selector }}
{{- toYaml .Values.repoServer.metrics.serviceMonitor.selector | nindent 4 }} {{- toYaml .Values.repoServer.metrics.serviceMonitor.selector | nindent 4 }}
{{- end }}
{{- if .Values.repoServer.metrics.serviceMonitor.additionalLabels }} {{- if .Values.repoServer.metrics.serviceMonitor.additionalLabels }}
{{- toYaml .Values.repoServer.metrics.serviceMonitor.additionalLabels | nindent 4 }} {{- toYaml .Values.repoServer.metrics.serviceMonitor.additionalLabels | nindent 4 }}
{{- end }} {{- end }}
@ -31,3 +33,4 @@ spec:
app.kubernetes.io/name: {{ template "argo-cd.repoServer.fullname" . }}-metrics app.kubernetes.io/name: {{ template "argo-cd.repoServer.fullname" . }}-metrics
app.kubernetes.io/component: {{ .Values.repoServer.name }} app.kubernetes.io/component: {{ .Values.repoServer.name }}
{{- end }} {{- end }}

3
charts/argo-cd/templates/argocd-server/servicemonitor.yaml
View file

@ -13,7 +13,9 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: argocd app.kubernetes.io/part-of: argocd
app.kubernetes.io/component: {{ .Values.server.name }} app.kubernetes.io/component: {{ .Values.server.name }}
{{- if .Values.server.metrics.serviceMonitor.selector }}
{{- toYaml .Values.server.metrics.serviceMonitor.selector | nindent 4 }} {{- toYaml .Values.server.metrics.serviceMonitor.selector | nindent 4 }}
{{- end }}
{{- if .Values.server.metrics.serviceMonitor.additionalLabels }} {{- if .Values.server.metrics.serviceMonitor.additionalLabels }}
{{- toYaml .Values.server.metrics.serviceMonitor.additionalLabels | nindent 4 }} {{- toYaml .Values.server.metrics.serviceMonitor.additionalLabels | nindent 4 }}
{{- end }} {{- end }}
@ -31,3 +33,4 @@ spec:
app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}-metrics app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}-metrics
app.kubernetes.io/component: {{ .Values.server.name }} app.kubernetes.io/component: {{ .Values.server.name }}
{{- end }} {{- end }}