Merge branch 'main' into update-redis-ha-chart

README.md

@@ -1,5 +1,6 @@
 # Argo Helm Charts
 
+[![Slack](https://img.shields.io/badge/slack-%23argo--helm--charts-brightgreen.svg?logo=slack)](https://argoproj.github.io/community/join-slack)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Chart Publish](https://github.com/argoproj/argo-helm/actions/workflows/publish.yml/badge.svg?branch=main)](https://github.com/argoproj/argo-helm/actions/workflows/publish.yml)
 [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/argo)](https://artifacthub.io/packages/search?repo=argo)

charts/argo-cd/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: v2.6.3
 kubeVersion: ">=1.22.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.24.0
+version: 5.24.1
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -23,15 +23,5 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: Global nodeSelector configuration
-    - kind: added
-      description: Global tolerations configuration
-    - kind: added
-      description: Global topologySpreadConstraints configuration
-    - kind: added
-      description: Missing component level topologySpreadConstraints configuration
-    - kind: added
-      description: Missing component level priorityClassName configuration
-    - kind: changed
-      description: Global affinity preset can be disabled
+    - kind: fixed
+      description: ApplicationSet utilizes global tolerations

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 }}