add: support tapis (#25)

* improve: execution_engine configuration * fix: support tapis * dump version * fix: linter
mintproject · Jun 25, 2024 · a74219e · a74219e
1 parent aafdea3
commit a74219e
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 17 deletions.
diff --git a/charts/mint/Chart.yaml b/charts/mint/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.3.0
+version: 2.3.1
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/charts/mint/templates/ensemble-manager-config.yaml b/charts/mint/templates/ensemble-manager-config.yaml
@@ -49,10 +49,10 @@ data:
 
 
          {{- with .Values.components.ensemble_manager }}
-         {{- if eq .executionEngine.type "localex" }}
+         {{- if eq .execution_engine.type "localex" }}
          "execution_engine": "localex",
-         "{{ .executionEngine.type }}":
-            {{ .executionEngine.config  | toRawJson | nindent 12}}
+         "{{ .execution_engine.type }}":
+            {{ .execution_engine.config  | toRawJson | nindent 12}}
          {{- end }}
          {{- end }}
          "auth_server": {{ .Values.auth.url | quote }},

diff --git a/charts/mint/templates/ui-config.yaml b/charts/mint/templates/ui-config.yaml
@@ -44,19 +44,37 @@ data:
     {{ if  .enabled }}
     window.REACT_APP_ENSEMBLE_MANAGER_API = "http{{ if .ingress.tls }}s{{ end }}://{{ with (first .ingress.hosts ) }}{{ .host }}{{ end }}/{{ .api_version }}";
     //Execution - Local
-    window.REACT_APP_EXECUTION_ENGINE = "tapis";
-    window.REACT_APP_LOCALEX_CODEDIR = "{{ .environment.data_dir }}/code";
-    window.REACT_APP_LOCALEX_DATADIR = "{{ .environment.data_dir }}/data";
-    window.REACT_APP_LOCALEX_TEMPDIR = "{{ .environment.data_dir }}/temp";
-    window.REACT_APP_LOCALEX_LOGDIR = "{{ .environment.data_dir }}/logs";
-    window.REACT_APP_LOCALEX_DATAURL = "{{ .environment.data_url }}/data";
-    window.REACT_APP_LOCALEX_LOGURL = "{{ .environment.data_url }}/logs";
-    window.REACT_APP_LOCALEX_PARALLEL = "{{ .environment.parallel }}";
+    window.REACT_APP_EXECUTION_ENGINE = "{{ .execution_engine.type }}";
+
+    {{ if eq .execution_engine.type "localex" }}
+    window.REACT_APP_LOCALEX_CODEDIR = "{{ .execution_engine.config.data_dir }}/code";
+    window.REACT_APP_LOCALEX_DATADIR = "{{ .execution_engine.config.data_dir }}/data";
+    window.REACT_APP_LOCALEX_TEMPDIR = "{{ .execution_engine.config.data_dir }}/temp";
+    window.REACT_APP_LOCALEX_LOGDIR = "{{ .execution_engine.config.data_dir }}/logs";
+    window.REACT_APP_LOCALEX_DATAURL = "{{ .execution_engine.config.data_url }}/data";
+    window.REACT_APP_LOCALEX_LOGURL = "{{ .execution_engine.config.data_url }}/logs";
+    window.REACT_APP_LOCALEX_PARALLEL = "{{ .execution_engine.config.parallel }}";
+    {{ end }}
+
+    {{ if eq .execution_engine.type "tapis" }}
+    window.REACT_APP_LOCALEX_CODEDIR = "{{ .execution_engine.config.data_dir }}/code";
+    window.REACT_APP_LOCALEX_DATADIR = "{{ .execution_engine.config.data_dir }}/data";
+    window.REACT_APP_LOCALEX_TEMPDIR = "{{ .execution_engine.config.data_dir }}/temp";
+    window.REACT_APP_LOCALEX_LOGDIR = "{{ .execution_engine.config.data_dir }}/logs";
+    window.REACT_APP_LOCALEX_DATAURL = "{{ .execution_engine.config.data_url }}/data";
+    window.REACT_APP_LOCALEX_LOGURL = "{{ .execution_engine.config.data_url }}/logs";
+    window.REACT_APP_LOCALEX_PARALLEL = "{{ .execution_engine.config.parallel }}";
+    {{ end }}
+
+
+    {{ if eq .execution_engine.type "wings" }}
     //Execution - Wings
-    window.REACT_APP_WINGS_EXPORT_URL = "{{ .environment.wings_export_url }}";
-    window.REACT_APP_WINGS_STORAGE = "{{ .environment.wings_storage }}";
-    window.REACT_APP_WINGS_DOTPATH = "{{ .environment.wings_dot_path }}";
-    window.REACT_APP_WINGS_ONTURL = "{{ .environment.wings_ont_url }}";
+    window.REACT_APP_WINGS_EXPORT_URL = "{{ .execution_engine.config.wings_export_url }}";
+    window.REACT_APP_WINGS_STORAGE = "{{ .execution_engine.config.wings_storage }}";
+    window.REACT_APP_WINGS_DOTPATH = "{{ .execution_engine.config.wings_dot_path }}";
+    window.REACT_APP_WINGS_ONTURL = "{{ .execution_engine.config.wings_ont_url }}";
+    {{ end }}
+
     {{ end }}
     {{ end }}
 

diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml
@@ -243,7 +243,7 @@ components:
       data_dir: /var/mint
       data_url: http://localhost:30010/data
       parallel: 1
-    executionEngine:
+    execution_engine:
       type: localex
       config:
         codedir: /home/node/app/data/code