From a52cc2f5714927a94c13019828a7cddfb5f3fc6d Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Mon, 8 Jul 2024 11:56:05 -0400 Subject: [PATCH 1/2] fix: ensemble manager allow any execution_type config --- charts/mint/templates/ensemble-manager-config.yaml | 4 ++-- examples/custom-domain-no-ssl.yaml | 6 ------ examples/custom-execution-manager.yaml | 12 ++++++++++++ 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 examples/custom-execution-manager.yaml diff --git a/charts/mint/templates/ensemble-manager-config.yaml b/charts/mint/templates/ensemble-manager-config.yaml index 632ff1f..cc40561 100644 --- a/charts/mint/templates/ensemble-manager-config.yaml +++ b/charts/mint/templates/ensemble-manager-config.yaml @@ -49,8 +49,8 @@ data: {{- with .Values.components.ensemble_manager }} - {{- if eq .execution_engine.type "localex" }} - "execution_engine": "localex", + {{- if .execution_engine.type }} + "execution_engine": {{ .execution_engine.type | quote }}, "{{ .execution_engine.type }}": {{ .execution_engine.config | toRawJson | nindent 12}}, {{- end }} diff --git a/examples/custom-domain-no-ssl.yaml b/examples/custom-domain-no-ssl.yaml index c9ec764..db670d7 100644 --- a/examples/custom-domain-no-ssl.yaml +++ b/examples/custom-domain-no-ssl.yaml @@ -15,7 +15,6 @@ components: paths: - path: / pathType: ImplementationSpecific - tls: [] mic_api: ingress: enabled: true @@ -24,7 +23,6 @@ components: paths: - path: / pathType: ImplementationSpecific - tls: [] data_catalog: ingress: enabled: true @@ -33,7 +31,6 @@ components: paths: - path: / pathType: ImplementationSpecific - tls: [] model_catalog_endpoint: ingress: enabled: true @@ -42,7 +39,6 @@ components: paths: - path: / pathType: ImplementationSpecific - tls: [] hasura: ingress: enabled: true @@ -70,7 +66,6 @@ components: paths: - path: / pathType: ImplementationSpecific - tls: [] ui: ingress: enabled: true @@ -88,4 +83,3 @@ components: paths: - path: / pathType: ImplementationSpecific - tls: [] diff --git a/examples/custom-execution-manager.yaml b/examples/custom-execution-manager.yaml new file mode 100644 index 0000000..3679e07 --- /dev/null +++ b/examples/custom-execution-manager.yaml @@ -0,0 +1,12 @@ +components: + ensemble_manager: + enabled: true + execution_engine: + type: tapis + config: + codedir: /home/node/app/data/code + datadir: /home/node/app/data/data + tempdir: /home/node/app/data/temp + logdir: /home/node/app/data/logs + dataurl: http://localhost:30010/data + parallelism: 1 From 8f969abb45f6918fe883cd3a87f4b617bce0d567 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Mon, 8 Jul 2024 11:56:50 -0400 Subject: [PATCH 2/2] fix: release --- 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 9c663d6..bbc399c 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.0.0 +version: 3.0.1-alpha.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.