fix: small improvement

mintproject · Sep 4, 2024 · 65aff7c · 65aff7c
1 parent 02c24d1
commit 65aff7c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/charts/mint/templates/ui-config.yaml b/charts/mint/templates/ui-config.yaml
@@ -35,12 +35,14 @@ data:
     {{ end }}
     {{ end }}
 
-    {{ if  .Values.components.ensemble_manager.enabled }
-    {{ with .Values.components.ensemble_manager.config.execution_engine }}
+    {{ if  .Values.components.ensemble_manager.enabled }}
+    {{ with .Values.components.ensemble_manager }}
     window.REACT_APP_ENSEMBLE_MANAGER_API = "http{{ if .ingress.tls }}s{{ end }}://{{ with (first .ingress.hosts ) }}{{ .host }}{{ end }}/{{ .api_version }}";
+    {{ end }}
 
+    {{ with .Values.components.ensemble_manager.config.execution_engine }}
     window.REACT_APP_EXECUTION_ENGINE = "{{ .type }}";
-    {{ if eq .config.type "localex" }}
+    {{ if eq .type "localex" }}
     window.REACT_APP_LOCALEX_CODEDIR = "{{ .data_dir }}/code";
     window.REACT_APP_LOCALEX_DATADIR = "{{ .data_dir }}/data";
     window.REACT_APP_LOCALEX_TEMPDIR = "{{ .data_dir }}/temp";
@@ -49,16 +51,16 @@ data:
     window.REACT_APP_LOCALEX_LOGURL = "{{ .data_url }}/logs";
     window.REACT_APP_LOCALEX_PARALLEL = "{{ .parallellelism }}";
     {{ end }}
-    {{ if eq .config.type "tapis" }}
+    {{ if eq .type "tapis" }}
     window.REACT_APP_LOCALEX_CODEDIR = "{{ .data_dir }}/code";
     window.REACT_APP_LOCALEX_DATADIR = "{{ .data_dir }}/data";
     window.REACT_APP_LOCALEX_TEMPDIR = "{{ .data_dir }}/temp";
     window.REACT_APP_LOCALEX_LOGDIR = "{{ .data_dir }}/logs";
     window.REACT_APP_LOCALEX_DATAURL = "{{ .data_url }}/data";
     window.REACT_APP_LOCALEX_LOGURL = "{{ .data_url }}/logs";
-    window.REACT_APP_LOCALEX_PARALLEL = "{{ config.parallelism }}";
+    window.REACT_APP_LOCALEX_PARALLEL = "{{ .parallelism }}";
     {{ end }}
-    {{ if eq .config.type "wings" }}
+    {{ if eq .type "wings" }}
     //Execution - Wings
     window.REACT_APP_WINGS_EXPORT_URL = "{{ .wings_export_url }}";
     window.REACT_APP_WINGS_STORAGE = "{{ .wings_storage }}";
@@ -87,5 +89,6 @@ data:
     window.REACT_APP_DATA_CATALOG_TYPE = "CKAN";
     window.REACT_APP_DATA_CATALOG_KEY = {{ .Values.secrets.data_catalog.ckan.api_key | quote }};
     {{ end }}
+    {{ end }}
 
-{{- end}}
+{{- end }}
diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml
@@ -317,6 +317,10 @@ components:
       annotations:
         helm.sh/resource-policy: keep
 
+external:
+  data_catalog:
+    url: http://localhost:5000
+
 google:
   maps:
     key: AIzaSyAkRnERo4F4dy9AhdrWHAN5vdJWs0vZCgM

diff --git a/tests/arm-64.yaml b/tests/arm-64.yaml
@@ -0,0 +1,6 @@
+welcome_message: Welcome to MINT Demo
+arm_support: true
+
+components:
+  data_catalog:
+    enabled: false