Mount emptDir for /tmp and add extraVolumes support (#866)

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
This commit is contained in:
Marco Kilchhofer 2021-08-13 18:37:06 +02:00 committed by GitHub
parent 607caac246
commit 1dad68d4f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 4 deletions

View file

@ -2,7 +2,7 @@ apiVersion: v2
name: argocd-applicationset name: argocd-applicationset
description: A Helm chart for installing ArgoCD ApplicationSet description: A Helm chart for installing ArgoCD ApplicationSet
type: application type: application
version: 1.0.0 version: 1.1.0
appVersion: "v0.1.0" appVersion: "v0.1.0"
home: https://github.com/argoproj/argo-helm home: https://github.com/argoproj/argo-helm
icon: https://argocd-applicationset.readthedocs.io/en/stable/assets/logo.png icon: https://argocd-applicationset.readthedocs.io/en/stable/assets/logo.png
@ -14,6 +14,5 @@ maintainers:
- name: maruina - name: maruina
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- "[Removed]: CRD installation via templates folder. CRDs are now only handled via the '/crds' folder in the same way like the ArgoCD chart." - "[Added]: /tmp is an emptyDir now (enables users to use readOnlyRootFilesystem)"
- "[Removed]: Exclude '/ci' folder from being packaged into the final chart archive." - "[Added]: Ability to add extraVolumes and extraVolumeMounts"
- "[Changed]: Fix icon url"

View file

@ -65,6 +65,8 @@ kubectl apply -k https://github.com/argoproj-labs/applicationset.git/manifests/c
| args.policy | string | `sync` | How application is synced between the generator and the cluster | | args.policy | string | `sync` | How application is synced between the generator and the cluster |
| args.debug | bool | `false` | Print debug logs | | args.debug | bool | `false` | Print debug logs |
| args.dryRun | bool | `false` | Enable dry run mode | | args.dryRun | bool | `false` | Enable dry run mode |
| extraVolumeMounts | list | `[]` | List of extra mounts to add (normally used with extraVolumes) |
| extraVolumes | list | `[]` | List of extra volumes to add |
| fullnameOverride | string | `""` | Override the default fully qualified app name | | fullnameOverride | string | `""` | Override the default fully qualified app name |
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| image.repository | string | `"quay.io/argocdapplicationset/argocd-applicationset"` | If defined, a repository applied to the ApplicationSet deployment. | | image.repository | string | `"quay.io/argocdapplicationset/argocd-applicationset"` | If defined, a repository applied to the ApplicationSet deployment. |

View file

@ -50,6 +50,8 @@ spec:
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
volumeMounts: volumeMounts:
- mountPath: /tmp
name: tmp-dir
{{- if .Values.mountSSHKnownHostsVolume }} {{- if .Values.mountSSHKnownHostsVolume }}
- mountPath: /app/config/ssh - mountPath: /app/config/ssh
name: ssh-known-hosts name: ssh-known-hosts
@ -66,7 +68,12 @@ spec:
- mountPath: /app/config/gpg/keys - mountPath: /app/config/gpg/keys
name: gpg-keyring name: gpg-keyring
{{- end }} {{- end }}
{{- with .Values.extraVolumeMounts }}
{{- toYaml . | nindent 12 }}
{{- end }}
volumes: volumes:
- emptyDir: {}
name: tmp-dir
{{- if .Values.mountSSHKnownHostsVolume }} {{- if .Values.mountSSHKnownHostsVolume }}
- configMap: - configMap:
name: argocd-ssh-known-hosts-cm name: argocd-ssh-known-hosts-cm
@ -86,6 +93,9 @@ spec:
- emptyDir: {} - emptyDir: {}
name: gpg-keyring name: gpg-keyring
{{- end }} {{- end }}
{{- with .Values.extraVolumes }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.nodeSelector }} {{- with .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}

View file

@ -75,3 +75,12 @@ mountSSHKnownHostsVolume: true
mountTLSCertsVolume: true mountTLSCertsVolume: true
mountGPGKeysVolume: false mountGPGKeysVolume: false
mountGPGKeyringVolume: true mountGPGKeyringVolume: true
# -- List of extra mounts to add (normally used with extraVolumes)
extraVolumeMounts: []
# - mountPath: /tmp/foobar
# name: foobar
# -- List of extra volumes to add
extraVolumes: []
# - name: foobar
# emptyDir: {}