diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml index 6ec9c7e7a338..2f45438dd4f6 100644 --- a/helm-chart/Chart.yaml +++ b/helm-chart/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.14.0 +version: 0.14.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/helm-chart/templates/cvat_backend/server/deployment.yml b/helm-chart/templates/cvat_backend/server/deployment.yml index b94c6de19f88..65de009b07a6 100644 --- a/helm-chart/templates/cvat_backend/server/deployment.yml +++ b/helm-chart/templates/cvat_backend/server/deployment.yml @@ -143,7 +143,7 @@ spec: {{- if .Values.cvat.backend.defaultStorage.enabled }} - name: cvat-backend-data persistentVolumeClaim: - claimName: "{{ .Release.Name }}-backend-data" + claimName: {{ default (printf "%s-backend-data" .Release.Name) .Values.cvat.backend.defaultStorage.existingClaimName | quote}} {{- if not .Values.cvat.backend.disableDistinctCachePerService }} - name: cvat-backend-per-service-cache emptyDir: {} diff --git a/helm-chart/templates/cvat_backend/storage.yml b/helm-chart/templates/cvat_backend/storage.yml index 2dad2ee1da48..fd5e70a85e04 100644 --- a/helm-chart/templates/cvat_backend/storage.yml +++ b/helm-chart/templates/cvat_backend/storage.yml @@ -1,4 +1,5 @@ {{- if .Values.cvat.backend.defaultStorage.enabled }} +{{- if not .Values.cvat.backend.defaultStorage.existingClaimName }} apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -24,3 +25,4 @@ spec: requests: storage: {{ .Values.cvat.backend.defaultStorage.size }} {{- end }} +{{- end }} diff --git a/helm-chart/templates/cvat_backend/utils/deployment.yml b/helm-chart/templates/cvat_backend/utils/deployment.yml index 434366fecebe..3900288291a3 100644 --- a/helm-chart/templates/cvat_backend/utils/deployment.yml +++ b/helm-chart/templates/cvat_backend/utils/deployment.yml @@ -127,7 +127,7 @@ spec: {{- if .Values.cvat.backend.defaultStorage.enabled }} - name: cvat-backend-data persistentVolumeClaim: - claimName: "{{ .Release.Name }}-backend-data" + claimName: {{ default (printf "%s-backend-data" .Release.Name) .Values.cvat.backend.defaultStorage.existingClaimName | quote}} {{- if not .Values.cvat.backend.disableDistinctCachePerService }} - name: cvat-backend-per-service-cache emptyDir: {} diff --git a/helm-chart/templates/cvat_backend/worker_annotation/deployment.yml b/helm-chart/templates/cvat_backend/worker_annotation/deployment.yml index 2ccfdfcbb5d7..eb402d0ffa3b 100644 --- a/helm-chart/templates/cvat_backend/worker_annotation/deployment.yml +++ b/helm-chart/templates/cvat_backend/worker_annotation/deployment.yml @@ -130,7 +130,7 @@ spec: {{- if .Values.cvat.backend.defaultStorage.enabled }} - name: cvat-backend-data persistentVolumeClaim: - claimName: "{{ .Release.Name }}-backend-data" + claimName: {{ default (printf "%s-backend-data" .Release.Name) .Values.cvat.backend.defaultStorage.existingClaimName | quote}} {{- if not .Values.cvat.backend.disableDistinctCachePerService }} - name: cvat-backend-per-service-cache emptyDir: {} diff --git a/helm-chart/templates/cvat_backend/worker_export/deployment.yml b/helm-chart/templates/cvat_backend/worker_export/deployment.yml index 06211e7b2bf3..926a6aaee5c0 100644 --- a/helm-chart/templates/cvat_backend/worker_export/deployment.yml +++ b/helm-chart/templates/cvat_backend/worker_export/deployment.yml @@ -131,7 +131,7 @@ spec: {{- if .Values.cvat.backend.defaultStorage.enabled }} - name: cvat-backend-data persistentVolumeClaim: - claimName: "{{ .Release.Name }}-backend-data" + claimName: {{ default (printf "%s-backend-data" .Release.Name) .Values.cvat.backend.defaultStorage.existingClaimName | quote}} {{- if not .Values.cvat.backend.disableDistinctCachePerService }} - name: cvat-backend-per-service-cache emptyDir: {} diff --git a/helm-chart/templates/cvat_backend/worker_import/deployment.yml b/helm-chart/templates/cvat_backend/worker_import/deployment.yml index 6172e11ff0af..7a7aa835d9c3 100644 --- a/helm-chart/templates/cvat_backend/worker_import/deployment.yml +++ b/helm-chart/templates/cvat_backend/worker_import/deployment.yml @@ -130,7 +130,7 @@ spec: {{- if .Values.cvat.backend.defaultStorage.enabled }} - name: cvat-backend-data persistentVolumeClaim: - claimName: "{{ .Release.Name }}-backend-data" + claimName: {{ default (printf "%s-backend-data" .Release.Name) .Values.cvat.backend.defaultStorage.existingClaimName | quote}} {{- if not .Values.cvat.backend.disableDistinctCachePerService }} - name: cvat-backend-per-service-cache emptyDir: {} diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 05d74e906e98..cc6b0bcf8d1d 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -145,6 +145,7 @@ cvat: name: http defaultStorage: enabled: true +# existingClaimName: "" # storageClassName: default # accessModes: # - ReadWriteMany