diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index bc3ac6d1..f19b32c3 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.5.7 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.17.4 +version: 5.17.5 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: @@ -23,4 +23,4 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Changed]: Update Argo CD extensions to v0.2.1" + - "[Changed]: Update Argo CD to v2.5.7" diff --git a/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml b/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml index 208545e0..cf76d402 100644 --- a/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml @@ -263,18 +263,45 @@ spec: initContainers: {{- tpl (toYaml .) $ | nindent 6 }} {{- end }} + {{- if or .Values.controller.nodeSelector .Values.global.nodeSelector }} + {{- if .Values.controller.nodeSelector }} {{- with .Values.controller.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.controller.tolerations .Values.global.tolerations }} + {{- if .Values.controller.tolerations }} {{- with .Values.controller.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.controller.affinity .Values.global.affinity }} + {{- if .Values.controller.affinity }} {{- with .Values.controller.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} {{- with .Values.controller.topologySpreadConstraints }} topologySpreadConstraints: {{- range $constraint := . }} @@ -310,4 +337,4 @@ spec: path: ca.crt {{- with .Values.controller.priorityClassName }} priorityClassName: {{ . }} - {{- end }} + {{- end }} \ No newline at end of file diff --git a/charts/argo-cd/templates/argocd-applicationset/deployment.yaml b/charts/argo-cd/templates/argocd-applicationset/deployment.yaml index 0c3862de..415eeff3 100644 --- a/charts/argo-cd/templates/argocd-applicationset/deployment.yaml +++ b/charts/argo-cd/templates/argocd-applicationset/deployment.yaml @@ -131,18 +131,45 @@ spec: initContainers: {{- tpl (toYaml .) $ | nindent 6 }} {{- end }} + {{- if or .Values.applicationSet.nodeSelector .Values.global.nodeSelector }} + {{- if .Values.applicationSet.nodeSelector }} {{- with .Values.applicationSet.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.applicationSet.affinity .Values.global.affinity }} + {{- if .Values.applicationSet.affinity }} {{- with .Values.applicationSet.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.applicationSet.tolerations .Values.global.tolerations }} + {{- if .Values.applicationSet.tolerations }} {{- with .Values.applicationSet.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} {{- with .Values.applicationSet.priorityClassName }} priorityClassName: {{ . }} {{- end }} diff --git a/charts/argo-cd/templates/argocd-notifications/bots/slack/deployment.yaml b/charts/argo-cd/templates/argocd-notifications/bots/slack/deployment.yaml index da934607..5fc921a4 100644 --- a/charts/argo-cd/templates/argocd-notifications/bots/slack/deployment.yaml +++ b/charts/argo-cd/templates/argocd-notifications/bots/slack/deployment.yaml @@ -48,16 +48,43 @@ spec: {{- toYaml .Values.notifications.bots.slack.resources | nindent 12 }} securityContext: {{- toYaml .Values.notifications.bots.slack.containerSecurityContext | nindent 12 }} + {{- if or .Values.notifications.bots.slack.nodeSelector .Values.global.nodeSelector }} + {{- if .Values.notifications.bots.slack.nodeSelector }} {{- with .Values.notifications.bots.slack.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.notifications.bots.slack.affinity .Values.global.affinity }} + {{- if .Values.notifications.bots.slack.affinity }} {{- with .Values.notifications.bots.slack.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.notifications.bots.slack.tolerations .Values.global.tolerations }} + {{- if .Values.notifications.bots.slack.tolerations }} {{- with .Values.notifications.bots.slack.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} {{ end }} diff --git a/charts/argo-cd/templates/argocd-notifications/deployment.yaml b/charts/argo-cd/templates/argocd-notifications/deployment.yaml index 7ee9f8f4..bfa8d367 100644 --- a/charts/argo-cd/templates/argocd-notifications/deployment.yaml +++ b/charts/argo-cd/templates/argocd-notifications/deployment.yaml @@ -88,18 +88,45 @@ spec: initContainers: {{- tpl (toYaml . ) $ | nindent 8 }} {{- end }} + {{- if or .Values.notifications.nodeSelector .Values.global.nodeSelector }} + {{- if .Values.notifications.nodeSelector }} {{- with .Values.notifications.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.notifications.affinity .Values.global.affinity }} + {{- if .Values.notifications.affinity }} {{- with .Values.notifications.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.notifications.tolerations .Values.global.tolerations }} + {{- if .Values.notifications.tolerations }} {{- with .Values.notifications.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} {{- with .Values.notifications.priorityClassName }} priorityClassName: {{ . }} {{- end }} diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index 04117ba3..d570337d 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -289,18 +289,45 @@ spec: {{- with .Values.repoServer.initContainers }} {{- tpl (toYaml .) $ | nindent 6 }} {{- end }} + {{- if or .Values.repoServer.nodeSelector .Values.global.nodeSelector }} + {{- if .Values.repoServer.nodeSelector }} {{- with .Values.repoServer.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.repoServer.tolerations .Values.global.tolerations }} + {{- if .Values.repoServer.tolerations }} {{- with .Values.repoServer.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.repoServer.affinity .Values.global.affinity }} + {{- if .Values.repoServer.affinity }} {{- with .Values.repoServer.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} {{- with .Values.repoServer.topologySpreadConstraints }} topologySpreadConstraints: {{- range $constraint := . }} diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index c38d9348..778732ff 100755 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -340,18 +340,45 @@ spec: initContainers: {{- tpl (toYaml .) $ | nindent 6 }} {{- end }} + {{- if or .Values.server.nodeSelector .Values.global.nodeSelector }} + {{- if .Values.server.nodeSelector }} {{- with .Values.server.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.server.tolerations .Values.global.tolerations }} + {{- if .Values.server.tolerations }} {{- with .Values.server.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.server.affinity .Values.global.affinity }} + {{- if .Values.server.affinity }} {{- with .Values.server.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} {{- with .Values.server.topologySpreadConstraints }} topologySpreadConstraints: {{- range $constraint := . }} diff --git a/charts/argo-cd/templates/dex/deployment.yaml b/charts/argo-cd/templates/dex/deployment.yaml index bd0362b3..78f52796 100755 --- a/charts/argo-cd/templates/dex/deployment.yaml +++ b/charts/argo-cd/templates/dex/deployment.yaml @@ -138,18 +138,45 @@ spec: {{- with .Values.dex.initContainers }} {{- tpl (toYaml .) $ | nindent 6 }} {{- end }} + {{- if or .Values.dex.nodeSelector .Values.global.nodeSelector }} + {{- if .Values.dex.nodeSelector }} {{- with .Values.dex.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.dex.tolerations .Values.global.tolerations }} + {{- if .Values.dex.tolerations }} {{- with .Values.dex.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.dex.affinity .Values.global.affinity }} + {{- if .Values.dex.affinity }} {{- with .Values.dex.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} {{- with .Values.dex.topologySpreadConstraints }} topologySpreadConstraints: {{- range $constraint := . }} diff --git a/charts/argo-cd/templates/redis/deployment.yaml b/charts/argo-cd/templates/redis/deployment.yaml index 6c6a4dbe..55643532 100755 --- a/charts/argo-cd/templates/redis/deployment.yaml +++ b/charts/argo-cd/templates/redis/deployment.yaml @@ -98,18 +98,45 @@ spec: initContainers: {{- tpl (toYaml .) $ | nindent 6 }} {{- end }} + {{- if or .Values.redis.nodeSelector .Values.global.nodeSelector }} + {{- if .Values.redis.nodeSelector }} {{- with .Values.redis.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.redis.tolerations .Values.global.tolerations }} + {{- if .Values.redis.tolerations }} {{- with .Values.redis.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} + {{- if or .Values.redis.affinity .Values.global.affinity }} + {{- if .Values.redis.affinity }} {{- with .Values.redis.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} + {{- else }} + {{- with .Values.global.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} + {{- end }} {{- with .Values.redis.topologySpreadConstraints }} topologySpreadConstraints: {{- range $constraint := . }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index cd0bee81..edd856b9 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -86,12 +86,20 @@ global: # runAsGroup: 999 # fsGroup: 999 + # -- [Node selector] + nodeSelector: {} + + # -- [Tolerations] for use with node taints + tolerations: [] + + # -- Assign custom [affinity] rules to the deployment + affinity: {} # -- Mapping between IP and hostnames that will be injected as entries in the pod's hosts files hostAliases: [] # - ip: 10.20.30.40 # hostnames: # - git.myhostname - + networkPolicy: # -- Create NetworkPolicy objects for all components create: false @@ -1333,7 +1341,7 @@ server: # -- Repository to use for extensions image repository: "ghcr.io/argoproj-labs/argocd-extensions" # -- Tag to use for extensions image - tag: "v0.2.1" + tag: "v0.1.0" # -- Image pull policy for extensions # @default -- `""` (defaults to global.image.imagePullPolicy) imagePullPolicy: ""