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

Merge pull request #1 from rupinSec/global-support

Browse source 
support for toleration, affinity, nodeSelector in .Values.global
This commit is contained in:
Rupin Solanki 2023-01-19 14:11:21 +05:30 committed by GitHub
commit 7ea46fa713
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 227 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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:

29
charts/argo-cd/templates/argocd-application-controller/statefulset.yaml
View file

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

27
charts/argo-cd/templates/argocd-applicationset/deployment.yaml
View file

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

27
charts/argo-cd/templates/argocd-notifications/bots/slack/deployment.yaml
View file

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

27
charts/argo-cd/templates/argocd-notifications/deployment.yaml
View file

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

27
charts/argo-cd/templates/argocd-repo-server/deployment.yaml
View file

@ -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 := . }}

27
charts/argo-cd/templates/argocd-server/deployment.yaml
View file

@ -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 := . }}

27
charts/argo-cd/templates/dex/deployment.yaml
View file

@ -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 := . }}

27
charts/argo-cd/templates/redis/deployment.yaml
View file

@ -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 := . }}

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

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