From 02d1d5759fb428db1ca39bf7c29980aeebd32b2c Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 06:18:08 -0400 Subject: [PATCH 01/18] disable all services --- charts/mint/values.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 06961a3..83dc24b 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -25,7 +25,7 @@ components: pathType: ImplementationSpecific tls: [] mic_ui: - enabled: true + enabled: false image: repository: mintproject/mic-web tag: a736ac5841d471de4679bec80c13b0fb646ae073 @@ -44,7 +44,7 @@ components: pathType: ImplementationSpecific tls: [] mic_api: - enabled: true + enabled: false image: repository: mintproject/mic-api tag: ee71a1a364fc3d384f85243684ad95d37913b049 @@ -108,7 +108,7 @@ components: annotations: helm.sh/resource-policy: keep model_catalog_endpoint: - enabled: true + enabled: false image: repository: mintproject/model-catalog-endpoint tag: 29256555a6fbaefae4729d5cd259564708a4ab04 @@ -140,7 +140,7 @@ components: annotations: helm.sh/resource-policy: keep hasura: - enabled: true + enabled: false image: repository: mintproject/graphql-engine tag: 0fc7ce2a5098d2e86f1280f6fa70acfc816a531d @@ -180,7 +180,7 @@ components: annotations: helm.sh/resource-policy: keep model_catalog_explorer: - enabled: true + enabled: false image: repository: mintproject/model-catalog-explorer tag: 0b2f9f0a9124076aeb492add2f123d0757066f6b @@ -196,7 +196,7 @@ components: pathType: ImplementationSpecific tls: [] model_catalog_api: - enabled: true + enabled: false api_version: v1.8.0 image: repository: mintproject/model-catalog-fastapi @@ -233,7 +233,7 @@ components: pathType: ImplementationSpecific tls: [] ensemble_manager: - enabled: true + enabled: false api_version: v1 image: repository: mintproject/ensemble-manager From a3ce18ee3679fd8b6322aa3e362a4bf8936ae28e Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 06:19:06 -0400 Subject: [PATCH 02/18] fix: install --- .github/workflows/linter.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml index 25e3a5e..957288c 100644 --- a/.github/workflows/linter.yaml +++ b/.github/workflows/linter.yaml @@ -37,3 +37,11 @@ jobs: - name: Run chart-testing (lint) if: steps.list-changed.outputs.changed == 'true' run: ct lint --target-branch ${{ github.event.repository.default_branch }} + + - name: Create kind cluster + if: steps.list-changed.outputs.changed == 'true' + uses: helm/kind-action@v1.10.0 + + - name: Run chart-testing (install) + if: steps.list-changed.outputs.changed == 'true' + run: ct install --target-branch ${{ github.event.repository.default_branch }} From 4b3efbf81040da98c7bcb576db127e91637fdc63 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 06:22:10 -0400 Subject: [PATCH 03/18] 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 33b9843..7d7368d 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: 2.3.1 +version: 2.3.2 # 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. From 44f79ce493713f097d2a4ee45d72450a6bb96534 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 06:33:26 -0400 Subject: [PATCH 04/18] fix: toggle pvc --- charts/mint/templates/pvc-datacatalog.yaml | 3 +-- charts/mint/templates/pvc-hasura.yaml | 3 +-- charts/mint/templates/pvc-mic.yaml | 3 +-- charts/mint/templates/pvc-model-catalog.yaml | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/charts/mint/templates/pvc-datacatalog.yaml b/charts/mint/templates/pvc-datacatalog.yaml index 90498b1..7eb3e8a 100644 --- a/charts/mint/templates/pvc-datacatalog.yaml +++ b/charts/mint/templates/pvc-datacatalog.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.components.data_catalog_db.persistence.enabled (not .Values.components.data_catalog_db.persistence.existingClaim) }} +{{- if and .Values.components.data_catalog.enabled and .Values.components.data_catalog_db.persistence.enabled (not .Values.components.data_catalog_db.persistence.existingClaim) }} kind: PersistentVolumeClaim apiVersion: v1 metadata: @@ -30,4 +30,3 @@ spec: dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.components.data_catalog_db.persistence.dataSource "context" $) | nindent 4 }} {{- end }} {{- end }} - \ No newline at end of file diff --git a/charts/mint/templates/pvc-hasura.yaml b/charts/mint/templates/pvc-hasura.yaml index 23f1ec7..b9133b9 100644 --- a/charts/mint/templates/pvc-hasura.yaml +++ b/charts/mint/templates/pvc-hasura.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.components.hasura_db.persistence.enabled (not .Values.components.hasura_db.persistence.existingClaim) }} +{{- if and .Values.components.hasura.enabled and .Values.components.hasura_db.persistence.enabled (not .Values.components.hasura_db.persistence.existingClaim) }} kind: PersistentVolumeClaim apiVersion: v1 metadata: @@ -31,4 +31,3 @@ spec: dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.components.hasura_db.persistence.dataSource "context" $) | nindent 4 }} {{- end }} {{- end }} - \ No newline at end of file diff --git a/charts/mint/templates/pvc-mic.yaml b/charts/mint/templates/pvc-mic.yaml index 2dadecd..e3e08f8 100644 --- a/charts/mint/templates/pvc-mic.yaml +++ b/charts/mint/templates/pvc-mic.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.components.mic_api_db.persistence.enabled (not .Values.components.mic_api_db.persistence.existingClaim) }} +{{- if and .Values.components.mic_api.enabled and .Values.components.mic_api_db.persistence.enabled (not .Values.components.mic_api_db.persistence.existingClaim) }} kind: PersistentVolumeClaim apiVersion: v1 metadata: @@ -30,4 +30,3 @@ spec: dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.components.mic_api_db.persistence.dataSource "context" $) | nindent 4 }} {{- end }} {{- end }} - \ No newline at end of file diff --git a/charts/mint/templates/pvc-model-catalog.yaml b/charts/mint/templates/pvc-model-catalog.yaml index 8b94b37..00791ba 100644 --- a/charts/mint/templates/pvc-model-catalog.yaml +++ b/charts/mint/templates/pvc-model-catalog.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.components.model_catalog_endpoint.persistence.enabled (not .Values.components.model_catalog_endpoint.persistence.existingClaim) }} +{{- if and .Values.components.model_catalog_endpoint.enabled and .Values.components.model_catalog_endpoint.persistence.enabled (not .Values.components.model_catalog_endpoint.persistence.existingClaim) }} kind: PersistentVolumeClaim apiVersion: v1 metadata: @@ -61,4 +61,3 @@ spec: dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.components.model_catalog_endpoint.persistence.dataSource "context" $) | nindent 4 }} {{- end }} {{- end }} - \ No newline at end of file From b95fc92580724e601be757e8a5fc28665f069d95 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 06:34:46 -0400 Subject: [PATCH 05/18] fix: toggle post --- charts/mint/templates/mic-ui-config.yaml | 3 +++ charts/mint/templates/post-install-hasura.yaml | 4 +++- charts/mint/templates/post-install-mic.yaml | 4 +++- .../mint/templates/post-install-model-catalog-endpoint.yaml | 2 ++ charts/mint/templates/ui-config.yaml | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/charts/mint/templates/mic-ui-config.yaml b/charts/mint/templates/mic-ui-config.yaml index 47f6caf..35dd05c 100644 --- a/charts/mint/templates/mic-ui-config.yaml +++ b/charts/mint/templates/mic-ui-config.yaml @@ -1,3 +1,4 @@ +{{-if .Values.components.mic_ui.enabled }} --- apiVersion: v1 kind: ConfigMap @@ -35,3 +36,5 @@ data: {{- end }} {{- end }} {{- end }} + +{{-end}} \ No newline at end of file diff --git a/charts/mint/templates/post-install-hasura.yaml b/charts/mint/templates/post-install-hasura.yaml index a432120..5646976 100644 --- a/charts/mint/templates/post-install-hasura.yaml +++ b/charts/mint/templates/post-install-hasura.yaml @@ -1,3 +1,4 @@ +{{- if .Values.components.hasura.enabled }} apiVersion: batch/v1 kind: Job metadata: @@ -33,4 +34,5 @@ spec: valueFrom: secretKeyRef: name: {{ include "mint.prefix" . }}-hasura-secrets - key: admin_secret \ No newline at end of file + key: admin_secret +{{- end }} \ No newline at end of file diff --git a/charts/mint/templates/post-install-mic.yaml b/charts/mint/templates/post-install-mic.yaml index 7eb87fe..18f80b2 100644 --- a/charts/mint/templates/post-install-mic.yaml +++ b/charts/mint/templates/post-install-mic.yaml @@ -1,3 +1,4 @@ +{{- if .Values.components.mic_api.enabled }} apiVersion: batch/v1 kind: Job metadata: @@ -45,4 +46,5 @@ spec: valueFrom: secretKeyRef: name: {{ include "mint.prefix" . }}-mic-api-db-secrets - key: password \ No newline at end of file + key: password +{{- end }} \ No newline at end of file diff --git a/charts/mint/templates/post-install-model-catalog-endpoint.yaml b/charts/mint/templates/post-install-model-catalog-endpoint.yaml index 7777af0..ec16d93 100644 --- a/charts/mint/templates/post-install-model-catalog-endpoint.yaml +++ b/charts/mint/templates/post-install-model-catalog-endpoint.yaml @@ -1,3 +1,4 @@ +{{- if .Values.components.model_catalog_endpoint.enabled }} apiVersion: batch/v1 kind: Job metadata: @@ -43,3 +44,4 @@ spec: secretKeyRef: name: {{ include "mint.prefix" . }}-model-catalog-endpoint-secrets key: password +{{- end }} \ No newline at end of file diff --git a/charts/mint/templates/ui-config.yaml b/charts/mint/templates/ui-config.yaml index 84c3e03..23c049b 100644 --- a/charts/mint/templates/ui-config.yaml +++ b/charts/mint/templates/ui-config.yaml @@ -1,3 +1,4 @@ +{{-if .Values.components.ui.enabled }} --- apiVersion: v1 kind: ConfigMap From 5d715485f3d478a215a0f8aaa6b032c90ac8705b Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 06:37:50 -0400 Subject: [PATCH 06/18] fix: toggle config --- charts/mint/templates/mic-ui-config.yaml | 4 ++-- charts/mint/templates/ui-config.yaml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/mint/templates/mic-ui-config.yaml b/charts/mint/templates/mic-ui-config.yaml index 35dd05c..0b29e46 100644 --- a/charts/mint/templates/mic-ui-config.yaml +++ b/charts/mint/templates/mic-ui-config.yaml @@ -1,4 +1,4 @@ -{{-if .Values.components.mic_ui.enabled }} +{{- if .Values.components.mic_ui.enabled }} --- apiVersion: v1 kind: ConfigMap @@ -37,4 +37,4 @@ data: {{- end }} {{- end }} -{{-end}} \ No newline at end of file +{{- end}} \ No newline at end of file diff --git a/charts/mint/templates/ui-config.yaml b/charts/mint/templates/ui-config.yaml index 23c049b..7e62796 100644 --- a/charts/mint/templates/ui-config.yaml +++ b/charts/mint/templates/ui-config.yaml @@ -1,4 +1,4 @@ -{{-if .Values.components.ui.enabled }} +{{- if .Values.components.ui.enabled }} --- apiVersion: v1 kind: ConfigMap @@ -94,3 +94,4 @@ data: 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" +{{- end}} \ No newline at end of file From e7af1bff46a5fb21ba1dcb4e2315359ada7ffefe Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 06:40:28 -0400 Subject: [PATCH 07/18] fix: enabled hasura --- charts/mint/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 83dc24b..63571cc 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -140,7 +140,7 @@ components: annotations: helm.sh/resource-policy: keep hasura: - enabled: false + enabled: true image: repository: mintproject/graphql-engine tag: 0fc7ce2a5098d2e86f1280f6fa70acfc816a531d From 538574bf197ec688993430c6449b447ee2c6709d Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 06:45:21 -0400 Subject: [PATCH 08/18] split if --- charts/mint/templates/pvc-hasura.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/mint/templates/pvc-hasura.yaml b/charts/mint/templates/pvc-hasura.yaml index b9133b9..4e53ba0 100644 --- a/charts/mint/templates/pvc-hasura.yaml +++ b/charts/mint/templates/pvc-hasura.yaml @@ -1,4 +1,5 @@ -{{- if and .Values.components.hasura.enabled and .Values.components.hasura_db.persistence.enabled (not .Values.components.hasura_db.persistence.existingClaim) }} +{{- if .Values.components.hasura.enabled }} +{{- if and .Values.components.hasura_db.persistence.enabled (not .Values.components.hasura_db.persistence.existingClaim) }} kind: PersistentVolumeClaim apiVersion: v1 metadata: @@ -31,3 +32,4 @@ spec: dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.components.hasura_db.persistence.dataSource "context" $) | nindent 4 }} {{- end }} {{- end }} +{{- end }} From 29073cfe7654788230a5836b486b1bf722a7a3cb Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 06:49:18 -0400 Subject: [PATCH 09/18] enable model catalog --- charts/mint/templates/pvc-model-catalog.yaml | 4 +++- charts/mint/values.yaml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/charts/mint/templates/pvc-model-catalog.yaml b/charts/mint/templates/pvc-model-catalog.yaml index 00791ba..6b4580f 100644 --- a/charts/mint/templates/pvc-model-catalog.yaml +++ b/charts/mint/templates/pvc-model-catalog.yaml @@ -1,4 +1,5 @@ -{{- if and .Values.components.model_catalog_endpoint.enabled and .Values.components.model_catalog_endpoint.persistence.enabled (not .Values.components.model_catalog_endpoint.persistence.existingClaim) }} +{{- if and .Values.components.model_catalog_endpoint.enabled }} +{{- if and .Values.components.model_catalog_endpoint.persistence.enabled (not .Values.components.model_catalog_endpoint.persistence.existingClaim) }} kind: PersistentVolumeClaim apiVersion: v1 metadata: @@ -61,3 +62,4 @@ spec: dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.components.model_catalog_endpoint.persistence.dataSource "context" $) | nindent 4 }} {{- end }} {{- end }} +{{- end }} diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 63571cc..4994888 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -108,7 +108,7 @@ components: annotations: helm.sh/resource-policy: keep model_catalog_endpoint: - enabled: false + enabled: true image: repository: mintproject/model-catalog-endpoint tag: 29256555a6fbaefae4729d5cd259564708a4ab04 @@ -196,7 +196,7 @@ components: pathType: ImplementationSpecific tls: [] model_catalog_api: - enabled: false + enabled: true api_version: v1.8.0 image: repository: mintproject/model-catalog-fastapi From d9eb526d416fa91f48ae9ade797d803fbeb64058 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 07:01:50 -0400 Subject: [PATCH 10/18] fix: enabled catalog explorer --- charts/mint/templates/model-catalog-endpoint.yaml | 1 - charts/mint/values.yaml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/mint/templates/model-catalog-endpoint.yaml b/charts/mint/templates/model-catalog-endpoint.yaml index 43e3cec..88052ac 100644 --- a/charts/mint/templates/model-catalog-endpoint.yaml +++ b/charts/mint/templates/model-catalog-endpoint.yaml @@ -75,7 +75,6 @@ spec: httpGet: path: / port: http - volumes: - name: config {{- if .Values.components.model_catalog_endpoint.persistence.enabled }} diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 4994888..3d15dbf 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -180,7 +180,7 @@ components: annotations: helm.sh/resource-policy: keep model_catalog_explorer: - enabled: false + enabled: true image: repository: mintproject/model-catalog-explorer tag: 0b2f9f0a9124076aeb492add2f123d0757066f6b From a6e61bc7e6902be4576df9307e6141f8ca68205a Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 07:02:35 -0400 Subject: [PATCH 11/18] fix: enable ensemble manager --- charts/mint/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 3d15dbf..585df0c 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -233,7 +233,7 @@ components: pathType: ImplementationSpecific tls: [] ensemble_manager: - enabled: false + enabled: true api_version: v1 image: repository: mintproject/ensemble-manager From 5be2cd22a70913ed3882365d791ead2c474fc138 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 07:10:02 -0400 Subject: [PATCH 12/18] fix: enable datacatalog --- charts/mint/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 585df0c..6163dad 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -76,7 +76,7 @@ components: annotations: helm.sh/resource-policy: keep data_catalog: - enabled: false + enabled: true image: repository: mintproject/data-catalog tag: 0e6b32b73228ef268065694ddf0aec47d28bf58e From ea11ea0277cf226c1967d4de74a45024f288f4f9 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 07:14:56 -0400 Subject: [PATCH 13/18] fix: enable data catalog --- charts/mint/templates/pvc-datacatalog.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/mint/templates/pvc-datacatalog.yaml b/charts/mint/templates/pvc-datacatalog.yaml index 7eb3e8a..363cac4 100644 --- a/charts/mint/templates/pvc-datacatalog.yaml +++ b/charts/mint/templates/pvc-datacatalog.yaml @@ -1,4 +1,5 @@ -{{- if and .Values.components.data_catalog.enabled and .Values.components.data_catalog_db.persistence.enabled (not .Values.components.data_catalog_db.persistence.existingClaim) }} +{{- if .Values.components.data_catalog.enabled }} +{{- if and .Values.components.data_catalog_db.persistence.enabled (not .Values.components.data_catalog_db.persistence.existingClaim) }} kind: PersistentVolumeClaim apiVersion: v1 metadata: @@ -30,3 +31,4 @@ spec: dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.components.data_catalog_db.persistence.dataSource "context" $) | nindent 4 }} {{- end }} {{- end }} +{{- end }} From 9ffc059ddc7ba17258554111a350688ce16cce77 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 08:40:51 -0400 Subject: [PATCH 14/18] fix: add support data catalog arm --- charts/mint/templates/datacatalog.yaml | 9 ++++++++- charts/mint/values.yaml | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/charts/mint/templates/datacatalog.yaml b/charts/mint/templates/datacatalog.yaml index 1999a46..61b2fd9 100644 --- a/charts/mint/templates/datacatalog.yaml +++ b/charts/mint/templates/datacatalog.yaml @@ -47,10 +47,17 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - name: data-catalog - {{- with .Values.components.data_catalog }} + {{- if .Values.arm_support }} + {{- with .Values.components.data_catalog }} + image: "{{ .arm_image.repository }}:{{ .arm_image.tag | default $.Chart.AppVersion }}" + imagePullPolicy: {{ .arm_image.pullPolicy }} + {{- end }} + {{- else }} + {{- with .Values.components.data_catalog }} image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}" imagePullPolicy: {{ .image.pullPolicy }} {{- end }} + {{- end }} ports: - name: http containerPort: 7000 diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 6163dad..c558a20 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -78,6 +78,10 @@ components: data_catalog: enabled: true image: + repository: mintproject/data-catalog + tag: 8a6af95cae183320d596dc5219f2f76d1f234749 + pullPolicy: IfNotPresent + arm_image: repository: mintproject/data-catalog tag: 0e6b32b73228ef268065694ddf0aec47d28bf58e pullPolicy: IfNotPresent From 07b0145dab862f13bf8920e521c04a88534de58b Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 08:47:58 -0400 Subject: [PATCH 15/18] Revert "fix: add support data catalog arm" This reverts commit 9ffc059ddc7ba17258554111a350688ce16cce77. --- charts/mint/templates/datacatalog.yaml | 9 +-------- charts/mint/values.yaml | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/charts/mint/templates/datacatalog.yaml b/charts/mint/templates/datacatalog.yaml index 61b2fd9..1999a46 100644 --- a/charts/mint/templates/datacatalog.yaml +++ b/charts/mint/templates/datacatalog.yaml @@ -47,17 +47,10 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - name: data-catalog - {{- if .Values.arm_support }} - {{- with .Values.components.data_catalog }} - image: "{{ .arm_image.repository }}:{{ .arm_image.tag | default $.Chart.AppVersion }}" - imagePullPolicy: {{ .arm_image.pullPolicy }} - {{- end }} - {{- else }} - {{- with .Values.components.data_catalog }} + {{- with .Values.components.data_catalog }} image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}" imagePullPolicy: {{ .image.pullPolicy }} {{- end }} - {{- end }} ports: - name: http containerPort: 7000 diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index c558a20..6163dad 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -78,10 +78,6 @@ components: data_catalog: enabled: true image: - repository: mintproject/data-catalog - tag: 8a6af95cae183320d596dc5219f2f76d1f234749 - pullPolicy: IfNotPresent - arm_image: repository: mintproject/data-catalog tag: 0e6b32b73228ef268065694ddf0aec47d28bf58e pullPolicy: IfNotPresent From 72dfc8a2a554e86fa9c73e749b59765903798fd9 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 08:50:32 -0400 Subject: [PATCH 16/18] fix: support arm data catalog db --- charts/mint/templates/datacatalog.yaml | 9 +++++++++ charts/mint/templates/hasura.yaml | 1 + charts/mint/values.yaml | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/charts/mint/templates/datacatalog.yaml b/charts/mint/templates/datacatalog.yaml index 1999a46..3429f66 100644 --- a/charts/mint/templates/datacatalog.yaml +++ b/charts/mint/templates/datacatalog.yaml @@ -84,10 +84,19 @@ spec: name: {{ include "mint.prefix" . }}-data-catalog-db-secrets key: password - name: data-catalog-db + + {{- if .Values.arm_support }} + {{- with .Values.components.data_catalog_db }} + image: "{{ .arm_image.repository }}:{{ .arm_image.tag | default $.Chart.AppVersion }}" + imagePullPolicy: {{ .arm_image.pullPolicy }} + {{- end }} + {{- else }} {{- with .Values.components.data_catalog_db }} image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}" imagePullPolicy: {{ .image.pullPolicy }} {{- end }} + {{- end }} + resources: {} volumeMounts: - mountPath: /var/lib/postgresql/data diff --git a/charts/mint/templates/hasura.yaml b/charts/mint/templates/hasura.yaml index bbf37d9..a5cf457 100644 --- a/charts/mint/templates/hasura.yaml +++ b/charts/mint/templates/hasura.yaml @@ -99,6 +99,7 @@ spec: imagePullPolicy: {{ .image.pullPolicy }} {{- end }} {{- end }} + resources: {} volumeMounts: - mountPath: /var/lib/postgresql/data diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 6163dad..8e21915 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -93,6 +93,10 @@ components: tls: [] data_catalog_db: image: + repository: mintproject/data-catalog-db + tag: 8a6af95cae183320d596dc5219f2f76d1f234749 + pullPolicy: IfNotPresent + arm_image: repository: mintproject/data-catalog-db tag: 0e6b32b73228ef268065694ddf0aec47d28bf58e pullPolicy: IfNotPresent From 57604071dc8999f59164ff50789c3d8319276e1d Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 09:02:53 -0400 Subject: [PATCH 17/18] add: support arm datacatalog api --- charts/mint/templates/datacatalog.yaml | 11 ++++++++++- charts/mint/values.yaml | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/charts/mint/templates/datacatalog.yaml b/charts/mint/templates/datacatalog.yaml index 3429f66..d957ce0 100644 --- a/charts/mint/templates/datacatalog.yaml +++ b/charts/mint/templates/datacatalog.yaml @@ -47,10 +47,19 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} containers: - name: data-catalog - {{- with .Values.components.data_catalog }} + + {{- if .Values.arm_support }} + {{- with .Values.components.data_catalog }} + image: "{{ .arm_image.repository }}:{{ .arm_image.tag | default $.Chart.AppVersion }}" + imagePullPolicy: {{ .arm_image.pullPolicy }} + {{- end }} + {{- else }} + {{- with .Values.components.data_catalog }} image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}" imagePullPolicy: {{ .image.pullPolicy }} {{- end }} + {{- end }} + ports: - name: http containerPort: 7000 diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 8e21915..4c36625 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -79,7 +79,11 @@ components: enabled: true image: repository: mintproject/data-catalog - tag: 0e6b32b73228ef268065694ddf0aec47d28bf58e + tag: 9be70359feabe03ed55bfdbf92c20a7e43ab928b + pullPolicy: IfNotPresent + arm_image: + repository: mintproject/data-catalog + tag: 8a6af95cae183320d596dc5219f2f76d1f234749 pullPolicy: IfNotPresent ingress: enabled: true From 058615e8f5297880375138aa2de13d5fd2a27ba1 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Thu, 27 Jun 2024 09:14:09 -0400 Subject: [PATCH 18/18] fix: wrong tag --- charts/mint/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index 4c36625..06faec9 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -98,11 +98,11 @@ components: data_catalog_db: image: repository: mintproject/data-catalog-db - tag: 8a6af95cae183320d596dc5219f2f76d1f234749 + tag: 9be70359feabe03ed55bfdbf92c20a7e43ab928b pullPolicy: IfNotPresent arm_image: repository: mintproject/data-catalog-db - tag: 0e6b32b73228ef268065694ddf0aec47d28bf58e + tag: 8a6af95cae183320d596dc5219f2f76d1f234749 pullPolicy: IfNotPresent persistence: enabled: true