fix(argo-cd): Sync ArgoCD helm chart with kustomize (#659)

* copy CRD resource files from https://github.com/argoproj/argo-cd/tree/v2.0.0/manifests/crds

Signed-off-by: Marcel Hoyer <mhoyer@pixelplastic.de>

* update `global.image` values in `values.yaml` to quay.io

Signed-off-by: Marcel Hoyer <mhoyer@pixelplastic.de>

* update redis image to 6.2.1

Signed-off-by: Marcel Hoyer <mhoyer@pixelplastic.de>

* add optional volume mount to secret `argocd-repo-server-tls` according to 7a68880e2e

Signed-off-by: Marcel Hoyer <mhoyer@pixelplastic.de>

* increase patch version of chart to 3.0.1

Signed-off-by: Marcel Hoyer <mhoyer@pixelplastic.de>

* add `redis.extraArgs` to enable customization of `redis-server` arguments

Signed-off-by: Marcel Hoyer <mhoyer@pixelplastic.de>

* add some notes to the `README` about syncing changes from original `manifests/install.yaml`

Signed-off-by: Marcel Hoyer <mhoyer@pixelplastic.de>

* fix example for `extraArgs` in `values.yaml` of argo-cd chart

Signed-off-by: Marcel Hoyer <mhoyer@pixelplastic.de>

* Bump chart version to 3.1.2

Signed-off-by: Marcel Hoyer <mhoyer@pixelplastic.de>

* Bump argo-cd version to 3.2.2

Signed-off-by: Marcel Hoyer <mhoyer@pixelplastic.de>

Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>

Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>
This commit is contained in:
Marcel Hoyer 2021-04-24 12:50:25 +02:00 committed by GitHub
parent 71cbdbb811
commit 3ba4cdb1ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 386 additions and 252 deletions

View file

@ -92,8 +92,10 @@ spec:
timeoutSeconds: {{ .Values.controller.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.controller.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.controller.readinessProbe.failureThreshold }}
{{- if .Values.controller.volumeMounts }}
volumeMounts:
- mountPath: /app/config/controller/tls
name: argocd-repo-server-tls
{{- if .Values.controller.volumeMounts }}
{{- toYaml .Values.controller.volumeMounts | nindent 10}}
{{- end }}
resources:
@ -115,8 +117,19 @@ spec:
hostAliases:
{{ toYaml . | indent 6 }}
{{- end }}
{{- if .Values.controller.volumes }}
volumes:
- name: argocd-repo-server-tls
secret:
items:
- key: tls.crt
path: tls.crt
- key: tls.key
path: tls.key
- key: ca.crt
path: ca.crt
optional: true
secretName: argocd-repo-server-tls
{{- if .Values.controller.volumes }}
{{- toYaml .Values.controller.volumes | nindent 8 }}
{{- end }}
{{- if .Values.controller.priorityClassName }}

View file

@ -81,6 +81,8 @@ spec:
- mountPath: /app/config/tls
name: tls-certs
{{- end }}
- mountPath: /app/config/reposerver/tls
name: argocd-repo-server-tls
- mountPath: /tmp
name: tmp-dir
ports:
@ -143,6 +145,17 @@ spec:
name: argocd-tls-certs-cm
name: tls-certs
{{- end }}
- name: argocd-repo-server-tls
secret:
items:
- key: tls.crt
path: tls.crt
- key: tls.key
path: tls.key
- key: ca.crt
path: ca.crt
optional: true
secretName: argocd-repo-server-tls
- emptyDir: {}
name: tmp-dir
{{- if .Values.repoServer.initContainers }}

View file

@ -80,6 +80,8 @@ spec:
- mountPath: /app/config/tls
name: tls-certs
{{- end }}
- mountPath: /app/config/server/tls
name: argocd-repo-server-tls
ports:
- name: {{ .Values.server.name }}
containerPort: {{ .Values.server.containerPort }}
@ -149,6 +151,17 @@ spec:
name: argocd-tls-certs-cm
name: tls-certs
{{- end }}
- name: argocd-repo-server-tls
secret:
items:
- key: tls.crt
path: tls.crt
- key: tls.key
path: tls.key
- key: ca.crt
path: ca.crt
optional: true
secretName: argocd-repo-server-tls
{{- if .Values.server.priorityClassName }}
priorityClassName: {{ .Values.server.priorityClassName }}
{{- end }}

View file

@ -41,11 +41,14 @@ spec:
- ""
- --appendonly
- "no"
{{- with .Values.redis.extraArgs }}
{{- . | toYaml | nindent 8 }}
{{- end }}
image: {{ .Values.redis.image.repository }}:{{ .Values.redis.image.tag }}
imagePullPolicy: {{ .Values.redis.image.imagePullPolicy}}
{{- if .Values.redis.containerSecurityContext }}
securityContext: {{- toYaml .Values.redis.containerSecurityContext | nindent 10 }}
{{- end }}
{{- end }}
{{- if .Values.redis.env }}
env:
{{- toYaml .Values.redis.env | nindent 8 }}