fix(dvcx-worker): Make /blobvault volume optional in DVCx Worker (#197

) * fix(dvcx-worker): Make `/blobvault` volume optional in DVCx Worker If there is no bucket set, use `/blobvault`. Otherwise don't mount it. Also change order of HPA rules - ArgoCD were HPA as a Out of Sync * Helm-Docs update --------- Co-authored-by: Marcin Jasion <mjasion@users.noreply.github.com>
iterative · Sep 19, 2023 · fa403b8 · fa403b8
1 parent faeb4e9
commit fa403b8
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 32 deletions.
diff --git a/charts/studio/Chart.yaml b/charts/studio/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: studio
 description: A Helm chart for Kubernetes
 type: application
-version: 0.6.4
+version: 0.6.5
 appVersion: "v2.29.0"
 maintainers:
   - name: iterative

diff --git a/charts/studio/README.md b/charts/studio/README.md
@@ -1,6 +1,6 @@
 # studio
 
-![Version: 0.6.4](https://img.shields.io/badge/Version-0.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.29.0](https://img.shields.io/badge/AppVersion-v2.29.0-informational?style=flat-square)
+![Version: 0.6.5](https://img.shields.io/badge/Version-0.6.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.29.0](https://img.shields.io/badge/AppVersion-v2.29.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 

diff --git a/charts/studio/templates/deployment-studio-dvcx-worker.yaml b/charts/studio/templates/deployment-studio-dvcx-worker.yaml
@@ -71,16 +71,20 @@ spec:
                 name: {{ .Values.studioDvcxWorker.envFromSecret }}
             {{- end }}
           volumeMounts:
+            {{- if not .Values.global.blobvault.bucket }}
             - name: blobvault
               mountPath: /blobvault
+            {{- end }}
             - name: studio-ca-certificates
               mountPath: /usr/local/share/ca-certificates
             - name: tmp-ephemeral
               mountPath: /tmp
       volumes:
+        {{- if not .Values.global.blobvault.bucket }}
         - name: blobvault
           persistentVolumeClaim:
             claimName: blobvault
+        {{- end }}
         - name: studio-ca-certificates
           configMap:
             name: studio-ca-certificates

diff --git a/charts/studio/templates/hpa-studio-backend.yaml b/charts/studio/templates/hpa-studio-backend.yaml
@@ -13,20 +13,20 @@ spec:
   minReplicas: {{ .Values.studioBackend.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.studioBackend.autoscaling.maxReplicas }}
   metrics:
-    {{- if .Values.studioBackend.autoscaling.targetCPUUtilizationPercentage }}
+    {{- if .Values.studioBackend.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
-        name: cpu
+        name: memory
         target:
           type: Utilization
-          averageUtilization: {{ .Values.studioBackend.autoscaling.targetCPUUtilizationPercentage }}
+          averageUtilization: {{ .Values.studioBackend.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
-    {{- if .Values.studioBackend.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- if .Values.studioBackend.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
-        name: memory
+        name: cpu
         target:
           type: Utilization
-          averageUtilization: {{ .Values.studioBackend.autoscaling.targetMemoryUtilizationPercentage }}
+          averageUtilization: {{ .Values.studioBackend.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
 {{- end }}
diff --git a/charts/studio/templates/hpa-studio-beat.yaml b/charts/studio/templates/hpa-studio-beat.yaml
@@ -13,20 +13,20 @@ spec:
   minReplicas: {{ .Values.studioBeat.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.studioBeat.autoscaling.maxReplicas }}
   metrics:
-    {{- if .Values.studioBeat.autoscaling.targetCPUUtilizationPercentage }}
+    {{- if .Values.studioBeat.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
-        name: cpu
+        name: memory
         target:
           type: Utilization
-          averageUtilization: {{ .Values.studioBeat.autoscaling.targetCPUUtilizationPercentage }}
+          averageUtilization: {{ .Values.studioBeat.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
-    {{- if .Values.studioBeat.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- if .Values.studioBeat.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
-        name: memory
+        name: cpu
         target:
           type: Utilization
-          averageUtilization: {{ .Values.studioBeat.autoscaling.targetMemoryUtilizationPercentage }}
+          averageUtilization: {{ .Values.studioBeat.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
 {{- end }}
diff --git a/charts/studio/templates/hpa-studio-dvcx-worker.yaml b/charts/studio/templates/hpa-studio-dvcx-worker.yaml
@@ -18,20 +18,20 @@ spec:
   maxReplicas: 0
   {{- end}}
   metrics:
-    {{- if .Values.studioDvcxWorker.autoscaling.targetCPUUtilizationPercentage }}
+    {{- if .Values.studioDvcxWorker.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
-        name: cpu
+        name: memory
         target:
           type: Utilization
-          averageUtilization: {{ .Values.studioDvcxWorker.autoscaling.targetCPUUtilizationPercentage }}
+          averageUtilization: {{ .Values.studioDvcxWorker.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
-    {{- if .Values.studioDvcxWorker.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- if .Values.studioDvcxWorker.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
-        name: memory
+        name: cpu
         target:
           type: Utilization
-          averageUtilization: {{ .Values.studioDvcxWorker.autoscaling.targetMemoryUtilizationPercentage }}
+          averageUtilization: {{ .Values.studioDvcxWorker.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
 {{- end }}
diff --git a/charts/studio/templates/hpa-studio-ui.yaml b/charts/studio/templates/hpa-studio-ui.yaml
@@ -13,20 +13,20 @@ spec:
   minReplicas: {{ .Values.studioUi.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.studioUi.autoscaling.maxReplicas }}
   metrics:
-    {{- if .Values.studioUi.autoscaling.targetCPUUtilizationPercentage }}
+    {{- if .Values.studioUi.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
-        name: cpu
+        name: memory
         target:
           type: Utilization
-          averageUtilization: {{ .Values.studioUi.autoscaling.targetCPUUtilizationPercentage }}
+          averageUtilization: {{ .Values.studioUi.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
-    {{- if .Values.studioUi.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- if .Values.studioUi.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
-        name: memory
+        name: cpu
         target:
           type: Utilization
-          averageUtilization: {{ .Values.studioUi.autoscaling.targetMemoryUtilizationPercentage }}
+          averageUtilization: {{ .Values.studioUi.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
 {{- end }}
diff --git a/charts/studio/templates/hpa-studio-worker.yaml b/charts/studio/templates/hpa-studio-worker.yaml
@@ -13,20 +13,20 @@ spec:
   minReplicas: {{ .Values.studioWorker.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.studioWorker.autoscaling.maxReplicas }}
   metrics:
-    {{- if .Values.studioWorker.autoscaling.targetCPUUtilizationPercentage }}
+    {{- if .Values.studioWorker.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
-        name: cpu
+        name: memory
         target:
           type: Utilization
-          averageUtilization: {{ .Values.studioWorker.autoscaling.targetCPUUtilizationPercentage }}
+          averageUtilization: {{ .Values.studioWorker.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
-    {{- if .Values.studioWorker.autoscaling.targetMemoryUtilizationPercentage }}
+    {{- if .Values.studioWorker.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource
       resource:
-        name: memory
+        name: cpu
         target:
           type: Utilization
-          averageUtilization: {{ .Values.studioWorker.autoscaling.targetMemoryUtilizationPercentage }}
+          averageUtilization: {{ .Values.studioWorker.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
 {{- end }}