From a947c3e251c44488ed0d6a6e8eb5c5c5cc6e1b7e Mon Sep 17 00:00:00 2001
From: Ian Martin <ian@imartin.net>
Date: Thu, 2 Mar 2023 13:26:46 -0700
Subject: [PATCH] ApplicationSet deployment uses global tolerations

Fixes #1880

Signed-off-by: Ian Martin <ian@imartin.net>
---
 charts/argo-cd/templates/argocd-applicationset/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/argo-cd/templates/argocd-applicationset/deployment.yaml b/charts/argo-cd/templates/argocd-applicationset/deployment.yaml
index bbf8d160..c737fb5e 100644
--- a/charts/argo-cd/templates/argocd-applicationset/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-applicationset/deployment.yaml
@@ -209,7 +209,7 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.applicationSet.tolerations }}
+      {{- with .Values.applicationSet.tolerations | default .Values.global.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}