Skip to content

Commit 728b6e7

Browse files
authored
feat(argo-cd): Make redis secret initialization optional (argoproj#2713)
* Make redis secret initialization optional Signed-off-by: michaelvl <[email protected]> * Remove artifacthub.io/changes from previous change Signed-off-by: michaelvl <[email protected]> --------- Signed-off-by: michaelvl <[email protected]>
1 parent e677641 commit 728b6e7

File tree

7 files changed

+9
-6
lines changed

7 files changed

+9
-6
lines changed

charts/argo-cd/Chart.yaml

Lines changed: 2 additions & 2 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.2
6+
version: 6.11.0
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:
@@ -27,4 +27,4 @@ annotations:
2727
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
2828
artifacthub.io/changes: |
2929
- kind: added
30-
description: Added priorityClassName for the redis secret init job
30+
description: Made Redis secret initialization optional with default enabled

charts/argo-cd/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,6 +1359,7 @@ If you use an External Redis (See Option 3 above), this Job is not deployed.
13591359
| Key | Type | Default | Description |
13601360
|-----|------|---------|-------------|
13611361
| redisSecretInit.containerSecurityContext | object | See [values.yaml] | Application controller container-level security context |
1362+
| redisSecretInit.enabled | bool | `true` | Enable Redis secret initialization. If disabled, secret must be provisioned by alternative methods |
13621363
| redisSecretInit.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the Redis secret-init Job |
13631364
| redisSecretInit.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the Redis secret-init Job |
13641365
| redisSecretInit.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the Redis secret-init Job |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if not .Values.externalRedis.host }}
1+
{{- if and .Values.redisSecretInit.enabled (not .Values.externalRedis.host) }}
22
apiVersion: batch/v1
33
kind: Job
44
metadata:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if not .Values.externalRedis.host }}
1+
{{- if and .Values.redisSecretInit.enabled (not .Values.externalRedis.host) }}
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: Role
44
metadata:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if not .Values.externalRedis.host }}
1+
{{- if and .Values.redisSecretInit.enabled (not .Values.externalRedis.host) }}
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: RoleBinding
44
metadata:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if not .Values.externalRedis.host }}
1+
{{- if and .Values.redisSecretInit.enabled (not .Values.externalRedis.host) }}
22
apiVersion: v1
33
kind: ServiceAccount
44
automountServiceAccountToken: {{ .Values.redisSecretInit.serviceAccount.automountServiceAccountToken }}

charts/argo-cd/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,6 +1601,8 @@ externalRedis:
16011601
secretAnnotations: {}
16021602

16031603
redisSecretInit:
1604+
# -- Enable Redis secret initialization. If disabled, secret must be provisioned by alternative methods
1605+
enabled: true
16041606
# -- Redis secret-init name
16051607
name: redis-secret-init
16061608

0 commit comments

Comments
 (0)