Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-15 06:47:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/argocd] Additional configuration for wait-for-redis container (#12647)

Browse Source 
* Fix 12645 by allowing disable, securityContext and extraArgs to redis wait init container

Signed-off-by: bert@transtrend.com <bh@tlrd0.local>

* Update version and document variables

Signed-off-by: bert@transtrend.com <bh@tlrd0.local>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

* Backwards compatible addition, so minor version bump

Signed-off-by: bert@transtrend.com <bh@tlrd0.local>

* Default value in values, not in template

Signed-off-by: bert@transtrend.com <bh@tlrd0.local>

Signed-off-by: bert@transtrend.com <bh@tlrd0.local>
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
Co-authored-by: bert@transtrend.com <bh@tlrd0.local>
Co-authored-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
bh-tt
2022-09-26 11:10:21 +02:00
committed by GitHub
parent 2235e5dbcf
commit 8d8a928984
6 changed files with 67 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/argo-cd/Chart.yaml
View File

@@ -30,4 +30,4 @@ sources:
- https://github.com/argoproj/argo-cd/
- https://github.com/bitnami/containers/tree/main/bitnami/dex
- https://github.com/dexidp/dex
version: 4.1.5
version: 4.2.0

67
bitnami/argo-cd/README.md
View File

@@ -76,15 +76,15 @@ The command removes all the Kubernetes components associated with the chart and
### Argo CD image parameters
| Name | Description | Value |
| ------------------- | ------------------------------------------------------------------------------------------------------- | -------------------- |
| `image.registry` | Argo CD image registry | `docker.io` |
| `image.repository` | Argo CD image repository | `bitnami/argo-cd` |
| `image.tag` | Argo CD image tag (immutable tags are recommended) | `2.4.8-debian-11-r3` |
| `image.digest` | Argo CD image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `image.pullPolicy` | Argo CD image pull policy | `IfNotPresent` |
| `image.pullSecrets` | Argo CD image pull secrets | `[]` |
| `image.debug` | Enable Argo CD image debug mode | `false` |
| Name | Description | Value |
| ------------------- | ------------------------------------------------------------------------------------------------------- | --------------------- |
| `image.registry` | Argo CD image registry | `docker.io` |
| `image.repository` | Argo CD image repository | `bitnami/argo-cd` |
| `image.tag` | Argo CD image tag (immutable tags are recommended) | `2.4.12-debian-11-r0` |
| `image.digest` | Argo CD image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `image.pullPolicy` | Argo CD image pull policy | `IfNotPresent` |
| `image.pullSecrets` | Argo CD image pull secrets | `[]` |
| `image.debug` | Enable Argo CD image debug mode | `false` |
### Argo CD application controller parameters
@@ -461,7 +461,7 @@ The command removes all the Kubernetes components associated with the chart and
| ------------------------------------------------------- | --------------------------------------------------------------------------------------------------- | --------------------- |
| `dex.image.registry` | Dex image registry | `docker.io` |
| `dex.image.repository` | Dex image repository | `bitnami/dex` |
| `dex.image.tag` | Dex image tag (immutable tags are recommended) | `2.33.0-debian-11-r3` |
| `dex.image.tag` | Dex image tag (immutable tags are recommended) | `2.33.1-debian-11-r0` |
| `dex.image.digest` | Dex image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `dex.image.pullPolicy` | Dex image pull policy | `IfNotPresent` |
| `dex.image.pullSecrets` | Dex image pull secrets | `[]` |
@@ -600,7 +600,7 @@ The command removes all the Kubernetes components associated with the chart and
| `volumePermissions.enabled` | Enable init container that changes the owner/group of the PV mount point to `runAsUser:fsGroup` | `false` |
| `volumePermissions.image.registry` | Bitnami Shell image registry | `docker.io` |
| `volumePermissions.image.repository` | Bitnami Shell image repository | `bitnami/bitnami-shell` |
| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r22` |
| `volumePermissions.image.tag` | Bitnami Shell image tag (immutable tags are recommended) | `11-debian-11-r35` |
| `volumePermissions.image.digest` | Bitnami Shell image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `volumePermissions.image.pullPolicy` | Bitnami Shell image pull policy | `IfNotPresent` |
| `volumePermissions.image.pullSecrets` | Bitnami Shell image pull secrets | `[]` |
@@ -611,27 +611,30 @@ The command removes all the Kubernetes components associated with the chart and
### Other Parameters
| Name | Description | Value |
| ----------------------------------------- | ----------------------------------------------------------------------------------------------------- | -------------------- |
| `rbac.create` | Specifies whether RBAC resources should be created | `true` |
| `redis.image.registry` | Redis image registry | `docker.io` |
| `redis.image.repository` | Redis image repository | `bitnami/redis` |
| `redis.image.tag` | Redis image tag (immutable tags are recommended) | `7.0.4-debian-11-r9` |
| `redis.image.digest` | Redis image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `redis.image.pullPolicy` | Redis image pull policy | `IfNotPresent` |
| `redis.image.pullSecrets` | Redis image pull secrets | `[]` |
| `redis.enabled` | Enable Redis dependency | `true` |
| `redis.nameOverride` | Name override for the Redis dependency | `""` |
| `redis.service.port` | Service port for Redis dependency | `6379` |
| `redis.auth.enabled` | Enable Redis dependency authentication | `true` |
| `redis.auth.existingSecret` | Existing secret to load redis dependency password | `""` |
| `redis.auth.existingSecretPasswordKey` | Pasword key name inside the existing secret | `redis-password` |
| `redis.architecture` | Redis&reg; architecture. Allowed values: `standalone` or `replication` | `standalone` |
| `externalRedis.host` | External Redis host | `""` |
| `externalRedis.port` | External Redis port | `6379` |
| `externalRedis.password` | External Redis password | `""` |
| `externalRedis.existingSecret` | Existing secret for the external redis | `""` |
| `externalRedis.existingSecretPasswordKey` | Password key for the existing secret containing the external redis password | `redis-password` |
| Name | Description | Value |
| ----------------------------------------- | ----------------------------------------------------------------------------------------------------- | --------------------- |
| `rbac.create` | Specifies whether RBAC resources should be created | `true` |
| `redis.image.registry` | Redis image registry | `docker.io` |
| `redis.image.repository` | Redis image repository | `bitnami/redis` |
| `redis.image.tag` | Redis image tag (immutable tags are recommended) | `7.0.4-debian-11-r23` |
| `redis.image.digest` | Redis image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag | `""` |
| `redis.image.pullPolicy` | Redis image pull policy | `IfNotPresent` |
| `redis.image.pullSecrets` | Redis image pull secrets | `[]` |
| `redis.enabled` | Enable Redis dependency | `true` |
| `redis.nameOverride` | Name override for the Redis dependency | `""` |
| `redis.service.port` | Service port for Redis dependency | `6379` |
| `redis.auth.enabled` | Enable Redis dependency authentication | `true` |
| `redis.auth.existingSecret` | Existing secret to load redis dependency password | `""` |
| `redis.auth.existingSecretPasswordKey` | Pasword key name inside the existing secret | `redis-password` |
| `redis.architecture` | Redis&reg; architecture. Allowed values: `standalone` or `replication` | `standalone` |
| `externalRedis.host` | External Redis host | `""` |
| `externalRedis.port` | External Redis port | `6379` |
| `externalRedis.password` | External Redis password | `""` |
| `externalRedis.existingSecret` | Existing secret for the external redis | `""` |
| `externalRedis.existingSecretPasswordKey` | Password key for the existing secret containing the external redis password | `redis-password` |
| `redisWait.enabled` | Enables waiting for redis | `true` |
| `redisWait.extraArgs` | Additional arguments for the redis-cli call, such as TLS | `""` |
| `redisWait.securityContext` | Security context for init container | `{}` |
The above parameters map to the env variables defined in [bitnami/argo-cd](https://github.com/bitnami/containers/tree/main/bitnami/argo-cd). For more information please refer to the [bitnami/argo-cd](https://github.com/bitnami/containers/tree/main/bitnami/argo-cd) image documentation.

7
bitnami/argo-cd/templates/application-controller/deployment.yaml
View File

@@ -65,9 +65,13 @@ spec:
securityContext: {{- omit .Values.controller.podSecurityContext "enabled" | toYaml | nindent 8 }}
{{- end }}
initContainers:
{{- if .Values.redisWait.enabled }}
- name: wait-for-redis
image: {{ include "common.images.image" (dict "imageRoot" .Values.redis.image "global" .Values.global) }}
imagePullPolicy: {{ .Values.redis.image.pullPolicy | quote }}
{{- with .Values.redisWait.securityContext }}
securityContext: {{ . | toYaml }}
{{- end }}
command:
- /bin/bash
args:
@@ -83,7 +87,7 @@ spec:
. /opt/bitnami/scripts/liblog.sh
check_redis_connection() {
local result="$(redis-cli -h {{ include "argocd.redisHost" . }} -p {{ include "argocd.redisPort" . }} PING)"
local result="$(redis-cli -h {{ include "argocd.redisHost" . }} -p {{ include "argocd.redisPort" . }} {{ .Values.redisWait.extraArgs }} PING)"
if [[ "$result" != "PONG" ]]; then
false
fi
@@ -104,6 +108,7 @@ spec:
name: {{ include "argocd.redis.secretName" . }}
key: {{ include "argocd.redis.secretPasswordKey" . }}
{{- end }}
{{- end }}
{{- if .Values.controller.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.controller.initContainers "context" $) | nindent 8 }}
{{- end }}

7
bitnami/argo-cd/templates/repo-server/deployment.yaml
View File

@@ -83,9 +83,13 @@ spec:
- name: tmp-dir
mountPath: /tmp
{{- end }}
{{- if .Values.redisWait.enabled }}
- name: wait-for-redis
image: {{ include "common.images.image" (dict "imageRoot" .Values.redis.image "global" .Values.global) }}
imagePullPolicy: {{ .Values.redis.image.pullPolicy | quote }}
{{- with .Values.redisWait.securityContext }}
securityContext: {{ . | toYaml }}
{{- end }}
command:
- /bin/bash
args:
@@ -101,7 +105,7 @@ spec:
. /opt/bitnami/scripts/liblog.sh
check_redis_connection() {
local result="$(redis-cli -h {{ include "argocd.redisHost" . }} -p {{ include "argocd.redisPort" . }} PING)"
local result="$(redis-cli -h {{ include "argocd.redisHost" . }} -p {{ include "argocd.redisPort" . }} {{ .Values.redisWait.extraArgs }} PING)"
if [[ "$result" != "PONG" ]]; then
false
fi
@@ -122,6 +126,7 @@ spec:
name: {{ include "argocd.redis.secretName" . }}
key: {{ include "argocd.redis.secretPasswordKey" . }}
{{- end }}
{{- end }}
{{- if .Values.repoServer.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.repoServer.initContainers "context" $) | nindent 8 }}
{{- end }}

7
bitnami/argo-cd/templates/server/deployment.yaml
View File

@@ -86,9 +86,13 @@ spec:
{{- if .Values.server.initContainers }}
{{- include "common.tplvalues.render" (dict "value" .Values.server.initContainers "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.redisWait.enabled }}
- name: wait-for-redis
image: {{ include "common.images.image" (dict "imageRoot" .Values.redis.image "global" .Values.global) }}
imagePullPolicy: {{ .Values.redis.image.pullPolicy | quote }}
{{- with .Values.redisWait.securityContext }}
securityContext: {{ . | toYaml }}
{{- end }}
command:
- /bin/bash
args:
@@ -104,7 +108,7 @@ spec:
. /opt/bitnami/scripts/liblog.sh
check_redis_connection() {
local result="$(redis-cli -h {{ include "argocd.redisHost" . }} -p {{ include "argocd.redisPort" . }} PING)"
local result="$(redis-cli -h {{ include "argocd.redisHost" . }} -p {{ include "argocd.redisPort" . }} {{ .Values.redisWait.extraArgs }} PING)"
if [[ "$result" != "PONG" ]]; then
false
fi
@@ -125,6 +129,7 @@ spec:
name: {{ include "argocd.redis.secretName" . }}
key: {{ include "argocd.redis.secretPasswordKey" . }}
{{- end }}
{{- end }}
containers:
- name: argocd-server
image: {{ include "argocd.image" . }}

13
bitnami/argo-cd/values.yaml
View File

@@ -2443,3 +2443,16 @@ externalRedis:
## @param externalRedis.existingSecretPasswordKey Password key for the existing secret containing the external redis password
##
existingSecretPasswordKey: 'redis-password'
## Wait-for-redis init container configuration
##
redisWait:
## @param redisWait.enabled Enables waiting for redis
##
enabled: true
## @param redisWait.extraArgs Additional arguments for the redis-cli call, such as TLS
##
extraArgs: ''
## @param redisWait.securityContext Security context for init container
##
securityContext: {}