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: Add volumeMounts only if defaultStorage is enabled #7911

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
+19 −3
Open

fix: Add volumeMounts only if defaultStorage is enabled #7911

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6c33a36
fix: Add volumeMounts only if defaultStorage is enabled
jackylamhk May 17, 2024
51d140c
chore: Create CHANGELOG fragment
jackylamhk May 17, 2024
76c64ae
docs: Add Helm defaultStorage note
jackylamhk Jun 1, 2024
add86f6
style: Fix comment indent
jackylamhk Jun 1, 2024
c50d2d1
chore: Bump helm chart version
jackylamhk Jun 1, 2024
c1d2aa0
Merge branch 'develop' into fix/helm-defaultstorage
azhavoro Jan 23, 2025
924473f
Merge branch 'develop' into fix/helm-defaultstorage
azhavoro Jan 23, 2025
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
4 changes: 4 additions & 0 deletions changelog.d/20240518_021532_jacky.lam_helm_defaultstorage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Fixed

- Helm chart: Add volumeMounts only if defaultStorage is enabled
jackylamhk marked this conversation as resolved.
Show resolved Hide resolved
(<https://github.com/cvat-ai/cvat/pull/7911>)
2 changes: 2 additions & 0 deletions helm-chart/templates/cvat_backend/server/deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ spec:
ports:
- containerPort: 8080
volumeMounts:
{{- if .Values.cvat.backend.defaultStorage.enabled }}
{{- if not .Values.cvat.backend.disableDistinctCachePerService }}
- mountPath: /home/django/data/cache
name: cvat-backend-per-service-cache
Expand All @@ -81,6 +82,7 @@ spec:
- mountPath: /home/django/models
name: cvat-backend-data
subPath: models
{{- end }}
{{- with concat .Values.cvat.backend.additionalVolumeMounts $localValues.additionalVolumeMounts }}
{{- toYaml . | nindent 10 }}
{{- end }}
Expand Down
2 changes: 2 additions & 0 deletions helm-chart/templates/cvat_backend/utils/deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ spec:
ports:
- containerPort: 8080
volumeMounts:
{{- if .Values.cvat.backend.defaultStorage.enabled }}
{{- if not .Values.cvat.backend.disableDistinctCachePerService }}
- mountPath: /home/django/data/cache
name: cvat-backend-per-service-cache
Expand All @@ -79,6 +80,7 @@ spec:
- mountPath: /home/django/models
name: cvat-backend-data
subPath: models
{{- end }}
{{- with concat .Values.cvat.backend.additionalVolumeMounts $localValues.additionalVolumeMounts }}
{{- toYaml . | nindent 10 }}
{{- end }}
Expand Down
2 changes: 2 additions & 0 deletions helm-chart/templates/cvat_backend/worker_annotation/deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ spec:
{{- toYaml . | nindent 10 }}
{{- end }}
volumeMounts:
{{- if .Values.cvat.backend.defaultStorage.enabled }}
{{- if not .Values.cvat.backend.disableDistinctCachePerService }}
- mountPath: /home/django/data/cache
name: cvat-backend-per-service-cache
Expand All @@ -80,6 +81,7 @@ spec:
- mountPath: /home/django/tmp_storage
name: cvat-backend-data
subPath: tmp_storage
{{- end }}
{{- with concat .Values.cvat.backend.additionalVolumeMounts $localValues.additionalVolumeMounts }}
{{- toYaml . | nindent 10 }}
{{- end }}
Expand Down
2 changes: 2 additions & 0 deletions helm-chart/templates/cvat_backend/worker_export/deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ spec:
{{- toYaml . | nindent 10 }}
{{- end }}
volumeMounts:
{{- if .Values.cvat.backend.defaultStorage.enabled }}
{{- if not .Values.cvat.backend.disableDistinctCachePerService }}
- mountPath: /home/django/data/cache
name: cvat-backend-per-service-cache
Expand All @@ -80,6 +81,7 @@ spec:
- mountPath: /home/django/tmp_storage
name: cvat-backend-data
subPath: tmp_storage
{{- end }}
{{- with concat .Values.cvat.backend.additionalVolumeMounts $localValues.additionalVolumeMounts }}
{{- toYaml . | nindent 10 }}
{{- end }}
Expand Down
2 changes: 2 additions & 0 deletions helm-chart/templates/cvat_backend/worker_import/deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ spec:
{{- toYaml . | nindent 10 }}
{{- end }}
volumeMounts:
{{- if .Values.cvat.backend.defaultStorage.enabled }}
{{- if not .Values.cvat.backend.disableDistinctCachePerService }}
- mountPath: /home/django/data/cache
name: cvat-backend-per-service-cache
Expand All @@ -80,6 +81,7 @@ spec:
- mountPath: /home/django/tmp_storage
name: cvat-backend-data
subPath: tmp_storage
{{- end }}
{{- with concat .Values.cvat.backend.additionalVolumeMounts $localValues.additionalVolumeMounts }}
{{- toYaml . | nindent 10 }}
{{- end }}
Expand Down
Loading