Skip to content

Commit 851f17e

Browse files
brunosimsenhorbrunosimsenhor
committed
feat(argo-cd): allowing apiVersions customization
Signed-off-by: Bruno Correia <[email protected]>
1 parent 78513fa commit 851f17e

File tree

9 files changed

+40
-15
lines changed

9 files changed

+40
-15
lines changed

‎charts/argo-cd/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: v3.2.1
33
kubeVersion: ">=1.25.0-0"
44
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
55
name: argo-cd
6-
version: 9.1.7
6+
version: 9.1.8
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:

‎charts/argo-cd/templates/_helpers.tpl‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,3 +319,21 @@ key: auth
319319
optional: true
320320
{{- end -}}
321321
{{- end -}}
322+
323+
{{/*
324+
Return the target Kubernetes version
325+
*/}}
326+
{{- define "argo-cd.kubeVersion" -}}
327+
{{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride }}
328+
{{- end -}}
329+
330+
{{/*
331+
Return the appropriate apiVersion for monitoring CRDs
332+
*/}}
333+
{{- define "argo-cd.apiVersions.monitoring" -}}
334+
{{- if .Values.apiVersionOverrides.monitoring -}}
335+
{{- print .Values.apiVersionOverrides.monitoring -}}
336+
{{- else -}}
337+
{{- print "monitoring.coreos.com/v1" -}}
338+
{{- end -}}
339+
{{- end -}}

‎charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.controller.metrics.enabled .Values.controller.metrics.serviceMonitor.enabled }}
2-
apiVersion: monitoring.coreos.com/v1
1+
{{- $apiVersion := include "argo-cd.apiVersions.monitoring" . }}
2+
{{- if and (.Capabilities.APIVersions.Has $apiVersion) .Values.controller.metrics.enabled .Values.controller.metrics.serviceMonitor.enabled }}
3+
apiVersion: {{ $apiVersion }}
34
kind: ServiceMonitor
45
metadata:
56
name: {{ template "argo-cd.controller.fullname" . }}

‎charts/argo-cd/templates/argocd-applicationset/servicemonitor.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.applicationSet.metrics.enabled .Values.applicationSet.metrics.serviceMonitor.enabled }}
2-
apiVersion: monitoring.coreos.com/v1
1+
{{- $apiVersion := include "argo-cd.apiVersions.monitoring" . }}
2+
{{- if and (.Capabilities.APIVersions.Has $apiVersion) .Values.applicationSet.metrics.enabled .Values.applicationSet.metrics.serviceMonitor.enabled }}
3+
apiVersion: {{ $apiVersion }}
34
kind: ServiceMonitor
45
metadata:
56
name: {{ template "argo-cd.applicationSet.fullname" . }}

‎charts/argo-cd/templates/argocd-notifications/servicemonitor.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.notifications.enabled .Values.notifications.metrics.enabled .Values.notifications.metrics.serviceMonitor.enabled }}
2-
apiVersion: monitoring.coreos.com/v1
1+
{{- $apiVersion := include "argo-cd.apiVersions.monitoring" . }}
2+
{{- if and (.Capabilities.APIVersions.Has $apiVersion) .Values.notifications.enabled .Values.notifications.metrics.enabled .Values.notifications.metrics.serviceMonitor.enabled }}
3+
apiVersion: {{ $apiVersion }}
34
kind: ServiceMonitor
45
metadata:
56
name: {{ template "argo-cd.notifications.fullname" . }}

‎charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.repoServer.metrics.enabled .Values.repoServer.metrics.serviceMonitor.enabled }}
2-
apiVersion: monitoring.coreos.com/v1
1+
{{- $apiVersion := include "argo-cd.apiVersions.monitoring" . }}
2+
{{- if and (.Capabilities.APIVersions.Has $apiVersion) .Values.repoServer.metrics.enabled .Values.repoServer.metrics.serviceMonitor.enabled }}
3+
apiVersion: {{ $apiVersion }}
34
kind: ServiceMonitor
45
metadata:
56
name: {{ template "argo-cd.repoServer.fullname" . }}

‎charts/argo-cd/templates/argocd-server/servicemonitor.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.server.metrics.enabled .Values.server.metrics.serviceMonitor.enabled }}
2-
apiVersion: monitoring.coreos.com/v1
1+
{{- $apiVersion := include "argo-cd.apiVersions.monitoring" . }}
2+
{{- if and (.Capabilities.APIVersions.Has $apiVersion) .Values.server.metrics.enabled .Values.server.metrics.serviceMonitor.enabled }}
3+
apiVersion: {{ $apiVersion }}
34
kind: ServiceMonitor
45
metadata:
56
name: {{ template "argo-cd.server.fullname" . }}

‎charts/argo-cd/templates/dex/servicemonitor.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.dex.enabled .Values.dex.metrics.enabled .Values.dex.metrics.serviceMonitor.enabled }}
2-
apiVersion: monitoring.coreos.com/v1
1+
{{- $apiVersion := include "argo-cd.apiVersions.monitoring" . }}
2+
{{- if and (.Capabilities.APIVersions.Has $apiVersion) .Values.dex.enabled .Values.dex.metrics.enabled .Values.dex.metrics.serviceMonitor.enabled }}
3+
apiVersion: {{ $apiVersion }}
34
kind: ServiceMonitor
45
metadata:
56
name: {{ template "argo-cd.dex.fullname" . }}

‎charts/argo-cd/templates/redis/servicemonitor.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{{- $redisHa := (index .Values "redis-ha") -}}
2-
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.redis.enabled (not $redisHa.enabled) .Values.redis.metrics.enabled .Values.redis.metrics.serviceMonitor.enabled -}}
3-
apiVersion: monitoring.coreos.com/v1
2+
{{- $apiVersion := include "argo-cd.apiVersions.monitoring" . }}
3+
{{- if and (.Capabilities.APIVersions.Has $apiVersion) .Values.redis.enabled (not $redisHa.enabled) .Values.redis.metrics.enabled .Values.redis.metrics.serviceMonitor.enabled -}}
4+
apiVersion: {{ $apiVersion }}
45
kind: ServiceMonitor
56
metadata:
67
name: {{ template "argo-cd.redis.fullname" . }}

0 commit comments

Comments
 (0)