diff --git a/charts/chatwoot/Chart.yaml b/charts/chatwoot/Chart.yaml index 211b092..36fa473 100644 --- a/charts/chatwoot/Chart.yaml +++ b/charts/chatwoot/Chart.yaml @@ -34,7 +34,7 @@ sources: - http://www.chatwoot.com # This is the chart version. -version: 2.0.17 +version: 2.1.0 # This is the application version. diff --git a/charts/chatwoot/templates/migrations-job.yaml b/charts/chatwoot/templates/migrations-job.yaml index 0c445e0..3403a23 100644 --- a/charts/chatwoot/templates/migrations-job.yaml +++ b/charts/chatwoot/templates/migrations-job.yaml @@ -80,6 +80,9 @@ spec: volumeMounts: - name: cache mountPath: /app/tmp + {{- with .Values.hooks.migrate.extraVolumeMounts }} + {{- toYaml . | nindent 12 }} + {{- end }} serviceAccountName: {{ include "chatwoot.serviceAccountName" . }} {{- if .Values.securityContext }} securityContext: {{ .Values.securityContext | toYaml | nindent 8 }} @@ -87,3 +90,6 @@ spec: volumes: - name: cache emptyDir: {} + {{- with .Values.hooks.migrate.extraVolumes }} + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/chatwoot/templates/web-deployment.yaml b/charts/chatwoot/templates/web-deployment.yaml index 9e2fbda..1090c6b 100644 --- a/charts/chatwoot/templates/web-deployment.yaml +++ b/charts/chatwoot/templates/web-deployment.yaml @@ -105,6 +105,9 @@ spec: volumeMounts: - name: cache mountPath: /app/tmp + {{- with .Values.web.extraVolumeMounts }} + {{- toYaml . | nindent 12 }} + {{- end }} serviceAccountName: {{ include "chatwoot.serviceAccountName" . }} {{- if .Values.securityContext }} securityContext: {{ .Values.securityContext | toYaml | nindent 8 }} @@ -112,4 +115,7 @@ spec: volumes: - name: cache emptyDir: {} + {{- with .Values.web.extraVolumes }} + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/chatwoot/templates/worker-deployment.yaml b/charts/chatwoot/templates/worker-deployment.yaml index 1e55b19..de13859 100644 --- a/charts/chatwoot/templates/worker-deployment.yaml +++ b/charts/chatwoot/templates/worker-deployment.yaml @@ -79,6 +79,9 @@ spec: volumeMounts: - name: cache mountPath: /app/tmp + {{- with .Values.worker.extraVolumeMounts }} + {{- toYaml . | nindent 12 }} + {{- end }} serviceAccountName: {{ include "chatwoot.serviceAccountName" . }} {{- if .Values.securityContext }} securityContext: {{ .Values.securityContext | toYaml | nindent 8 }} @@ -86,4 +89,7 @@ spec: volumes: - name: cache emptyDir: {} + {{- with .Values.worker.extraVolumes }} + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/chatwoot/values.test-volumes.yaml b/charts/chatwoot/values.test-volumes.yaml new file mode 100644 index 0000000..41c68e7 --- /dev/null +++ b/charts/chatwoot/values.test-volumes.yaml @@ -0,0 +1,30 @@ +web: + extraVolumes: + - name: test-web-config + configMap: + name: test-configmap + extraVolumeMounts: + - name: test-web-config + mountPath: /etc/test-web-config + readOnly: true + +worker: + extraVolumes: + - name: test-worker-config + configMap: + name: test-configmap + extraVolumeMounts: + - name: test-worker-config + mountPath: /etc/test-worker-config + readOnly: true + +hooks: + migrate: + extraVolumes: + - name: test-migrate-config + configMap: + name: test-configmap + extraVolumeMounts: + - name: test-migrate-config + mountPath: /etc/test-migrate-config + readOnly: true diff --git a/charts/chatwoot/values.yaml b/charts/chatwoot/values.yaml index 943dc44..e8fbe84 100644 --- a/charts/chatwoot/values.yaml +++ b/charts/chatwoot/values.yaml @@ -33,6 +33,16 @@ web: # requests: # cpu: 250m # memory: 256Mi + # extraVolumes: + # - name: my-config + # configMap: + # name: my-configmap + extraVolumes: [] + # extraVolumeMounts: + # - name: my-config + # mountPath: /etc/my-config + # readOnly: true + extraVolumeMounts: [] worker: hpa: # set this to true to enable horizontal pod autoscaling @@ -54,6 +64,16 @@ worker: # requests: # cpu: 250m # memory: 256Mi + # extraVolumes: + # - name: my-config + # configMap: + # name: my-configmap + extraVolumes: [] + # extraVolumeMounts: + # - name: my-config + # mountPath: /etc/my-config + # readOnly: true + extraVolumeMounts: [] services: name: chatwoot @@ -186,6 +206,16 @@ hooks: # Defaults to performing the DB migration job after the install/upgrade. # Can be overridden to "pre-install,pre-upgrade" with caution to perform migrations that are sometimes required for the deployment to become healthy hookAnnotation: "post-install,post-upgrade" + # extraVolumes: + # - name: my-config + # configMap: + # name: my-configmap + extraVolumes: [] + # extraVolumeMounts: + # - name: my-config + # mountPath: /etc/my-config + # readOnly: true + extraVolumeMounts: [] # ENVIRONMENT VARIABLES