helm: name changes of the new env variablae used

Closes reanahub#532
marcdiazsan · Sep 4, 2021 · 7d8d7c0 · 7d8d7c0
1 parent 00e7bde
commit 7d8d7c0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/helm/reana/README.md b/helm/reana/README.md
@@ -99,4 +99,4 @@ This Helm automatically prefixes all names using the release name to avoid colli
 | `quota.disk_update`                                      | Cronjob pattern representing how often the users disk quota usage should be updated. Leave it empty to deactivate it | "0 3 * * *"     |
 | `quota.default_disk_limit`                               | Default users disk quota limit in bytes.                                             | None                                            |
 | `quota.default_cpu_limit`                                | Default users CPU quota limit in milliseconds.                                       | None                                            |
-| `workspaces.paths`                                        | List of optional aditional workspace paths, e.g `{cluster_node_path_1, cluster_node_path_2}`. The first will be the default workspace root path. | None               |
+| `workspaces.paths`                                       | List of additional workspace paths, e.g `{cluster_node_path_1, cluster_node_path_2}`. The first will be the default workspace root path. Any POSIX filesystem mounted on cluster nodes is supported | None               |
diff --git a/helm/reana/templates/reana-server.yaml b/helm/reana/templates/reana-server.yaml
@@ -86,9 +86,13 @@ spec:
           - name: REANA_KUBERNETES_JOBS_MEMORY_LIMIT
             value: {{ .Values.kubernetes_jobs_memory_limit | default "4Gi" }}
           {{- if .Values.workspaces }}{{ if .Values.workspaces.paths }}
-          - name: ADMIN_ALLOWED_WORKSPACES
+          - name: WORKSPACE_PATHS
             value: {{ join "," .Values.workspaces.paths }}
           {{- end }}{{ end }}
+          {{- if .Values.workspaces }}{{ if .Values.workspaces.paths }}
+          - name: DEFAULT_WORKSPACE_PATH
+            value: {{ index .Values.workspaces.paths 0 }}
+          {{- end }}{{ end }}
           {{- range $key, $value := .Values.db_env_config }}
           - name: {{ $key }}
             value: {{ $value | quote }}

diff --git a/helm/reana/templates/reana-workflow-controller.yaml b/helm/reana/templates/reana-workflow-controller.yaml
@@ -269,4 +269,5 @@ spec:
         hostPath:
           path: {{ $workspace_paths }}
       {{- end }}
-      {{- end }}{{ end }}
+      {{- end }}{{ end }}
+
diff --git a/helm/reana/values.yaml b/helm/reana/values.yaml
@@ -11,6 +11,11 @@ debug:
 eos:
   enabled: false
 
+workspaces:
+  paths:
+    - /tmp/reana
+    - /tmp/foo
+
 shared_storage:
   backend: hostpath  # hostpath | cephfs | nfs
   volume_size: 200