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

feat(argo-cd): Add "global.env" for all deployed containers (#2096)

Browse source 
* add global env for argo-cd

Signed-off-by: Joe Lee <lj_2005@163.com>

* update readme

Signed-off-by: Joe Lee <lj_2005@163.com>

* fix typo

Signed-off-by: Joe Lee <lj_2005@163.com>

* feat(argo-cd): Add "global.env" for all deployed containers

Signed-off-by: Joe Lee <lj_2005@163.com>

* update doc

Signed-off-by: Joe Lee <lj_2005@163.com>

* remove note

Signed-off-by: Joe Lee <lj_2005@163.com>

* update changes

Signed-off-by: Joe Lee <lj_2005@163.com>

---------

Signed-off-by: Joe Lee <lj_2005@163.com>
This commit is contained in:
Joe Lee 2023-06-07 16:52:02 +08:00 committed by GitHub
parent 2538371fec
commit 49c2ca2548
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ appVersion: v2.7.4
kubeVersion: ">=1.23.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 5.35.1
version: 5.36.0
home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources:
@ -26,7 +26,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: changed
description: Upgrade Argo CD to v2.7.4
- kind: added
description: Update knownHosts
description: Add .Values.global.env for all deployed containers

1
charts/argo-cd/README.md
View file

@ -407,6 +407,7 @@ NAME: my-release
| global.affinity.podAntiAffinity | string | `"soft"` | Default pod anti-affinity rules. Either: `none`, `soft` or `hard` |
| global.deploymentAnnotations | object | `{}` | Annotations for the all deployed Deployments |
| global.deploymentStrategy | object | `{}` | Deployment strategy for the all deployed Deployments |
| global.env | list | `[]` | Environment variables to pass to all deployed Deployments |
| global.hostAliases | list | `[]` | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files |
| global.image.imagePullPolicy | string | `"IfNotPresent"` | If defined, a imagePullPolicy applied to all Argo CD deployments |
| global.image.repository | string | `"quay.io/argoproj/argocd"` | If defined, a repository applied to all Argo CD deployments |

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

@ -99,7 +99,7 @@ spec:
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.controller.image.imagePullPolicy }}
name: {{ .Values.controller.name }}
env:
{{- with .Values.controller.env }}
{{- with (concat .Values.global.env .Values.controller.env) }}
{{- toYaml . | nindent 10 }}
{{- end }}
- name: ARGOCD_CONTROLLER_REPLICAS

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

@ -79,7 +79,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
env:
{{- with .Values.applicationSet.extraEnv }}
{{- with (concat .Values.global.env .Values.applicationSet.extraEnv) }}
{{- toYaml . | nindent 12 }}
{{- end }}
- name: NAMESPACE

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

@ -66,7 +66,7 @@ spec:
{{- range .Values.notifications.extraArgs }}
- {{ . | squote }}
{{- end }}
{{- with .Values.notifications.extraEnv }}
{{- with (concat .Values.global.env .Values.notifications.extraEnv) }}
env:
{{- toYaml . | nindent 12 }}
{{- end }}

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

@ -77,7 +77,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
env:
{{- with .Values.repoServer.env }}
{{- with (concat .Values.global.env .Values.repoServer.env) }}
{{- toYaml . | nindent 10 }}
{{- end }}
{{- if .Values.openshift.enabled }}

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

@ -74,7 +74,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
env:
{{- with .Values.server.env }}
{{- with (concat .Values.global.env .Values.server.env) }}
{{- toYaml . | nindent 10 }}
{{- end }}
- name: ARGOCD_SERVER_INSECURE

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

@ -70,7 +70,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
env:
{{- with .Values.dex.env }}
{{- with (concat .Values.global.env .Values.dex.env) }}
{{- toYaml . | nindent 10 }}
{{- end }}
- name: ARGOCD_DEX_SERVER_DISABLE_TLS

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

@ -61,7 +61,7 @@ spec:
{{- with .Values.redis.extraArgs }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.redis.env }}
{{- with (concat .Values.global.env .Values.redis.env) }}
env:
{{- toYaml . | nindent 8 }}
{{- end }}
@ -92,7 +92,7 @@ spec:
value: {{ printf "redis://localhost:%v" .Values.redis.containerPorts.redis }}
- name: REDIS_EXPORTER_WEB_LISTEN_ADDRESS
value: {{ printf "0.0.0.0:%v" .Values.redis.containerPorts.metrics }}
{{- with .Values.redis.exporter.env }}
{{- with (concat .Values.global.env .Values.redis.exporter.env) }}
{{- toYaml . | nindent 8 }}
{{- end }}
ports:

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

@ -144,6 +144,9 @@ global:
# maxSurge: 25%
# maxUnavailable: 25%
# -- Environment variables to pass to all deployed Deployments
env: []
## Argo Configs
configs:
# General Argo CD configuration