ArmstrongLabs
/
argo-helm
forked from argoproj/argo-helm
1
0
Fork 0
Code Pull Requests Packages Activity

fix(argo-cd): AppSet and Notifications respect global.podAnnotations (#1308) 

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
main argo-cd-4.8.1
Marco Kilchhofer 2022-06-02 14:06:16 +02:00 committed by GitHub
parent 35f9ea8149
commit bf692f9383
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: v2.3.4 appVersion: v2.3.4
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: 4.8.0 version: 4.8.1
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
keywords: keywords:
@ -21,4 +21,4 @@ dependencies:
condition: redis-ha.enabled condition: redis-ha.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Changed]: Can specify log format for Argo-CD Notifications component" - "[Fixed]: ApplicationSet and Notification controller Pods now also respect 'global.podAnnotations'"

6
charts/argo-cd/templates/argocd-applicationset/deployment.yaml
View File

@ -13,9 +13,11 @@ spec:
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.applicationSet.name) | nindent 6 }} {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.applicationSet.name) | nindent 6 }}
template: template:
metadata: metadata:
{{- with .Values.applicationSet.podAnnotations }} {{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.applicationSet.podAnnotations) }}
annotations: annotations:
{{- toYaml . | nindent 8 }} {{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }}
{{- end }}
{{- end }} {{- end }}
labels: labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.applicationSet.name "name" .Values.applicationSet.name) | nindent 8 }} {{- include "argo-cd.labels" (dict "context" . "component" .Values.applicationSet.name "name" .Values.applicationSet.name) | nindent 8 }}

6
charts/argo-cd/templates/argocd-notifications/deployment.yaml
View File

@ -14,11 +14,11 @@ spec:
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 6 }} {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 6 }}
template: template:
metadata: metadata:
{{- if .Values.notifications.podAnnotations }} {{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.notifications.podAnnotations) }}
annotations: annotations:
{{- range $key, $value := .Values.notifications.podAnnotations }} {{- range $key, $value := . }}
{{ $key }}: {{ $value | quote }} {{ $key }}: {{ $value | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}
labels: labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" .Values.notifications.name) | nindent 8 }} {{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" .Values.notifications.name) | nindent 8 }}