fix(argo-cd): Enable Redis authentication in the default installation (#2705)
This commit is contained in:
parent
f9eb0b394c
commit
fcee9a6046
16 changed files with 352 additions and 14 deletions
|
@ -1,9 +1,9 @@
|
||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
appVersion: v2.11.0
|
appVersion: v2.11.1
|
||||||
kubeVersion: ">=1.23.0-0"
|
kubeVersion: ">=1.23.0-0"
|
||||||
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
|
||||||
name: argo-cd
|
name: argo-cd
|
||||||
version: 6.9.3
|
version: 6.10.0
|
||||||
home: https://github.com/argoproj/argo-helm
|
home: https://github.com/argoproj/argo-helm
|
||||||
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
|
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
|
||||||
sources:
|
sources:
|
||||||
|
@ -26,5 +26,7 @@ annotations:
|
||||||
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
|
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
|
||||||
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
|
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
|
||||||
artifacthub.io/changes: |
|
artifacthub.io/changes: |
|
||||||
- kind: fixed
|
- kind: security
|
||||||
description: Restarting dex pod when `argocd-cm` configmap changes
|
description: Enable Redis authentication in the default installation (GHSA-9766-5277-j5hr)
|
||||||
|
- kind: changed
|
||||||
|
description: Bump argo-cd to v2.11.1
|
||||||
|
|
|
@ -278,6 +278,39 @@ For full list of changes please check ArtifactHub [changelog].
|
||||||
|
|
||||||
Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version.
|
Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version.
|
||||||
|
|
||||||
|
### 6.10.0
|
||||||
|
|
||||||
|
This version introduces authentication for Redis to mitigate GHSA-9766-5277-j5hr.
|
||||||
|
|
||||||
|
#### How to rotate Redis secret?
|
||||||
|
|
||||||
|
Upstream steps in the [FAQ] are not enough, since we chose a different approach.
|
||||||
|
(We use a Kubernetes Job with [Chart Hooks] to create the auth secret `argocd-redis`.)
|
||||||
|
|
||||||
|
Steps to roteate the secret when using the helm chart (bold step is additional to upstream):
|
||||||
|
* Delete `argocd-redis` secret in the namespace where Argo CD is installed.
|
||||||
|
```bash
|
||||||
|
kubectl delete secret argocd-redis -n <argocd namesapce>
|
||||||
|
```
|
||||||
|
* **Perform a helm upgrade**
|
||||||
|
```bash
|
||||||
|
helm upgrade argocd argo/argo-cd --reuse-values --wait
|
||||||
|
```
|
||||||
|
* If you are running Redis in HA mode, restart Redis in HA.
|
||||||
|
```bash
|
||||||
|
kubectl rollout restart deployment argocd-redis-ha-haproxy
|
||||||
|
kubectl rollout restart statefulset argocd-redis-ha-server
|
||||||
|
```
|
||||||
|
* If you are running Redis in non-HA mode, restart Redis.
|
||||||
|
```bash
|
||||||
|
kubectl rollout restart deployment argocd-redis
|
||||||
|
```
|
||||||
|
* Restart other components.
|
||||||
|
```bash
|
||||||
|
kubectl rollout restart deployment argocd-server argocd-repo-server
|
||||||
|
kubectl rollout restart statefulset argocd-application-controller
|
||||||
|
```
|
||||||
|
|
||||||
### 6.9.0
|
### 6.9.0
|
||||||
ApplicationSet controller is always created to follow [upstream's manifest](https://github.com/argoproj/argo-cd/blob/v2.11.0/manifests/core-install/kustomization.yaml#L9).
|
ApplicationSet controller is always created to follow [upstream's manifest](https://github.com/argoproj/argo-cd/blob/v2.11.0/manifests/core-install/kustomization.yaml#L9).
|
||||||
|
|
||||||
|
@ -1271,8 +1304,10 @@ The main options are listed here:
|
||||||
|-----|------|---------|-------------|
|
|-----|------|---------|-------------|
|
||||||
| redis-ha.additionalAffinities | object | `{}` | Additional affinities to add to the Redis server pods. |
|
| redis-ha.additionalAffinities | object | `{}` | Additional affinities to add to the Redis server pods. |
|
||||||
| redis-ha.affinity | string | `""` | Assign custom [affinity] rules to the Redis pods. |
|
| redis-ha.affinity | string | `""` | Assign custom [affinity] rules to the Redis pods. |
|
||||||
|
| redis-ha.auth | bool | `true` | Configures redis-ha with AUTH |
|
||||||
| redis-ha.containerSecurityContext | object | See [values.yaml] | Redis HA statefulset container-level security context |
|
| redis-ha.containerSecurityContext | object | See [values.yaml] | Redis HA statefulset container-level security context |
|
||||||
| redis-ha.enabled | bool | `false` | Enables the Redis HA subchart and disables the custom Redis single node deployment |
|
| redis-ha.enabled | bool | `false` | Enables the Redis HA subchart and disables the custom Redis single node deployment |
|
||||||
|
| redis-ha.existingSecret | string | `"argocd-redis"` | Existing Secret to use for redis-ha authentication. By default the redis-secret-init Job is generating this Secret. |
|
||||||
| redis-ha.exporter.enabled | bool | `false` | Enable Prometheus redis-exporter sidecar |
|
| redis-ha.exporter.enabled | bool | `false` | Enable Prometheus redis-exporter sidecar |
|
||||||
| redis-ha.exporter.image | string | `"public.ecr.aws/bitnami/redis-exporter"` | Repository to use for the redis-exporter |
|
| redis-ha.exporter.image | string | `"public.ecr.aws/bitnami/redis-exporter"` | Repository to use for the redis-exporter |
|
||||||
| redis-ha.exporter.tag | string | `"1.58.0"` | Tag to use for the redis-exporter |
|
| redis-ha.exporter.tag | string | `"1.58.0"` | Tag to use for the redis-exporter |
|
||||||
|
@ -1316,6 +1351,29 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
|
||||||
| externalRedis.secretAnnotations | object | `{}` | External Redis Secret annotations |
|
| externalRedis.secretAnnotations | object | `{}` | External Redis Secret annotations |
|
||||||
| externalRedis.username | string | `""` | External Redis username |
|
| externalRedis.username | string | `""` | External Redis username |
|
||||||
|
|
||||||
|
### Redis secret-init
|
||||||
|
|
||||||
|
The helm chart deploys a Job to setup a random password which is used to secure the Redis. The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.
|
||||||
|
If you use an External Redis (See Option 3 above), this Job is not deployed.
|
||||||
|
|
||||||
|
| Key | Type | Default | Description |
|
||||||
|
|-----|------|---------|-------------|
|
||||||
|
| redisSecretInit.containerSecurityContext | object | See [values.yaml] | Application controller container-level security context |
|
||||||
|
| redisSecretInit.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for the Redis secret-init Job |
|
||||||
|
| redisSecretInit.image.repository | string | `""` (defaults to global.image.repository) | Repository to use for the Redis secret-init Job |
|
||||||
|
| redisSecretInit.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the Redis secret-init Job |
|
||||||
|
| redisSecretInit.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry |
|
||||||
|
| redisSecretInit.jobAnnotations | object | `{}` | Annotations to be added to the Redis secret-init Job |
|
||||||
|
| redisSecretInit.name | string | `"redis-secret-init"` | Redis secret-init name |
|
||||||
|
| redisSecretInit.podAnnotations | object | `{}` | Annotations to be added to the Redis secret-init Job |
|
||||||
|
| redisSecretInit.podLabels | object | `{}` | Labels to be added to the Redis secret-init Job |
|
||||||
|
| redisSecretInit.resources | object | `{}` | Resource limits and requests for Redis secret-init Job |
|
||||||
|
| redisSecretInit.securityContext | object | `{}` | Redis secret-init Job pod-level security context |
|
||||||
|
| redisSecretInit.serviceAccount.annotations | object | `{}` | Annotations applied to created service account |
|
||||||
|
| redisSecretInit.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account |
|
||||||
|
| redisSecretInit.serviceAccount.create | bool | `true` | Create a service account for the redis pod |
|
||||||
|
| redisSecretInit.serviceAccount.name | string | `""` | Service account name for redis pod |
|
||||||
|
|
||||||
## ApplicationSet
|
## ApplicationSet
|
||||||
|
|
||||||
| Key | Type | Default | Description |
|
| Key | Type | Default | Description |
|
||||||
|
@ -1507,8 +1565,10 @@ Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/
|
||||||
[BackendConfigSpec]: https://cloud.google.com/kubernetes-engine/docs/concepts/backendconfig#backendconfigspec_v1beta1_cloudgooglecom
|
[BackendConfigSpec]: https://cloud.google.com/kubernetes-engine/docs/concepts/backendconfig#backendconfigspec_v1beta1_cloudgooglecom
|
||||||
[CSS styles]: https://argo-cd.readthedocs.io/en/stable/operator-manual/custom-styles/
|
[CSS styles]: https://argo-cd.readthedocs.io/en/stable/operator-manual/custom-styles/
|
||||||
[changelog]: https://artifacthub.io/packages/helm/argo/argo-cd?modal=changelog
|
[changelog]: https://artifacthub.io/packages/helm/argo/argo-cd?modal=changelog
|
||||||
|
[Chart Hooks]: https://helm.sh/docs/topics/charts_hooks/
|
||||||
[DNS configuration]: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/
|
[DNS configuration]: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/
|
||||||
[external cluster credentials]: https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup/#clusters
|
[external cluster credentials]: https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup/#clusters
|
||||||
|
[FAQ]: https://argo-cd.readthedocs.io/en/stable/faq/
|
||||||
[FrontendConfigSpec]: https://cloud.google.com/kubernetes-engine/docs/how-to/ingress-features#configuring_ingress_features_through_frontendconfig_parameters
|
[FrontendConfigSpec]: https://cloud.google.com/kubernetes-engine/docs/how-to/ingress-features#configuring_ingress_features_through_frontendconfig_parameters
|
||||||
[declarative setup]: https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup
|
[declarative setup]: https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup
|
||||||
[gRPC-ingress]: https://argo-cd.readthedocs.io/en/stable/operator-manual/ingress/
|
[gRPC-ingress]: https://argo-cd.readthedocs.io/en/stable/operator-manual/ingress/
|
||||||
|
|
|
@ -278,6 +278,39 @@ For full list of changes please check ArtifactHub [changelog].
|
||||||
|
|
||||||
Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version.
|
Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version.
|
||||||
|
|
||||||
|
### 6.10.0
|
||||||
|
|
||||||
|
This version introduces authentication for Redis to mitigate GHSA-9766-5277-j5hr.
|
||||||
|
|
||||||
|
#### How to rotate Redis secret?
|
||||||
|
|
||||||
|
Upstream steps in the [FAQ] are not enough, since we chose a different approach.
|
||||||
|
(We use a Kubernetes Job with [Chart Hooks] to create the auth secret `argocd-redis`.)
|
||||||
|
|
||||||
|
Steps to roteate the secret when using the helm chart (bold step is additional to upstream):
|
||||||
|
* Delete `argocd-redis` secret in the namespace where Argo CD is installed.
|
||||||
|
```bash
|
||||||
|
kubectl delete secret argocd-redis -n <argocd namesapce>
|
||||||
|
```
|
||||||
|
* **Perform a helm upgrade**
|
||||||
|
```bash
|
||||||
|
helm upgrade argocd argo/argo-cd --reuse-values --wait
|
||||||
|
```
|
||||||
|
* If you are running Redis in HA mode, restart Redis in HA.
|
||||||
|
```bash
|
||||||
|
kubectl rollout restart deployment argocd-redis-ha-haproxy
|
||||||
|
kubectl rollout restart statefulset argocd-redis-ha-server
|
||||||
|
```
|
||||||
|
* If you are running Redis in non-HA mode, restart Redis.
|
||||||
|
```bash
|
||||||
|
kubectl rollout restart deployment argocd-redis
|
||||||
|
```
|
||||||
|
* Restart other components.
|
||||||
|
```bash
|
||||||
|
kubectl rollout restart deployment argocd-server argocd-repo-server
|
||||||
|
kubectl rollout restart statefulset argocd-application-controller
|
||||||
|
```
|
||||||
|
|
||||||
### 6.9.0
|
### 6.9.0
|
||||||
ApplicationSet controller is always created to follow [upstream's manifest](https://github.com/argoproj/argo-cd/blob/v2.11.0/manifests/core-install/kustomization.yaml#L9).
|
ApplicationSet controller is always created to follow [upstream's manifest](https://github.com/argoproj/argo-cd/blob/v2.11.0/manifests/core-install/kustomization.yaml#L9).
|
||||||
|
|
||||||
|
@ -722,6 +755,19 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
### Redis secret-init
|
||||||
|
|
||||||
|
The helm chart deploys a Job to setup a random password which is used to secure the Redis. The Redis password is stored in Kubernetes secret `argocd-redis` with key `auth` in the namespace where Argo CD is installed.
|
||||||
|
If you use an External Redis (See Option 3 above), this Job is not deployed.
|
||||||
|
|
||||||
|
| Key | Type | Default | Description |
|
||||||
|
|-----|------|---------|-------------|
|
||||||
|
{{- range .Values }}
|
||||||
|
{{- if hasPrefix "redisSecretInit" .Key }}
|
||||||
|
| {{ .Key }} | {{ .Type }} | {{ if .Default }}{{ .Default }}{{ else }}{{ .AutoDefault }}{{ end }} | {{ if .Description }}{{ .Description }}{{ else }}{{ .AutoDescription }}{{ end }} |
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
|
||||||
## ApplicationSet
|
## ApplicationSet
|
||||||
|
|
||||||
| Key | Type | Default | Description |
|
| Key | Type | Default | Description |
|
||||||
|
@ -750,8 +796,10 @@ Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/
|
||||||
[BackendConfigSpec]: https://cloud.google.com/kubernetes-engine/docs/concepts/backendconfig#backendconfigspec_v1beta1_cloudgooglecom
|
[BackendConfigSpec]: https://cloud.google.com/kubernetes-engine/docs/concepts/backendconfig#backendconfigspec_v1beta1_cloudgooglecom
|
||||||
[CSS styles]: https://argo-cd.readthedocs.io/en/stable/operator-manual/custom-styles/
|
[CSS styles]: https://argo-cd.readthedocs.io/en/stable/operator-manual/custom-styles/
|
||||||
[changelog]: https://artifacthub.io/packages/helm/argo/argo-cd?modal=changelog
|
[changelog]: https://artifacthub.io/packages/helm/argo/argo-cd?modal=changelog
|
||||||
|
[Chart Hooks]: https://helm.sh/docs/topics/charts_hooks/
|
||||||
[DNS configuration]: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/
|
[DNS configuration]: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/
|
||||||
[external cluster credentials]: https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup/#clusters
|
[external cluster credentials]: https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup/#clusters
|
||||||
|
[FAQ]: https://argo-cd.readthedocs.io/en/stable/faq/
|
||||||
[FrontendConfigSpec]: https://cloud.google.com/kubernetes-engine/docs/how-to/ingress-features#configuring_ingress_features_through_frontendconfig_parameters
|
[FrontendConfigSpec]: https://cloud.google.com/kubernetes-engine/docs/how-to/ingress-features#configuring_ingress_features_through_frontendconfig_parameters
|
||||||
[declarative setup]: https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup
|
[declarative setup]: https://argo-cd.readthedocs.io/en/stable/operator-manual/declarative-setup
|
||||||
[gRPC-ingress]: https://argo-cd.readthedocs.io/en/stable/operator-manual/ingress/
|
[gRPC-ingress]: https://argo-cd.readthedocs.io/en/stable/operator-manual/ingress/
|
||||||
|
|
|
@ -86,6 +86,25 @@ Create the name of the redis service account to use
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Create Redis secret-init name
|
||||||
|
*/}}
|
||||||
|
{{- define "argo-cd.redisSecretInit.fullname" -}}
|
||||||
|
{{- printf "%s-%s" (include "argo-cd.fullname" .) .Values.redisSecretInit.name | trunc 63 | trimSuffix "-" -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Create the name of the Redis secret-init service account to use
|
||||||
|
*/}}
|
||||||
|
{{- define "argo-cd.redisSecretInit.serviceAccountName" -}}
|
||||||
|
{{- if .Values.redisSecretInit.serviceAccount.create -}}
|
||||||
|
{{ default (include "argo-cd.redisSecretInit.fullname" .) .Values.redis.serviceAccount.name }}
|
||||||
|
{{- else -}}
|
||||||
|
{{ default "default" .Values.redisSecretInit.serviceAccount.name }}
|
||||||
|
{{- end -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
{{/*
|
{{/*
|
||||||
Create argocd server name and version as used by the chart label.
|
Create argocd server name and version as used by the chart label.
|
||||||
*/}}
|
*/}}
|
||||||
|
|
|
@ -199,15 +199,19 @@ spec:
|
||||||
- name: REDIS_USERNAME
|
- name: REDIS_USERNAME
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
|
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
|
||||||
key: redis-username
|
key: redis-username
|
||||||
optional: true
|
optional: true
|
||||||
- name: REDIS_PASSWORD
|
- name: REDIS_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
|
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
|
||||||
|
{{- if .Values.externalRedis.host }}
|
||||||
key: redis-password
|
key: redis-password
|
||||||
optional: true
|
optional: true
|
||||||
|
{{- else }}
|
||||||
|
key: auth
|
||||||
|
{{- end }}
|
||||||
- name: ARGOCD_DEFAULT_CACHE_EXPIRATION
|
- name: ARGOCD_DEFAULT_CACHE_EXPIRATION
|
||||||
valueFrom:
|
valueFrom:
|
||||||
configMapKeyRef:
|
configMapKeyRef:
|
||||||
|
|
|
@ -198,15 +198,19 @@ spec:
|
||||||
- name: REDIS_USERNAME
|
- name: REDIS_USERNAME
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
|
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
|
||||||
key: redis-username
|
key: redis-username
|
||||||
optional: true
|
optional: true
|
||||||
- name: REDIS_PASSWORD
|
- name: REDIS_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
|
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
|
||||||
|
{{- if .Values.externalRedis.host }}
|
||||||
key: redis-password
|
key: redis-password
|
||||||
optional: true
|
optional: true
|
||||||
|
{{- else }}
|
||||||
|
key: auth
|
||||||
|
{{- end }}
|
||||||
- name: ARGOCD_DEFAULT_CACHE_EXPIRATION
|
- name: ARGOCD_DEFAULT_CACHE_EXPIRATION
|
||||||
valueFrom:
|
valueFrom:
|
||||||
configMapKeyRef:
|
configMapKeyRef:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Secret
|
kind: Secret
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ include "argo-cd.redis.fullname" . }}
|
name: argocd-redis
|
||||||
namespace: {{ include "argo-cd.namespace" . }}
|
namespace: {{ include "argo-cd.namespace" . }}
|
||||||
labels:
|
labels:
|
||||||
{{- include "argo-cd.labels" (dict "context" $) | nindent 4 }}
|
{{- include "argo-cd.labels" (dict "context" $) | nindent 4 }}
|
||||||
|
|
|
@ -175,15 +175,19 @@ spec:
|
||||||
- name: REDIS_USERNAME
|
- name: REDIS_USERNAME
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
|
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
|
||||||
key: redis-username
|
key: redis-username
|
||||||
optional: true
|
optional: true
|
||||||
- name: REDIS_PASSWORD
|
- name: REDIS_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
|
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
|
||||||
|
{{- if .Values.externalRedis.host }}
|
||||||
key: redis-password
|
key: redis-password
|
||||||
optional: true
|
optional: true
|
||||||
|
{{- else }}
|
||||||
|
key: auth
|
||||||
|
{{- end }}
|
||||||
- name: ARGOCD_DEFAULT_CACHE_EXPIRATION
|
- name: ARGOCD_DEFAULT_CACHE_EXPIRATION
|
||||||
valueFrom:
|
valueFrom:
|
||||||
configMapKeyRef:
|
configMapKeyRef:
|
||||||
|
|
|
@ -243,15 +243,19 @@ spec:
|
||||||
- name: REDIS_USERNAME
|
- name: REDIS_USERNAME
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
|
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
|
||||||
key: redis-username
|
key: redis-username
|
||||||
optional: true
|
optional: true
|
||||||
- name: REDIS_PASSWORD
|
- name: REDIS_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
|
name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
|
||||||
|
{{- if .Values.externalRedis.host }}
|
||||||
key: redis-password
|
key: redis-password
|
||||||
optional: true
|
optional: true
|
||||||
|
{{- else }}
|
||||||
|
key: auth
|
||||||
|
{{- end }}
|
||||||
- name: ARGOCD_DEFAULT_CACHE_EXPIRATION
|
- name: ARGOCD_DEFAULT_CACHE_EXPIRATION
|
||||||
valueFrom:
|
valueFrom:
|
||||||
configMapKeyRef:
|
configMapKeyRef:
|
||||||
|
|
54
charts/argo-cd/templates/redis-secret-init/job.yaml
Normal file
54
charts/argo-cd/templates/redis-secret-init/job.yaml
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
{{- if not .Values.externalRedis.host }}
|
||||||
|
apiVersion: batch/v1
|
||||||
|
kind: Job
|
||||||
|
metadata:
|
||||||
|
name: {{ include "argo-cd.redisSecretInit.fullname" . }}
|
||||||
|
namespace: {{ .Release.Namespace | quote }}
|
||||||
|
annotations:
|
||||||
|
"helm.sh/hook": pre-install,pre-upgrade
|
||||||
|
"helm.sh/hook-delete-policy": before-hook-creation
|
||||||
|
{{- range $key, $value := .Values.redisSecretInit.jobAnnotations }}
|
||||||
|
{{ $key }}: {{ $value | quote }}
|
||||||
|
{{- end }}
|
||||||
|
labels:
|
||||||
|
{{- include "argo-cd.labels" (dict "context" . "component" .Values.redisSecretInit.name "name" .Values.redisSecretInit.name) | nindent 4 }}
|
||||||
|
spec:
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
{{- include "argo-cd.labels" (dict "context" . "component" .Values.redisSecretInit.name "name" .Values.redisSecretInit.name) | nindent 8 }}
|
||||||
|
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.redisSecretInit.podLabels) }}
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- with (mergeOverwrite (deepCopy .Values.global.podAnnotations) .Values.redisSecretInit.podAnnotations) }}
|
||||||
|
annotations:
|
||||||
|
{{- range $key, $value := . }}
|
||||||
|
{{ $key }}: {{ $value | quote }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
spec:
|
||||||
|
{{- with .Values.global.imagePullSecrets }}
|
||||||
|
imagePullSecrets:
|
||||||
|
{{ toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
containers:
|
||||||
|
- command:
|
||||||
|
- argocd
|
||||||
|
- admin
|
||||||
|
- redis-initial-password
|
||||||
|
image: {{ default .Values.global.image.repository .Values.redisSecretInit.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.redisSecretInit.image.tag }}
|
||||||
|
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.redisSecretInit.image.imagePullPolicy }}
|
||||||
|
name: secret-init
|
||||||
|
resources:
|
||||||
|
{{- toYaml .Values.redisSecretInit.resources | nindent 10 }}
|
||||||
|
{{- with .Values.redisSecretInit.containerSecurityContext }}
|
||||||
|
securityContext:
|
||||||
|
{{- toYaml . | nindent 10 }}
|
||||||
|
{{- end }}
|
||||||
|
{{- with .Values.redisSecretInit.securityContext }}
|
||||||
|
securityContext:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
|
restartPolicy: OnFailure
|
||||||
|
serviceAccountName: {{ include "argo-cd.redisSecretInit.serviceAccountName" . }}
|
||||||
|
{{- end }}
|
27
charts/argo-cd/templates/redis-secret-init/role.yaml
Normal file
27
charts/argo-cd/templates/redis-secret-init/role.yaml
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
{{- if not .Values.externalRedis.host }}
|
||||||
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
kind: Role
|
||||||
|
metadata:
|
||||||
|
annotations:
|
||||||
|
"helm.sh/hook": pre-install,pre-upgrade
|
||||||
|
"helm.sh/hook-delete-policy": before-hook-creation
|
||||||
|
labels:
|
||||||
|
{{- include "argo-cd.labels" (dict "context" . "component" .Values.redisSecretInit.name "name" .Values.redisSecretInit.name) | nindent 4 }}
|
||||||
|
name: {{ include "argo-cd.redisSecretInit.fullname" . }}
|
||||||
|
namespace: {{ .Release.Namespace | quote }}
|
||||||
|
rules:
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
- secrets
|
||||||
|
resourceNames:
|
||||||
|
- argocd-redis
|
||||||
|
verbs:
|
||||||
|
- get
|
||||||
|
- apiGroups:
|
||||||
|
- ""
|
||||||
|
resources:
|
||||||
|
- secrets
|
||||||
|
verbs:
|
||||||
|
- create
|
||||||
|
{{- end }}
|
19
charts/argo-cd/templates/redis-secret-init/rolebinding.yaml
Normal file
19
charts/argo-cd/templates/redis-secret-init/rolebinding.yaml
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
{{- if not .Values.externalRedis.host }}
|
||||||
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
kind: RoleBinding
|
||||||
|
metadata:
|
||||||
|
annotations:
|
||||||
|
"helm.sh/hook": pre-install,pre-upgrade
|
||||||
|
"helm.sh/hook-delete-policy": before-hook-creation
|
||||||
|
labels:
|
||||||
|
{{- include "argo-cd.labels" (dict "context" . "component" .Values.redisSecretInit.name "name" .Values.redisSecretInit.name) | nindent 4 }}
|
||||||
|
name: {{ include "argo-cd.redisSecretInit.fullname" . }}
|
||||||
|
namespace: {{ .Release.Namespace | quote }}
|
||||||
|
roleRef:
|
||||||
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
kind: Role
|
||||||
|
name: {{ include "argo-cd.redisSecretInit.fullname" . }}
|
||||||
|
subjects:
|
||||||
|
- kind: ServiceAccount
|
||||||
|
name: {{ include "argo-cd.redisSecretInit.serviceAccountName" . }}
|
||||||
|
{{- end }}
|
|
@ -0,0 +1,16 @@
|
||||||
|
{{- if not .Values.externalRedis.host }}
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ServiceAccount
|
||||||
|
automountServiceAccountToken: {{ .Values.redisSecretInit.serviceAccount.automountServiceAccountToken }}
|
||||||
|
metadata:
|
||||||
|
name: {{ include "argo-cd.redisSecretInit.serviceAccountName" . }}
|
||||||
|
namespace: {{ .Release.Namespace | quote }}
|
||||||
|
annotations:
|
||||||
|
"helm.sh/hook": pre-install,pre-upgrade
|
||||||
|
"helm.sh/hook-delete-policy": before-hook-creation
|
||||||
|
{{- range $key, $value := .Values.redisSecretInit.serviceAccount.annotations }}
|
||||||
|
{{ $key }}: {{ $value | quote }}
|
||||||
|
{{- end }}
|
||||||
|
labels:
|
||||||
|
{{- include "argo-cd.labels" (dict "context" . "component" .Values.redisSecretInit.name "name" .Values.redisSecretInit.name) | nindent 4 }}
|
||||||
|
{{- end }}
|
|
@ -65,8 +65,14 @@ spec:
|
||||||
- ""
|
- ""
|
||||||
- --appendonly
|
- --appendonly
|
||||||
- "no"
|
- "no"
|
||||||
{{- with (concat .Values.global.env .Values.redis.env) }}
|
- --requirepass $(REDIS_PASSWORD)
|
||||||
env:
|
env:
|
||||||
|
- name: REDIS_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: argocd-redis
|
||||||
|
key: auth
|
||||||
|
{{- with (concat .Values.global.env .Values.redis.env) }}
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- with .Values.redis.envFrom }}
|
{{- with .Values.redis.envFrom }}
|
||||||
|
|
|
@ -11,6 +11,7 @@ data:
|
||||||
redis_liveness.sh: |
|
redis_liveness.sh: |
|
||||||
response=$(
|
response=$(
|
||||||
redis-cli \
|
redis-cli \
|
||||||
|
-a "${REDIS_PASSWORD}" --no-auth-warning \
|
||||||
-h localhost \
|
-h localhost \
|
||||||
-p {{ .Values.redis.containerPorts.redis }} \
|
-p {{ .Values.redis.containerPorts.redis }} \
|
||||||
ping
|
ping
|
||||||
|
@ -23,6 +24,7 @@ data:
|
||||||
redis_readiness.sh: |
|
redis_readiness.sh: |
|
||||||
response=$(
|
response=$(
|
||||||
redis-cli \
|
redis-cli \
|
||||||
|
-a "${REDIS_PASSWORD}" --no-auth-warning \
|
||||||
-h localhost \
|
-h localhost \
|
||||||
-p {{ .Values.redis.containerPorts.redis }} \
|
-p {{ .Values.redis.containerPorts.redis }} \
|
||||||
ping
|
ping
|
||||||
|
|
|
@ -1547,6 +1547,12 @@ redis-ha:
|
||||||
containerSecurityContext:
|
containerSecurityContext:
|
||||||
readOnlyRootFilesystem: true
|
readOnlyRootFilesystem: true
|
||||||
|
|
||||||
|
# -- Configures redis-ha with AUTH
|
||||||
|
auth: true
|
||||||
|
# -- Existing Secret to use for redis-ha authentication.
|
||||||
|
# By default the redis-secret-init Job is generating this Secret.
|
||||||
|
existingSecret: argocd-redis
|
||||||
|
|
||||||
# -- Whether the Redis server pods should be forced to run on separate nodes.
|
# -- Whether the Redis server pods should be forced to run on separate nodes.
|
||||||
hardAntiAffinity: true
|
hardAntiAffinity: true
|
||||||
|
|
||||||
|
@ -1594,6 +1600,69 @@ externalRedis:
|
||||||
# -- External Redis Secret annotations
|
# -- External Redis Secret annotations
|
||||||
secretAnnotations: {}
|
secretAnnotations: {}
|
||||||
|
|
||||||
|
redisSecretInit:
|
||||||
|
# -- Redis secret-init name
|
||||||
|
name: redis-secret-init
|
||||||
|
|
||||||
|
image:
|
||||||
|
# -- Repository to use for the Redis secret-init Job
|
||||||
|
# @default -- `""` (defaults to global.image.repository)
|
||||||
|
repository: "" # defaults to global.image.repository
|
||||||
|
# -- Tag to use for the Redis secret-init Job
|
||||||
|
# @default -- `""` (defaults to global.image.tag)
|
||||||
|
tag: "" # defaults to global.image.tag
|
||||||
|
# -- Image pull policy for the Redis secret-init Job
|
||||||
|
# @default -- `""` (defaults to global.image.imagePullPolicy)
|
||||||
|
imagePullPolicy: "" # IfNotPresent
|
||||||
|
|
||||||
|
# -- Secrets with credentials to pull images from a private registry
|
||||||
|
# @default -- `[]` (defaults to global.imagePullSecrets)
|
||||||
|
imagePullSecrets: []
|
||||||
|
|
||||||
|
# -- Annotations to be added to the Redis secret-init Job
|
||||||
|
jobAnnotations: {}
|
||||||
|
|
||||||
|
# -- Annotations to be added to the Redis secret-init Job
|
||||||
|
podAnnotations: {}
|
||||||
|
|
||||||
|
# -- Labels to be added to the Redis secret-init Job
|
||||||
|
podLabels: {}
|
||||||
|
|
||||||
|
# -- Resource limits and requests for Redis secret-init Job
|
||||||
|
resources: {}
|
||||||
|
# limits:
|
||||||
|
# cpu: 200m
|
||||||
|
# memory: 128Mi
|
||||||
|
# requests:
|
||||||
|
# cpu: 100m
|
||||||
|
# memory: 64Mi
|
||||||
|
|
||||||
|
# -- Application controller container-level security context
|
||||||
|
# @default -- See [values.yaml]
|
||||||
|
containerSecurityContext:
|
||||||
|
allowPrivilegeEscalation: false
|
||||||
|
capabilities:
|
||||||
|
drop:
|
||||||
|
- ALL
|
||||||
|
readOnlyRootFilesystem: true
|
||||||
|
runAsNonRoot: true
|
||||||
|
seccompProfile:
|
||||||
|
type: RuntimeDefault
|
||||||
|
|
||||||
|
# -- Redis secret-init Job pod-level security context
|
||||||
|
securityContext: {}
|
||||||
|
|
||||||
|
serviceAccount:
|
||||||
|
# -- Create a service account for the redis pod
|
||||||
|
create: true
|
||||||
|
# -- Service account name for redis pod
|
||||||
|
name: ""
|
||||||
|
# -- Annotations applied to created service account
|
||||||
|
annotations: {}
|
||||||
|
# -- Automount API credentials for the Service Account
|
||||||
|
automountServiceAccountToken: true
|
||||||
|
|
||||||
|
|
||||||
## Server
|
## Server
|
||||||
server:
|
server:
|
||||||
# -- Argo CD server name
|
# -- Argo CD server name
|
||||||
|
|
Loading…
Reference in a new issue