Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(argo-cd): Fix conditional generation of ssh and tls configmaps #3157

Closed
wants to merge 1 commit into from
Closed

fix(argo-cd): Fix conditional generation of ssh and tls configmaps #3157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/argo-cd/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: v2.14.1
kubeVersion: ">=1.25.0-0"
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 7.8.0
version: 7.8.1
home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources:
Expand All @@ -26,5 +26,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: changed
description: Bump argo-cd to v2.14.1
- kind: fixed
description: Make ssh and tls volumes conditional to the configmap creation
8 changes: 8 additions & 0 deletions charts/argo-cd/templates/argocd-applicationset/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,14 @@ spec:
{{- with .Values.applicationSet.extraVolumeMounts }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if .Values.configs.ssh.create }}
- mountPath: /app/config/ssh
name: ssh-known-hosts
{{- end }}
{{- if .Values.configs.tls.create }}
- mountPath: /app/config/tls
name: tls-certs
{{- end }}
- mountPath: /app/config/gpg/source
name: gpg-keys
- mountPath: /app/config/gpg/keys
Expand Down Expand Up @@ -313,12 +317,16 @@ spec:
{{- with .Values.applicationSet.extraVolumes }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.configs.ssh.create }}
- name: ssh-known-hosts
configMap:
name: argocd-ssh-known-hosts-cm
{{- end }}
{{- if .Values.configs.tls.create }}
- name: tls-certs
configMap:
name: argocd-tls-certs-cm
{{- end }}
- name: gpg-keys
configMap:
name: argocd-gpg-keys-cm
Expand Down
8 changes: 8 additions & 0 deletions charts/argo-cd/templates/argocd-commit-server/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,14 @@ spec:
{{- with .Values.commitServer.extraVolumeMounts }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.configs.ssh.create }}
- name: ssh-known-hosts
mountPath: /app/config/ssh
{{- end }}
{{- if .Values.configs.tls.create }}
- name: tls-certs
mountPath: /app/config/tls
{{- end }}
- name: gpg-keys
mountPath: /app/config/gpg/source
- name: gpg-keyring
Expand Down Expand Up @@ -178,12 +182,16 @@ spec:
{{- with .Values.commitServer.extraVolumes }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.configs.ssh.create }}
- name: ssh-known-hosts
configMap:
name: argocd-ssh-known-hosts-cm
{{- end }}
{{- if .Values.configs.tls.create }}
- name: tls-certs
configMap:
name: argocd-tls-certs-cm
{{- end }}
- name: gpg-keys
configMap:
name: argocd-gpg-keys-cm
Expand Down
8 changes: 8 additions & 0 deletions charts/argo-cd/templates/argocd-repo-server/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,14 @@ spec:
{{- if .Values.repoServer.volumeMounts }}
{{- toYaml .Values.repoServer.volumeMounts | nindent 8 }}
{{- end }}
{{- if .Values.configs.ssh.create }}
- mountPath: /app/config/ssh
name: ssh-known-hosts
{{- end }}
{{- if .Values.configs.tls.create }}
- mountPath: /app/config/tls
name: tls-certs
{{- end }}
- mountPath: /app/config/gpg/source
name: gpg-keys
- mountPath: /app/config/gpg/keys
Expand Down Expand Up @@ -471,12 +475,16 @@ spec:
emptyDir: {}
{{- end }}
{{- end }}
{{- if .Values.configs.ssh.create }}
- name: ssh-known-hosts
configMap:
name: argocd-ssh-known-hosts-cm
{{- end }}
{{- if .Values.configs.tls.create }}
- name: tls-certs
configMap:
name: argocd-tls-certs-cm
{{- end }}
- name: gpg-keys
configMap:
name: argocd-gpg-keys-cm
Expand Down
8 changes: 8 additions & 0 deletions charts/argo-cd/templates/argocd-server/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,14 @@ spec:
{{- with .Values.server.volumeMounts }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.configs.ssh.create }}
- mountPath: /app/config/ssh
name: ssh-known-hosts
{{- end }}
{{- if .Values.configs.tls.create }}
- mountPath: /app/config/tls
name: tls-certs
{{- end }}
- mountPath: /app/config/server/tls
name: argocd-repo-server-tls
- mountPath: /app/config/dex/tls
Expand Down Expand Up @@ -521,12 +525,16 @@ spec:
{{- else }}
emptyDir: {}
{{- end }}
{{- if .Values.configs.ssh.create }}
- name: ssh-known-hosts
configMap:
name: argocd-ssh-known-hosts-cm
{{- end }}
{{- if .Values.configs.tls.create }}
- name: tls-certs
configMap:
name: argocd-tls-certs-cm
{{- end }}
- name: styles
configMap:
name: argocd-styles-cm
Expand Down