From 2718fe5f50066622ce49af2511efee63edf88d98 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Tue, 18 Mar 2025 10:57:40 -0300 Subject: [PATCH 1/2] fix: remove old services: ingestion --- charts/mint/Chart.yaml | 2 +- charts/mint/templates/ui-config.yaml | 8 ++++---- charts/mint/values.yaml | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/charts/mint/Chart.yaml b/charts/mint/Chart.yaml index 5058adf..4198ea1 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.4.6-pre8 +version: 3.4.6-pre9 # 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/ui-config.yaml b/charts/mint/templates/ui-config.yaml index 9582cf1..ae73277 100644 --- a/charts/mint/templates/ui-config.yaml +++ b/charts/mint/templates/ui-config.yaml @@ -91,10 +91,10 @@ data: window.REACT_APP_AUTH_LOGOUT_URL = {{ .Values.auth.logout_url | quote }}; //Visualization and Ingestion - Not used any more - Remove ? - window.REACT_APP_VISUALIZATION_URL = "http://dev.viz.mint.isi.edu"; - window.REACT_APP_INGESTION_API = "http://node1.ingestion.mint.isi.edu/v1.3.0"; - window.REACT_APP_AIRFLOW_API = "https://airflow.mint.isi.edu/api/v1"; - window.REACT_APP_AIRFLOW_DAG_DOWNLOAD_THREAD_ID = "download_thread" + window.REACT_APP_VISUALIZATION_URL = {{ .Values.components.ui.config.visualization_url | quote }}; + window.REACT_APP_INGESTION_API = {{ .Values.components.ui.config.ingestion_api | quote }}; + window.REACT_APP_AIRFLOW_API = {{ .Values.components.ui.config.airflow_api | quote }}; + window.REACT_APP_AIRFLOW_DAG_DOWNLOAD_THREAD_ID = {{ .Values.components.ui.config.airflow_dag_download_thread_id | quote }}; {{ if eq .Values.external_services.ckan.enabled true }} window.REACT_APP_DATA_CATALOG_TYPE = {{ .Values.external_services.ckan.type | quote }}; diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 680632d..42140f0 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -383,6 +383,11 @@ components: pullPolicy: IfNotPresent # -- Resource specifications for UI resources: {} + config: + visualization_url: "" + ingestion_api: "" + airflow_api: "" + airflow_dag_download_thread_id: "" ingress: # -- Enable or disable ingress for UI enabled: true From 492daa5dda98dcb34c96b38f880b1127e21aadd7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 18 Mar 2025 13:58:11 +0000 Subject: [PATCH 2/2] update Helm documentation --- charts/mint/README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/charts/mint/README.md b/charts/mint/README.md index 3347de5..233e825 100644 --- a/charts/mint/README.md +++ b/charts/mint/README.md @@ -1,6 +1,6 @@ # MINT -![Version: 3.4.6-pre7](https://img.shields.io/badge/Version-3.4.6--pre7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.3](https://img.shields.io/badge/AppVersion-1.16.3-informational?style=flat-square) +![Version: 3.4.6-pre9](https://img.shields.io/badge/Version-3.4.6--pre9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.3](https://img.shields.io/badge/AppVersion-1.16.3-informational?style=flat-square) A Helm chart for MINT @@ -93,10 +93,10 @@ A Helm chart for MINT | components.ensemble_manager.config.graphql.use_secret | bool | `true` | | | components.ensemble_manager.enabled | bool | `true` | Enable or disable Ensemble Manager | | components.ensemble_manager.environment.data_dir | string | `"/var/mint"` | | -| components.ensemble_manager.image | object | `{"pullPolicy":"IfNotPresent","repository":"mintproject/ensemble-manager","tag":"739acdcd828140fc471d4756b8708e57ca6acdeb"}` | Docker image repository for Ensemble Manager | +| components.ensemble_manager.image | object | `{"pullPolicy":"IfNotPresent","repository":"mintproject/ensemble-manager","tag":"814018a933c2750b62eef160394128daf3addf3d"}` | Docker image repository for Ensemble Manager | | components.ensemble_manager.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for Ensemble Manager | | components.ensemble_manager.image.repository | string | `"mintproject/ensemble-manager"` | Docker image repository for Ensemble Manager | -| components.ensemble_manager.image.tag | string | `"739acdcd828140fc471d4756b8708e57ca6acdeb"` | Docker image tag for Ensemble Manager | +| components.ensemble_manager.image.tag | string | `"814018a933c2750b62eef160394128daf3addf3d"` | Docker image tag for Ensemble Manager | | components.ensemble_manager.ingress.annotations."nginx.ingress.kubernetes.io/enable-cors" | string | `"true"` | | | components.ensemble_manager.ingress.className | string | `""` | | | components.ensemble_manager.ingress.enabled | bool | `true` | | @@ -244,6 +244,10 @@ A Helm chart for MINT | components.model_catalog_explorer.ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | | | components.model_catalog_explorer.ingress.tls | list | `[]` | | | components.model_catalog_explorer.resources | object | `{}` | Resource specifications for Model Catalog Explorer | +| components.ui.config.airflow_api | string | `""` | | +| components.ui.config.airflow_dag_download_thread_id | string | `""` | | +| components.ui.config.ingestion_api | string | `""` | | +| components.ui.config.visualization_url | string | `""` | | | components.ui.enabled | bool | `true` | Enable or disable UI | | components.ui.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy for UI | | components.ui.image.repository | string | `"mintproject/mint-ui-lit"` | Docker image repository for UI |