multiple fixes to make helm work

CHANGELOG.md

@@ -12,18 +12,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Support task creation with any type of data supported by the server by default from cloud storage
 without use_cache option (<https://github.com/opencv/cvat/pull/6074>)
 - Support task creation with cloud storage data and without use_cache option (<https://github.com/opencv/cvat/pull/6074>)
+- [helm] Added configurable default storage option to chart(<https://github.com/opencv/cvat/pull/6137>)
 
 ### Changed
 - Cloud storage manifest file is optional (<https://github.com/opencv/cvat/pull/6074>)
 
 ### Changed
 - Updated Django to 4.2.x version (<https://github.com/opencv/cvat/pull/6122>)
-
+- [helm] Moved test-related values to another values.file to separate it from default config(<https://github.com/opencv/cvat/pull/6137>)
 ### Deprecated
 - The endpoint /cloudstorages/{id}/content was deprecated (<https://github.com/opencv/cvat/pull/6074>)
 
 ### Removed
-- TDB
+- [helm] Removed hardcoded mandatory traefik ingress usage(<https://github.com/opencv/cvat/pull/6137>)
 
 ### Fixed
 - Skeletons dumping on created tasks/projects (<https://github.com/opencv/cvat/pull/6157>)
@@ -61,6 +62,7 @@ without use_cache option (<https://github.com/opencv/cvat/pull/6074>)
   (<https://github.com/opencv/cvat/pull/6150>)
 - Prevented sending of empty list of events.
   (<https://github.com/opencv/cvat/pull/6154>)
+- - [helm] fixed issue with multiple caches in same RWX volume, which prevents db migration to start(<https://github.com/opencv/cvat/pull/6137>)
 
 ## \[2.4.3] - 2023-04-24
 ### Changed

helm-chart/Chart.yaml

@@ -58,4 +58,4 @@ dependencies:
   - name: traefik
     version: 10.24.0
     repository: https://helm.traefik.io/traefik
-    condition: ingress.enabled
+    condition: traefik.enabled

helm-chart/templates/cvat_backend/server/deployment.yml

@@ -114,6 +114,8 @@ spec:
           ports:
           - containerPort: 8080
           volumeMounts:
+          - mountPath: /home/django/data/cache
+            name: cvat-server-backend-cache
           - mountPath: /home/django/data
             name: cvat-backend-data
             subPath: data
@@ -140,6 +142,8 @@ spec:
           {{- end }}
           volumeMounts:
           {{- if .Values.cvat.backend.defaultStorage.enabled }}
+          - mountPath: /home/django/data/cache
+            name: cvat-server-backend-cache
           - mountPath: /home/django/data
             name: cvat-backend-data
             subPath: data
@@ -170,6 +174,8 @@ spec:
         - name: cvat-backend-data
           persistentVolumeClaim:
             claimName: "{{ .Release.Name }}-backend-data"
+        - name: cvat-server-backend-cache
+          emptyDir: {}
         {{- end }}
         {{- with .Values.cvat.backend.server.additionalVolumes }}
         {{- toYaml . | nindent 8 }}

helm-chart/templates/cvat_backend/storage.yml

@@ -10,8 +10,11 @@ metadata:
     tier: backend
 spec:
   accessModes:
-    - ReadWriteOnce
+    {{ .Values.cvat.backend.defaultStorage.accessModes | toYaml | nindent 4 }}
+  {{-  if .Values.cvat.backend.defaultStorage.storageClassName }}
+  storageClassName: {{ .Values.cvat.backend.defaultStorage.storageClassName }}
+  {{- end }}
   resources:
     requests:
       storage: {{ .Values.cvat.backend.defaultStorage.size }}
-{{- end}}
+{{- end }}

helm-chart/templates/cvat_backend/utils/deployment.yml

@@ -108,6 +108,8 @@ spec:
           ports:
           - containerPort: 8080
           volumeMounts:
+          - mountPath: /home/django/data/cache
+            name: cvat-utils-backend-cache
           - mountPath: /home/django/data
             name: cvat-backend-data
             subPath: data
@@ -134,6 +136,8 @@ spec:
           {{- end }}
           volumeMounts:
           {{- if .Values.cvat.backend.defaultStorage.enabled }}
+          - mountPath: /home/django/data/cache
+            name: cvat-utils-backend-cache
           - mountPath: /home/django/data
             name: cvat-backend-data
             subPath: data
@@ -164,6 +168,8 @@ spec:
         - name: cvat-backend-data
           persistentVolumeClaim:
             claimName: "{{ .Release.Name }}-backend-data"
+        - name: cvat-utils-backend-cache
+          emptyDir: {}
         {{- end }}
         {{- with .Values.cvat.backend.utils.additionalVolumes }}
         {{- toYaml . | nindent 8 }}

helm-chart/templates/cvat_backend/worker_annotation/deployment.yml

@@ -106,6 +106,8 @@ spec:
           {{- toYaml . | nindent 10 }}
           {{- end }}
           volumeMounts:
+          - mountPath: /home/django/data/cache
+            name: cvat-worker-annotation-backend-cache
           - mountPath: /home/django/data
             name: cvat-backend-data
             subPath: data
@@ -135,6 +137,8 @@ spec:
           {{- end }}
           volumeMounts:
           {{- if .Values.cvat.backend.defaultStorage.enabled }}
+          - mountPath: /home/django/data/cache
+            name: cvat-worker-annotation-backend-cache
           - mountPath: /home/django/data
             name: cvat-backend-data
             subPath: data
@@ -165,6 +169,8 @@ spec:
         - name: cvat-backend-data
           persistentVolumeClaim:
             claimName: "{{ .Release.Name }}-backend-data"
+        - name: cvat-worker-annotation-backend-cache
+          emptyDir: {}
         {{- end }}
         {{- with .Values.cvat.backend.worker.annotation.additionalVolumes }}
         {{- toYaml . | nindent 8 }}

helm-chart/templates/cvat_backend/worker_export/deployment.yml

@@ -106,6 +106,8 @@ spec:
           {{- toYaml . | nindent 10 }}
           {{- end }}
           volumeMounts:
+          - mountPath: /home/django/data/cache
+            name: cvat-worker-export-backend-cache
           - mountPath: /home/django/data
             name: cvat-backend-data
             subPath: data
@@ -135,6 +137,8 @@ spec:
           {{- end }}
           volumeMounts:
           {{- if .Values.cvat.backend.defaultStorage.enabled }}
+          - mountPath: /home/django/data/cache
+            name: cvat-worker-export-backend-cache
           - mountPath: /home/django/data
             name: cvat-backend-data
             subPath: data
@@ -165,6 +169,8 @@ spec:
         - name: cvat-backend-data
           persistentVolumeClaim:
             claimName: "{{ .Release.Name }}-backend-data"
+        - name: cvat-worker-export-backend-cache
+          emptyDir: {}
         {{- end }}
         {{- with .Values.cvat.backend.worker.export.additionalVolumes }}
         {{- toYaml . | nindent 8 }}

helm-chart/templates/cvat_backend/worker_import/deployment.yml

@@ -106,6 +106,8 @@ spec:
           {{- toYaml . | nindent 10 }}
           {{- end }}
           volumeMounts:
+          - mountPath: /home/django/data/cache
+            name: cvat-worker-import-backend-cache
           - mountPath: /home/django/data
             name: cvat-backend-data
             subPath: data
@@ -135,6 +137,8 @@ spec:
           {{- end }}
           volumeMounts:
           {{- if .Values.cvat.backend.defaultStorage.enabled }}
+          - mountPath: /home/django/data/cache
+            name: cvat-worker-import-backend-cache
           - mountPath: /home/django/data
             name: cvat-backend-data
             subPath: data
@@ -165,6 +169,8 @@ spec:
         - name: cvat-backend-data
           persistentVolumeClaim:
             claimName: "{{ .Release.Name }}-backend-data"
+        - name: cvat-worker-import-backend-cache
+          emptyDir: {}
         {{- end }}
         {{- with .Values.cvat.backend.worker.import.additionalVolumes }}
         {{- toYaml . | nindent 8 }}

helm-chart/tests.values.yaml

@@ -0,0 +1,60 @@
+analytics:
+    enabled: true
+
+ingress:
+    enabled: true
+    annotations:
+        traefik.ingress.kubernetes.io/router.entrypoints: web
+        kubernetes.io/ingress.class: traefik
+    hosts:
+        - host: cvat.local
+          paths:
+              - path: /api
+                pathType: "Prefix"
+                service:
+                    name: backend-service
+                    port: 8080
+              - path: /admin
+                pathType: "Prefix"
+                service:
+                    name: backend-service
+                    port: 8080
+              - path: /static
+                pathType: "Prefix"
+                service:
+                    name: backend-service
+                    port: 8080
+              - path: /django-rq
+                pathType: "Prefix"
+                service:
+                    name: backend-service
+                    port: 8080
+              - path: /git
+                pathType: "Prefix"
+                service:
+                    name: backend-service
+                    port: 8080
+              - path: /opencv
+                pathType: "Prefix"
+                service:
+                    name: backend-service
+                    port: 8080
+              - path: /profiler
+                pathType: "Prefix"
+                service:
+                    name: backend-service
+                    port: 8080
+              - path : /
+                pathType: "Prefix"
+                service:
+                    name: frontend-service
+                    port: 80
+
+traefik:
+    enabled: true
+    logs:
+        general:
+            level: INFO
+    service:
+        externalIPs:
+        # - "192.168.49.2"

helm-chart/values.yaml

@@ -24,7 +24,7 @@ cvat:
       additionalVolumeMounts: []
     worker:
       export:
-        replicas: 2
+        replicas: 1
         labels: {}
         annotations: {}
         resources: {}
@@ -34,7 +34,7 @@ cvat:
         additionalVolumes: []
         additionalVolumeMounts: []
       import:
-        replicas: 2
+        replicas: 1
         labels: {}
         annotations: {}
         resources: {}
@@ -91,6 +91,9 @@ cvat:
             name: http
     defaultStorage:
         enabled: true
+        # storageClassName: default
+        accessModes:
+         - ReadWriteMany
         size: 20Gi
   frontend:
     replicas: 1
@@ -225,7 +228,7 @@ nuclio:
 #      password: somepass
 
 analytics:
-  enabled: true
+  enabled: false
   clickhouseDb: cvat
   clickhouseUser: user
   clickhousePassword: user
@@ -319,62 +322,58 @@ grafana:
       enabled: false
 
 ingress:
-  enabled: true
-  annotations:
-    traefik.ingress.kubernetes.io/router.entrypoints: web
-    kubernetes.io/ingress.class: traefik
-  hosts:
-    - host: cvat.local
-      paths:
-        - path: /api
-          pathType: "Prefix"
-          service:
-            name: backend-service
-            port: 8080
-        - path: /admin
-          pathType: "Prefix"
-          service:
-            name: backend-service
-            port: 8080
-        - path: /static
-          pathType: "Prefix"
-          service:
-            name: backend-service
-            port: 8080
-        - path: /django-rq
-          pathType: "Prefix"
-          service:
-            name: backend-service
-            port: 8080
-        - path: /git
-          pathType: "Prefix"
-          service:
-            name: backend-service
-            port: 8080
-        - path: /opencv
-          pathType: "Prefix"
-          service:
-            name: backend-service
-            port: 8080
-        - path: /profiler
-          pathType: "Prefix"
-          service:
-            name: backend-service
-            port: 8080
-        - path : /
-          pathType: "Prefix"
-          service:
-            name: frontend-service
-            port: 80
+  enabled: false
+#  enabled: true
+#  annotations:
+#    traefik.ingress.kubernetes.io/router.entrypoints: web
+#    kubernetes.io/ingress.class: traefik
+#  hosts:
+#    - host: cvat.local
+#      paths:
+#        - path: /api
+#          pathType: "Prefix"
+#          service:
+#            name: backend-service
+#            port: 8080
+#        - path: /admin
+#          pathType: "Prefix"
+#          service:
+#            name: backend-service
+#            port: 8080
+#        - path: /static
+#          pathType: "Prefix"
+#          service:
+#            name: backend-service
+#            port: 8080
+#        - path: /django-rq
+#          pathType: "Prefix"
+#          service:
+#            name: backend-service
+#            port: 8080
+#        - path: /git
+#          pathType: "Prefix"
+#          service:
+#            name: backend-service
+#            port: 8080
+#        - path: /opencv
+#          pathType: "Prefix"
+#          service:
+#            name: backend-service
+#            port: 8080
+#        - path: /profiler
+#          pathType: "Prefix"
+#          service:
+#            name: backend-service
+#            port: 8080
+#        - path : /
+#          pathType: "Prefix"
+#          service:
+#            name: frontend-service
+#            port: 80
   # tls:
   #   - hosts:
   #     - <your_domain>
   #   secretName: ingress-tls-cvat
 
 traefik:
-  logs:
-    general:
-      level: INFO
-  service:
-    externalIPs:
-      # - "192.168.49.2"
+  enabled: false