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

feat(argo-cd): Add annotations to PrometheusRule (#1700)

Browse source
This commit is contained in:
Jellyfrog 2022-12-13 07:19:17 +01:00 committed by GitHub
parent f5c5c141c5
commit bc70281ca4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ appVersion: v2.5.4
kubeVersion: ">=1.22.0-0" kubeVersion: ">=1.22.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.16.2 version: 5.16.3
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:
@ -23,4 +23,4 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Changed]: Update ArgoCD to v2.5.4" - "[Added]: Add annotations to PrometheusRule"

4
charts/argo-cd/templates/argocd-application-controller/prometheusrule.yaml
View file

@ -14,6 +14,10 @@ metadata:
{{- if .Values.controller.metrics.rules.additionalLabels }} {{- if .Values.controller.metrics.rules.additionalLabels }}
{{- toYaml .Values.controller.metrics.rules.additionalLabels | nindent 4 }} {{- toYaml .Values.controller.metrics.rules.additionalLabels | nindent 4 }}
{{- end }} {{- end }}
{{- with .Values.controller.metrics.rules.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec: spec:
groups: groups:
- name: argocd - name: argocd

1
charts/argo-cd/values.yaml
View file

@ -705,6 +705,7 @@ controller:
# prometheus: kube-prometheus # prometheus: kube-prometheus
# namespace: monitoring # namespace: monitoring
# additionalLabels: {} # additionalLabels: {}
# annotations: {}
## Enable if you would like to grant rights to Argo CD to deploy to the local Kubernetes cluster. ## Enable if you would like to grant rights to Argo CD to deploy to the local Kubernetes cluster.
clusterAdminAccess: clusterAdminAccess: