From b20f6a19e3f65a7bbb67065bb2c9c29ab979a88a Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Wed, 4 Sep 2024 14:31:41 -0400 Subject: [PATCH 1/4] improve: ui - ensemble communication --- charts/mint/templates/ui-config.yaml | 49 +++++++++++++--------------- charts/mint/values.yaml | 4 +++ 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/charts/mint/templates/ui-config.yaml b/charts/mint/templates/ui-config.yaml index 1a47583..e952a31 100644 --- a/charts/mint/templates/ui-config.yaml +++ b/charts/mint/templates/ui-config.yaml @@ -34,46 +34,41 @@ data: window.REACT_APP_GRAPHQL_ENABLE_SSL = {{ if .ingress.tls }}true{{else}}false{{ end }}; {{ end }} {{ end }} - {{ with .Values.components.ensemble_manager }} - {{ if .enabled }} + + {{ if .Values.components.ensemble_manager.enabled } + {{ with .Values.components.ensemble_manager.config.execution_engine }} 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 = "{{ .config.type }}"; + window.REACT_APP_EXECUTION_ENGINE = "{{ .type }}"; {{ if eq .config.type "localex" }} - window.REACT_APP_LOCALEX_CODEDIR = "{{ .config.data_dir }}/code"; - window.REACT_APP_LOCALEX_DATADIR = "{{ .config.data_dir }}/data"; - window.REACT_APP_LOCALEX_TEMPDIR = "{{ .config.data_dir }}/temp"; - window.REACT_APP_LOCALEX_LOGDIR = "{{ .config.data_dir }}/logs"; - window.REACT_APP_LOCALEX_DATAURL = "{{ .config.data_url }}/data"; - window.REACT_APP_LOCALEX_LOGURL = "{{ .config.data_url }}/logs"; - window.REACT_APP_LOCALEX_PARALLEL = "{{ .config.parallel }}"; + 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 = "{{ .parallellelism }}"; {{ end }} - {{ if eq .config.type "tapis" }} - window.REACT_APP_LOCALEX_CODEDIR = "{{ .config.data_dir }}/code"; - window.REACT_APP_LOCALEX_DATADIR = "{{ .config.data_dir }}/data"; - window.REACT_APP_LOCALEX_TEMPDIR = "{{ .config.data_dir }}/temp"; - window.REACT_APP_LOCALEX_LOGDIR = "{{ .config.data_dir }}/logs"; - window.REACT_APP_LOCALEX_DATAURL = "{{ .config.data_url }}/data"; - window.REACT_APP_LOCALEX_LOGURL = "{{ .config.data_url }}/logs"; - window.REACT_APP_LOCALEX_PARALLEL = "{{ .config.parallelism }}"; + 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 }}"; {{ end }} - - {{ if eq .config.type "wings" }} //Execution - Wings - window.REACT_APP_WINGS_EXPORT_URL = "{{ .config.wings_export_url }}"; - window.REACT_APP_WINGS_STORAGE = "{{ .config.wings_storage }}"; - window.REACT_APP_WINGS_DOTPATH = "{{ .config.wings_dot_path }}"; - window.REACT_APP_WINGS_ONTURL = "{{ .config.wings_ont_url }}"; + window.REACT_APP_WINGS_EXPORT_URL = "{{ .wings_export_url }}"; + window.REACT_APP_WINGS_STORAGE = "{{ .wings_storage }}"; + window.REACT_APP_WINGS_DOTPATH = "{{ .wings_dot_path }}"; + window.REACT_APP_WINGS_ONTURL = "{{ .wings_ont_url }}"; {{ end }} {{ end }} {{ end }} - {{ end }} - // Google API Key window.REACT_APP_GOOGLE_MAPS_KEY = {{ .Values.google.maps.key | quote }}; diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 4aac043..79c2d04 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -289,6 +289,10 @@ components: data_url: "s3://mintdata" log_url: "s3://mintdata" parallelism: 2 + wings_export_url: "" + wings_storage: "" + wings_dot_path: "" + wings_ont_url: "" ingress: enabled: true From 02c24d17d3a15caecf4e30c3b7d123f106900b91 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Wed, 4 Sep 2024 14:34:24 -0400 Subject: [PATCH 2/4] add: missing parameters tapis --- .../mint/templates/ensemble-manager-config.yaml | 15 +-------------- charts/mint/values.yaml | 3 +++ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/charts/mint/templates/ensemble-manager-config.yaml b/charts/mint/templates/ensemble-manager-config.yaml index f03748b..5c38c1f 100644 --- a/charts/mint/templates/ensemble-manager-config.yaml +++ b/charts/mint/templates/ensemble-manager-config.yaml @@ -7,17 +7,7 @@ metadata: data: config.json: | { - {{- if eq .Values.service.type "NodePort" }} - "data_catalog_api": "http://{{ include "mint.prefix" . }}-data-catalog", - "model_catalog_api": "http://{{ include "mint.prefix" . }}-model-catalog/{{ .Values.components.model_catalog_api.api_version }}", - "ensemble_manager_api": "http://{{ include "mint.prefix" .}}-ensemble-manager/{{ .Values.components.ensemble_manager.api_version }}", - "graphql": { - "endpoint": "{{ include "mint.prefix" . }}-hasura/v1/graphql", - "enable_ssl": false, - "use_secret": true - }, - - {{- else if eq .Values.service.type "ClusterIP" }} + {{- if eq .Values.service.type "ClusterIP" }} {{- with .Values.components.data_catalog }} {{- if .enabled }} "data_catalog_api": "http{{ if .ingress.tls }}s{{ end }}://{{ with (first .ingress.hosts ) }}{{ .host }}{{ end }}", @@ -54,10 +44,7 @@ data: "{{ .type }}": {{ .execution_engine | toRawJson | nindent 12}}, {{- end }} - {{- end }} - - {{- with .Values.components.ensemble_manager.config }} {{- if eq .data_catalog.type "CKAN"}} "data_catalog_api": {{ .data_catalog.api | quote }}, "data_catalog_type": {{ .data_catalog.type | quote }}, diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 79c2d04..1e8cb6d 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -293,6 +293,9 @@ components: wings_storage: "" wings_dot_path: "" wings_ont_url: "" + #tapis properties + username: "" + basePath: "" ingress: enabled: true From 65aff7c1eb08b148b9899e6f8ee6c4019ac33404 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Wed, 4 Sep 2024 14:56:06 -0400 Subject: [PATCH 3/4] fix: small improvement --- charts/mint/templates/ui-config.yaml | 17 ++++++++++------- charts/mint/values.yaml | 4 ++++ tests/arm-64.yaml | 6 ++++++ 3 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 tests/arm-64.yaml diff --git a/charts/mint/templates/ui-config.yaml b/charts/mint/templates/ui-config.yaml index e952a31..fca7b75 100644 --- 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}} \ No newline at end of file +{{- end }} \ No newline at end of file diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 1e8cb6d..80ee5b3 100644 --- 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 new file mode 100644 index 0000000..9f1efcc --- /dev/null +++ b/tests/arm-64.yaml @@ -0,0 +1,6 @@ +welcome_message: Welcome to MINT Demo +arm_support: true + +components: + data_catalog: + enabled: false From 34a5c79d4f950c0735910742732b5e917b0c2ca8 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Wed, 4 Sep 2024 14:56:38 -0400 Subject: [PATCH 4/4] fix: dump --- charts/mint/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/mint/Chart.yaml b/charts/mint/Chart.yaml index 46d2ce4..65bc43c 100644 --- 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: 3.3.0 +version: 3.3.1-alpha.0 # 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.