Skip to content

Commit f431e9b

Browse files
chore(argo-cd): add nodeselector and tolerations to redis-secret-init job (argoproj#2708)
chore(argo-cd): add nodeselector and tolerations to redis-secret-init-job Signed-off-by: Pavan <[email protected]> Co-authored-by: Pavan <[email protected]>
1 parent fcee9a6 commit f431e9b

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

charts/argo-cd/Chart.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ appVersion: v2.11.1
33
kubeVersion: ">=1.23.0-0"
44
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
55
name: argo-cd
6-
version: 6.10.0
6+
version: 6.10.1
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:
@@ -26,7 +26,5 @@ annotations:
2626
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
2727
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
2828
artifacthub.io/changes: |
29-
- kind: security
30-
description: Enable Redis authentication in the default installation (GHSA-9766-5277-j5hr)
31-
- kind: changed
32-
description: Bump argo-cd to v2.11.1
29+
- kind: added
30+
description: Added node selector and tolerations for the redis secret init job

charts/argo-cd/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,6 +1365,7 @@ If you use an External Redis (See Option 3 above), this Job is not deployed.
13651365
| redisSecretInit.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry |
13661366
| redisSecretInit.jobAnnotations | object | `{}` | Annotations to be added to the Redis secret-init Job |
13671367
| redisSecretInit.name | string | `"redis-secret-init"` | Redis secret-init name |
1368+
| redisSecretInit.nodeSelector | object | `{}` (defaults to global.nodeSelector) | Node selector to be added to the Redis secret-init Job |
13681369
| redisSecretInit.podAnnotations | object | `{}` | Annotations to be added to the Redis secret-init Job |
13691370
| redisSecretInit.podLabels | object | `{}` | Labels to be added to the Redis secret-init Job |
13701371
| redisSecretInit.resources | object | `{}` | Resource limits and requests for Redis secret-init Job |
@@ -1373,6 +1374,7 @@ If you use an External Redis (See Option 3 above), this Job is not deployed.
13731374
| redisSecretInit.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
13741375
| redisSecretInit.serviceAccount.create | bool | `true` | Create a service account for the redis pod |
13751376
| redisSecretInit.serviceAccount.name | string | `""` | Service account name for redis pod |
1377+
| redisSecretInit.tolerations | list | `[]` (defaults to global.tolerations) | Tolerations to be added to the Redis secret-init Job |
13761378

13771379
## ApplicationSet
13781380

charts/argo-cd/templates/redis-secret-init/job.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,13 @@ spec:
5050
{{- toYaml . | nindent 8 }}
5151
{{- end }}
5252
restartPolicy: OnFailure
53+
{{- with .Values.redisSecretInit.nodeSelector | default .Values.global.nodeSelector }}
54+
nodeSelector:
55+
{{- toYaml . | nindent 8 }}
56+
{{- end }}
57+
{{- with .Values.redisSecretInit.tolerations | default .Values.global.tolerations }}
58+
tolerations:
59+
{{- toYaml . | nindent 8 }}
60+
{{- end }}
5361
serviceAccountName: {{ include "argo-cd.redisSecretInit.serviceAccountName" . }}
5462
{{- end }}

charts/argo-cd/values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,6 +1662,13 @@ redisSecretInit:
16621662
# -- Automount API credentials for the Service Account
16631663
automountServiceAccountToken: true
16641664

1665+
# -- Node selector to be added to the Redis secret-init Job
1666+
# @default -- `{}` (defaults to global.nodeSelector)
1667+
nodeSelector: {}
1668+
1669+
# -- Tolerations to be added to the Redis secret-init Job
1670+
# @default -- `[]` (defaults to global.tolerations)
1671+
tolerations: []
16651672

16661673
## Server
16671674
server:

0 commit comments

Comments
 (0)