---

aimclub · Dec 17, 2023 · ccbe7ac · ccbe7ac
1 parent cc91016
commit ccbe7ac
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/distributed/charts/autotm/templates/_helpers.tpl b/distributed/charts/autotm/templates/_helpers.tpl
@@ -96,3 +96,21 @@ Celery result backend url
 {{- define "autotm.celery_result_backend" -}}
 {{- printf "redis://%sredis:6379/1" (include "autotm.prefix" .) -}}
 {{- end -}}
+
+{{/*
+Check if required persistent volume exists.
+One should invoke it like '{{ include "autotm.find_pv" (list . "pv_mlflow_db") }}', where 'pv_mlflow_db' is a variable from values.yaml
+See:
+- https://stackoverflow.com/questions/70803242/helm-pass-single-string-to-a-template
+- https://austindewey.com/2021/06/02/writing-function-based-templates-in-helm/
+*/}}
+{{- define "autotm.find_pv" -}}
+{{- $root := index . 0 -}}
+{{- $pv_var := index . 1 -}}
+{{- $pv_name := (printf "%s%s" (include "autotm.prefix" $root) (get $root.Values $pv_var)) -}}
+{{- $result := (lookup "v1" "PersistentVolume" "" $pv_name) -}}
+{{- if empty $result -}}
+{{- (printf "Persistent volume with name '%s' not found" $pv_name) | fail -}}
+{{- end -}}
+{{- $result.metadata.name -}}
+{{- end -}}
diff --git a/distributed/charts/autotm/templates/pvc.yaml b/distributed/charts/autotm/templates/pvc.yaml
@@ -11,8 +11,8 @@ metadata:
     {{ $key }}: {{ $val | quote }}
     {{- end }}
 spec:
-  storageClassName: manual
-  volumeName: {{ .Values.pv_mlflow_db }}
+  storageClassName: {{ .Values.storage_class }}
+  volumeName: {{ include "autotm.find_pv" (list . "pv_mlflow_db") }}
   accessModes:
     - ReadWriteOnce
   resources:
@@ -28,8 +28,8 @@ metadata:
     {{ $key }}: {{ $val | quote }}
     {{- end }}
 spec:
-  storageClassName: manual
-  volumeName: {{ .Values.pv_mlflow_artifact_store }}
+  storageClassName: {{ .Values.storage_class }}
+  volumeName: {{ include "autotm.find_pv" (list . "pv_mlflow_artifact_store") }}
   accessModes:
     - ReadWriteMany
   resources:
@@ -48,8 +48,8 @@ metadata:
     {{ $key }}: {{ $val | quote }}
     {{- end }}
 spec:
-  storageClassName: manual
-  volumeName: {{ .Values.pv_mongo_db }}
+  storageClassName: {{ .Values.storage_class }}
+  volumeName: {{ include "autotm.find_pv" (list . "pv_mongo_db") }}
   accessModes:
     - ReadWriteOnce
   resources:
@@ -68,8 +68,8 @@ metadata:
     {{ $key }}: {{ $val | quote }}
     {{- end }}
 spec:
-  storageClassName: manual
-  volumeName: {{ .Values.pv_dataset_store }}
+  storageClassName: {{ .Values.storage_class }}
+  volumeName: {{ include "autotm.find_pv" (list . "pv_dataset_store") }}
   accessModes:
     - ReadOnly
   resources:

diff --git a/distributed/charts/autotm/values.yaml b/distributed/charts/autotm/values.yaml
@@ -19,6 +19,7 @@ flower_image: "node2.bdcl:5000/flower:latest"
 worker_image: "node2.bdcl:5000/fitness-worker:latest"
 
 ### Volumes
+storage_class: "manual"
 pv_mlflow_db: "mlflow-db-pv"
 pv_mlflow_artifact_store: "mlflow-artifact-store-pv"
 pv_mongo_db: "mongo-tm-experiments-pv-part3"