DevFW-CICD/argocd-helm
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(argo-cd): properly generate volumes and volumeMounts for application controller (#724)

Browse source 
* fix: volumes and volumeMounts configurations are properly generated for the application controller (#723)

Signed-off-by: marcozov <marco.zoveralli@gmail.com>

* fix: Chart.yaml bump (#723)

Signed-off-by: marcozov <marco.zoveralli@gmail.com>

* fix: use consistent indentation

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Marco Zoveralli 2021-05-17 07:40:38 +02:00 committed by GitHub
parent 17ad65e635
commit 7c94b7af7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo-cd/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v2
appVersion: 2.0.1 appVersion: 2.0.1
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes. description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd name: argo-cd
version: 3.3.1 version: 3.3.2
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords: keywords:

12
charts/argo-cd/templates/argocd-application-controller/deployment.yaml
View file

@ -95,9 +95,9 @@ spec:
volumeMounts: volumeMounts:
- mountPath: /app/config/controller/tls - mountPath: /app/config/controller/tls
name: argocd-repo-server-tls name: argocd-repo-server-tls
{{- if .Values.controller.volumeMounts }} {{- with .Values.controller.volumeMounts }}
{{- toYaml .Values.controller.volumeMounts | nindent 10}} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
resources: resources:
{{- toYaml .Values.controller.resources | nindent 10 }} {{- toYaml .Values.controller.resources | nindent 10 }}
{{- if .Values.controller.nodeSelector }} {{- if .Values.controller.nodeSelector }}
@ -129,9 +129,9 @@ spec:
path: ca.crt path: ca.crt
optional: true optional: true
secretName: argocd-repo-server-tls secretName: argocd-repo-server-tls
{{- if .Values.controller.volumes }} {{- with .Values.controller.volumes }}
{{- toYaml .Values.controller.volumes | nindent 8 }} {{- toYaml . | nindent 6 }}
{{- end }} {{- end }}
{{- if .Values.controller.priorityClassName }} {{- if .Values.controller.priorityClassName }}
priorityClassName: {{ .Values.controller.priorityClassName }} priorityClassName: {{ .Values.controller.priorityClassName }}
{{- end }} {{- end }}