Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test tapis ensemble manager #47

Merged
merged 4 commits into from
Sep 4, 2024
Merged

Test tapis ensemble manager #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b20f6a1
improve: ui - ensemble communication
mosoriob Sep 4, 2024
02c24d1
add: missing parameters tapis
mosoriob Sep 4, 2024
65aff7c
fix: small improvement
mosoriob Sep 4, 2024
34a5c79
fix: dump
mosoriob Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/mint/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
15 changes: 1 addition & 14 deletions charts/mint/templates/ensemble-manager-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}",
Expand Down Expand Up @@ -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 }},
Expand Down
58 changes: 28 additions & 30 deletions charts/mint/templates/ui-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,46 +34,43 @@ data:
window.REACT_APP_GRAPHQL_ENABLE_SSL = {{ if .ingress.tls }}true{{else}}false{{ end }};
{{ end }}
{{ end }}

{{ if .Values.components.ensemble_manager.enabled }}
{{ with .Values.components.ensemble_manager }}
{{ 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 = "{{ .config.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 }}";
{{ 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 }}";
{{ with .Values.components.ensemble_manager.config.execution_engine }}
window.REACT_APP_EXECUTION_ENGINE = "{{ .type }}";
{{ 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";
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 "wings" }}
{{ 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 = "{{ .parallelism }}";
{{ end }}
{{ if eq .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 }};

Expand All @@ -92,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 }}
11 changes: 11 additions & 0 deletions charts/mint/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,13 @@ components:
data_url: "s3://mintdata"
log_url: "s3://mintdata"
parallelism: 2
wings_export_url: ""
wings_storage: ""
wings_dot_path: ""
wings_ont_url: ""
#tapis properties
username: ""
basePath: ""

ingress:
enabled: true
Expand All @@ -310,6 +317,10 @@ components:
annotations:
helm.sh/resource-policy: keep

external:
data_catalog:
url: http://localhost:5000

google:
maps:
key: AIzaSyAkRnERo4F4dy9AhdrWHAN5vdJWs0vZCgM
Expand Down
6 changes: 6 additions & 0 deletions tests/arm-64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
welcome_message: Welcome to MINT Demo
arm_support: true

components:
data_catalog:
enabled: false
Loading