feat(argocd-applicationset): Add resources metrics-service and servicemonitor. (#1041)

* [argocd-applicationset]: Add metrics-service and servicemonitor to applicationset.

Signed-off-by: fuyuan.chu <fuyuan.chu@airwallex.com>

* [argocd-applicationset]: Add ci values for servicemonitor.

Signed-off-by: fuyuan.chu <fuyuan.chu@airwallex.com>

* format indent

Signed-off-by: fuyuan.chu <fuyuan.chu@airwallex.com>

* update helm docs

Signed-off-by: fuyuan.chu <fuyuan.chu@airwallex.com>

* update ci values

Signed-off-by: fuyuan.chu <fuyuan.chu@airwallex.com>

* update ci values

Signed-off-by: fuyuan.chu <fuyuan.chu@airwallex.com>

* chore: Use consistent indents and file ending

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

* Also disable mounts of ArgoCD during metrics test

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

Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
FuyuanChu 2021-12-09 22:56:32 +08:00 committed by GitHub
parent 60693bb289
commit 817652a449
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 115 additions and 3 deletions

View file

@ -53,6 +53,9 @@ spec:
- name: http
containerPort: {{ (split ":" .Values.args.probeBindAddr)._1 }}
protocol: TCP
- name: metrics
containerPort: {{ (split ":" .Values.args.metricsAddr)._1 }}
protocol: TCP
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:

View file

@ -0,0 +1,25 @@
{{- if .Values.metrics.enabled }}
apiVersion: v1
kind: Service
metadata:
{{- if .Values.metrics.service.annotations }}
annotations:
{{- range $key, $value := .Values.metrics.service.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }}
labels:
{{- include "argo-applicationset.labels" . | nindent 4 }}
{{- with .Values.metrics.service.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
name: {{ template "argo-applicationset.fullname" . }}-metrics
spec:
ports:
- name: metrics
protocol: TCP
port: {{ .Values.metrics.service.servicePort }}
targetPort: metrics
selector:
{{- include "argo-applicationset.selectorLabels" . | nindent 4 }}
{{- end }}

View file

@ -0,0 +1,38 @@
{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ template "argo-applicationset.fullname" . }}
{{- if .Values.metrics.serviceMonitor.namespace }}
namespace: {{ .Values.metrics.serviceMonitor.namespace }}
{{- end }}
labels:
{{- include "argo-applicationset.labels" . | nindent 4 }}
{{- with .Values.metrics.serviceMonitor.selector }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.metrics.serviceMonitor.additionalLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
endpoints:
- port: metrics
{{- with .Values.metrics.serviceMonitor.interval }}
interval: {{ . }}
{{- end }}
path: /metrics
{{- with .Values.metrics.serviceMonitor.relabelings }}
relabelings:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.metrics.serviceMonitor.metricRelabelings }}
metricRelabelings:
{{- toYaml . | nindent 8 }}
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
selector:
matchLabels:
{{- include "argo-applicationset.selectorLabels" . | nindent 6 }}
{{- end }}