Skip to content

Commit 10bf57b

Browse files
authored
fix(argo-cd): envFrom in repoServer (argoproj#751)
* fix: envFrom for repoServer Signed-off-by: Michał Czeraszkiewicz <contact@czerasz.com> * config: bump chart version Signed-off-by: Michał Czeraszkiewicz <contact@czerasz.com> * docs: add envFrom documentation Signed-off-by: Michał Czeraszkiewicz <contact@czerasz.com> * docs: improve documentation for envFrom Signed-off-by: Michał Czeraszkiewicz <contact@czerasz.com> * Apply suggestions from code review Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
1 parent eb659b1 commit 10bf57b

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

charts/argo-cd/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: 2.0.1
33
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
44
name: argo-cd
5-
version: 3.6.0
5+
version: 3.6.1
66
home: https://github.com/argoproj/argo-helm
77
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
88
keywords:

charts/argo-cd/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
147147
| controller.extraArgs | Additional arguments for the controller. A list of flags | `[]` |
148148
| controller.enableStatefulSet | Enable deploying the controller as a StatefulSet instead of a Deployment. Used for HA installations. | `false` |
149149
| controller.env | Environment variables for the controller. | `[]` |
150+
| controller.envFrom | `envFrom` to pass to the controller. | `[]` (See [values.yaml](values.yaml)) |
150151
| controller.image.repository | Repository to use for the controller | `global.image.repository` |
151152
| controller.image.imagePullPolicy | Image pull policy for the controller | `global.image.imagePullPolicy` |
152153
| controller.image.tag | Tag to use for the controller | `global.image.tag` |
@@ -198,6 +199,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
198199
| repoServer.containerPort | Repo server port | `8081` |
199200
| repoServer.extraArgs | Additional arguments for the repo server. A list of flags. | `[]` |
200201
| repoServer.env | Environment variables for the repo server. | `[]` |
202+
| repoServer.envFrom | `envFrom` to pass to the repo server. | `[]` (See [values.yaml](values.yaml)) |
201203
| repoServer.image.repository | Repository to use for the repo server | `global.image.repository` |
202204
| repoServer.image.imagePullPolicy | Image pull policy for the repo server | `global.image.imagePullPolicy` |
203205
| repoServer.image.tag | Tag to use for the repo server | `global.image.tag` |
@@ -258,6 +260,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
258260
| server.containerPort | Server container port. | `8080` |
259261
| server.extraArgs | Additional arguments for the server. A list of flags. | `[]` |
260262
| server.env | Environment variables for the server. | `[]` |
263+
| server.envFrom | `envFrom` to pass to the server. | `[]` (See [values.yaml](values.yaml)) |
261264
| server.image.repository | Repository to use for the server | `global.image.repository` |
262265
| server.image.imagePullPolicy | Image pull policy for the server | `global.image.imagePullPolicy` |
263266
| server.image.tag | Tag to use for the server | `global.image.tag` |
@@ -343,6 +346,7 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
343346
| dex.metrics.serviceMonitor.selector | Prometheus ServiceMonitor selector. | `{}` |
344347
| dex.name | Dex name | `"dex-server"` |
345348
| dex.env | Environment variables for the Dex server. | `[]` |
349+
| dex.envFrom | `envFrom` to pass to the Dex server. | `[]` (See [values.yaml](values.yaml)) |
346350
| dex.nodeSelector | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) | `{}` |
347351
| dex.podAnnotations | Annotations for the Dex server pods | `{}` |
348352
| dex.podLabels | Labels for the Dex server pods | `{}` |
@@ -376,6 +380,7 @@ through `xxx.extraArgs`
376380
| redis.extraArgs | Additional arguments for the `redis-server`. A list of flags. | `[]` |
377381
| redis.name | Redis name | `"redis"` |
378382
| redis.env | Environment variables for the Redis server. | `[]` |
383+
| redis.envFrom | `envFrom` to pass to the Redis server. | `[]` (See [values.yaml](values.yaml)) |
379384
| redis.nodeSelector | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) | `{}` |
380385
| redis.podAnnotations | Annotations for the Redis server pods | `{}` |
381386
| redis.podLabels | Labels for the Redis server pods | `{}` |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
value: argocd
6868
{{- end }}
6969
{{- end }}
70-
{{- with .Values.openshift.envFrom }}
70+
{{- with .Values.repoServer.envFrom }}
7171
envFrom: {{- toYaml . | nindent 8 }}
7272
{{- end }}
7373
volumeMounts:

0 commit comments

Comments
 (0)