From 47f45eeaf389ab960e3c50b93940a8348545e08d Mon Sep 17 00:00:00 2001 From: Anatolii Lapytskyi Date: Wed, 8 Nov 2023 07:25:41 +0100 Subject: [PATCH 1/3] Add support for existing persistance claim --- charts/openproject/templates/persistentvolumeclaim.yaml | 2 ++ charts/openproject/templates/web-deployment.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/openproject/templates/persistentvolumeclaim.yaml b/charts/openproject/templates/persistentvolumeclaim.yaml index 724ede0..640f05d 100644 --- a/charts/openproject/templates/persistentvolumeclaim.yaml +++ b/charts/openproject/templates/persistentvolumeclaim.yaml @@ -1,4 +1,5 @@ {{- if .Values.persistence.enabled }} +{{- if not .Values.persistence.existingClaim }} --- apiVersion: "v1" kind: "PersistentVolumeClaim" @@ -20,3 +21,4 @@ spec: storage: {{ .Values.persistence.size | quote }} ... {{- end }} +{{- end }} diff --git a/charts/openproject/templates/web-deployment.yaml b/charts/openproject/templates/web-deployment.yaml index ddd3188..6f67c2b 100644 --- a/charts/openproject/templates/web-deployment.yaml +++ b/charts/openproject/templates/web-deployment.yaml @@ -60,7 +60,7 @@ spec: {{- if .Values.persistence.enabled }} - name: "data" persistentVolumeClaim: - claimName: {{ include "common.names.fullname" . }} + claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ include "common.names.fullname" . }}{{- end }} {{- end }} initContainers: - name: wait-for-db From d8ff9acff56d3d7ad5e8f7b654af20a89f158674 Mon Sep 17 00:00:00 2001 From: Anatolii Lapytskyi Date: Wed, 8 Nov 2023 12:28:51 +0100 Subject: [PATCH 2/3] Seeder should be able to run in the same zone as the existing volume if needed --- charts/openproject/templates/seeder-job.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/openproject/templates/seeder-job.yaml b/charts/openproject/templates/seeder-job.yaml index 11a0a86..0d31dd7 100644 --- a/charts/openproject/templates/seeder-job.yaml +++ b/charts/openproject/templates/seeder-job.yaml @@ -12,11 +12,15 @@ spec: securityContext: {{ omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 | trim }} {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{ toYaml . | nindent 8 | trim }} + {{- end }} {{- if .Values.persistence.enabled }} volumes: - name: "data" persistentVolumeClaim: - claimName: {{ include "common.names.fullname" . }} + claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ include "common.names.fullname" . }}{{- end }} {{- end }} initContainers: - name: check-db-ready From 54678b976540f7ff8d9911c2ab594bd1e07e250f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 13 Nov 2023 12:42:09 +0100 Subject: [PATCH 3/3] Bump chart to 2.5.0 --- charts/openproject/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openproject/Chart.yaml b/charts/openproject/Chart.yaml index 5084581..3e69645 100644 --- a/charts/openproject/Chart.yaml +++ b/charts/openproject/Chart.yaml @@ -6,7 +6,7 @@ home: "https://www.openproject.org/" icon: "https://www.openproject.org/assets/images/press/openproject-icon-original-color-41055eb6.png" type: "application" appVersion: "13" -version: "2.4.0" +version: "2.5.0" maintainers: - name: OpenProject url: https://github.com/opf/helm-charts