From 356ca03bcc0ec56605aa284cfc0160f6ac51f3ad Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Tue, 25 Feb 2025 19:14:21 -0300 Subject: [PATCH 01/11] fix duplicated labels in metaflow ui static deployment --- charts/metaflow/charts/metaflow-ui/templates/_helpers.tpl | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/metaflow/charts/metaflow-ui/templates/_helpers.tpl b/charts/metaflow/charts/metaflow-ui/templates/_helpers.tpl index 54d3231..74550d5 100644 --- a/charts/metaflow/charts/metaflow-ui/templates/_helpers.tpl +++ b/charts/metaflow/charts/metaflow-ui/templates/_helpers.tpl @@ -56,7 +56,6 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end }} {{- define "metaflow-ui.labelsStatic" -}} -{{ include "metaflow-ui.labels" . }} {{ include "metaflow-ui.selectorLabelsStatic" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} From 636c51c0b426ad8d2c15731655bf1443a0f464a8 Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Tue, 25 Feb 2025 19:25:15 -0300 Subject: [PATCH 02/11] chore: trigger chart release --- .github/workflows/publish_helm_charts.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/publish_helm_charts.yml b/.github/workflows/publish_helm_charts.yml index 50e415e..609857d 100644 --- a/.github/workflows/publish_helm_charts.yml +++ b/.github/workflows/publish_helm_charts.yml @@ -1,5 +1,4 @@ name: Release Charts - on: push: branches: From b6d2062a57764e3bc57602e541efcfdd4342fc5c Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Tue, 25 Feb 2025 19:32:07 -0300 Subject: [PATCH 03/11] remove gh action --- .github/workflows/publish_helm_charts.yml | 33 ----------------------- 1 file changed, 33 deletions(-) delete mode 100644 .github/workflows/publish_helm_charts.yml diff --git a/.github/workflows/publish_helm_charts.yml b/.github/workflows/publish_helm_charts.yml deleted file mode 100644 index 609857d..0000000 --- a/.github/workflows/publish_helm_charts.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Release Charts -on: - push: - branches: - - master - -jobs: - release: - permissions: - contents: write - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Configure Git - run: | - git config user.name "$GITHUB_ACTOR" - git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - - - name: Install Helm - uses: azure/setup-helm@v4 - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - - - name: Run chart-releaser - uses: helm/chart-releaser-action@v1.6.0 - with: - charts_dir: charts/metaflow/charts - env: - CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From 471d05aa327e692150cc81a7a8b0ddd73037bacf Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Tue, 25 Feb 2025 19:32:16 -0300 Subject: [PATCH 04/11] push back ghaction --- .github/workflows/publish_helm_charts.yml | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/publish_helm_charts.yml diff --git a/.github/workflows/publish_helm_charts.yml b/.github/workflows/publish_helm_charts.yml new file mode 100644 index 0000000..609857d --- /dev/null +++ b/.github/workflows/publish_helm_charts.yml @@ -0,0 +1,33 @@ +name: Release Charts +on: + push: + branches: + - master + +jobs: + release: + permissions: + contents: write + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + - name: Install Helm + uses: azure/setup-helm@v4 + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + + - name: Run chart-releaser + uses: helm/chart-releaser-action@v1.6.0 + with: + charts_dir: charts/metaflow/charts + env: + CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From 8f41ecb505c70c51c68b8de34b61fdf4481e976b Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Tue, 25 Feb 2025 19:33:24 -0300 Subject: [PATCH 05/11] chore: bump metaflow-ui chart version --- charts/metaflow/charts/metaflow-ui/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/metaflow/charts/metaflow-ui/Chart.yaml b/charts/metaflow/charts/metaflow-ui/Chart.yaml index 2901bfd..dbc9533 100644 --- a/charts/metaflow/charts/metaflow-ui/Chart.yaml +++ b/charts/metaflow/charts/metaflow-ui/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.4.13 description: A Helm chart to deploy Metaflow UI components. name: metaflow-ui type: application -version: 0.3.0 +version: 0.3.1 maintainers: - name: Savin Goyal email: savin@outerbounds.co From f486534c1b285b611be3931655bc2b0b84541357 Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Wed, 26 Feb 2025 16:50:45 -0300 Subject: [PATCH 06/11] fix: make default metastore editable --- charts/metaflow/charts/metaflow-ui/Chart.yaml | 2 +- .../charts/metaflow-ui/templates/backend_deployment.yaml | 2 +- charts/metaflow/charts/metaflow-ui/values.yaml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/metaflow/charts/metaflow-ui/Chart.yaml b/charts/metaflow/charts/metaflow-ui/Chart.yaml index dbc9533..b5e1fc3 100644 --- a/charts/metaflow/charts/metaflow-ui/Chart.yaml +++ b/charts/metaflow/charts/metaflow-ui/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.4.13 description: A Helm chart to deploy Metaflow UI components. name: metaflow-ui type: application -version: 0.3.1 +version: 0.3.2 maintainers: - name: Savin Goyal email: savin@outerbounds.co diff --git a/charts/metaflow/charts/metaflow-ui/templates/backend_deployment.yaml b/charts/metaflow/charts/metaflow-ui/templates/backend_deployment.yaml index 65c2ddd..d950d38 100644 --- a/charts/metaflow/charts/metaflow-ui/templates/backend_deployment.yaml +++ b/charts/metaflow/charts/metaflow-ui/templates/backend_deployment.yaml @@ -70,7 +70,7 @@ spec: - name: METAFLOW_SERVICE_URL value: {{ .Values.uiBackend.metaflowServiceURL | quote }} - name: METAFLOW_DEFAULT_DATASTORE - value: "s3" + value: {{ .Values.uiBackend.defaultMetastore }} - name: METAFLOW_DEFAULT_METADATA value: "service" {{- include "metaflow-ui.metadatadbEnvVars" . | nindent 12 }} diff --git a/charts/metaflow/charts/metaflow-ui/values.yaml b/charts/metaflow/charts/metaflow-ui/values.yaml index 498000a..c8355f8 100644 --- a/charts/metaflow/charts/metaflow-ui/values.yaml +++ b/charts/metaflow/charts/metaflow-ui/values.yaml @@ -38,6 +38,7 @@ uiBackend: replicaCount: 1 + defaultMetastore: "s3" metaflowDatastoreSysRootS3: "" # The root S3 bucket prefix that will be used by metaflow From 819ecab7dd76a21201f5777ec909e750608fc163 Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Tue, 11 Mar 2025 09:57:29 -0300 Subject: [PATCH 07/11] fix: add env templating for extra env variables rendering in deployment --- charts/metaflow/charts/metaflow-service/Chart.yaml | 2 +- .../charts/metaflow-service/templates/deployment.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/metaflow/charts/metaflow-service/Chart.yaml b/charts/metaflow/charts/metaflow-service/Chart.yaml index 6286484..c0a5e6d 100644 --- a/charts/metaflow/charts/metaflow-service/Chart.yaml +++ b/charts/metaflow/charts/metaflow-service/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.4.13 description: A Helm chart to deploy Metadata Service for Metaflow name: metaflow-service type: application -version: 0.2.0 +version: 0.2.1 maintainers: - name: Savin Goyal email: savin@outerbounds.co diff --git a/charts/metaflow/charts/metaflow-service/templates/deployment.yaml b/charts/metaflow/charts/metaflow-service/templates/deployment.yaml index 0ac31e6..8332d74 100644 --- a/charts/metaflow/charts/metaflow-service/templates/deployment.yaml +++ b/charts/metaflow/charts/metaflow-service/templates/deployment.yaml @@ -67,6 +67,10 @@ spec: {{- end }} env: {{- include "metaflow-service.metadatadbEnvVars" . | nindent 12 }} + {{- range .Values.uiBackend.env }} + - name: {{ .name | quote }} + value: {{ .value | quote }} + {{- end }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} From eeb99b8b5da8a4090c55ae9b8533357c55826f9c Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Tue, 11 Mar 2025 10:01:48 -0300 Subject: [PATCH 08/11] fix: reference env from correct values key --- charts/metaflow/charts/metaflow-service/Chart.yaml | 2 +- .../metaflow/charts/metaflow-service/templates/deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/metaflow/charts/metaflow-service/Chart.yaml b/charts/metaflow/charts/metaflow-service/Chart.yaml index c0a5e6d..7d477ad 100644 --- a/charts/metaflow/charts/metaflow-service/Chart.yaml +++ b/charts/metaflow/charts/metaflow-service/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.4.13 description: A Helm chart to deploy Metadata Service for Metaflow name: metaflow-service type: application -version: 0.2.1 +version: 0.2.2 maintainers: - name: Savin Goyal email: savin@outerbounds.co diff --git a/charts/metaflow/charts/metaflow-service/templates/deployment.yaml b/charts/metaflow/charts/metaflow-service/templates/deployment.yaml index 8332d74..ea5694b 100644 --- a/charts/metaflow/charts/metaflow-service/templates/deployment.yaml +++ b/charts/metaflow/charts/metaflow-service/templates/deployment.yaml @@ -67,7 +67,7 @@ spec: {{- end }} env: {{- include "metaflow-service.metadatadbEnvVars" . | nindent 12 }} - {{- range .Values.uiBackend.env }} + {{- range .Values.env }} - name: {{ .name | quote }} value: {{ .value | quote }} {{- end }} From 2394eba0c898e38f7c050b2fcd461711bcbcddd6 Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Wed, 26 Mar 2025 14:31:49 -0300 Subject: [PATCH 09/11] fix: remove failing line for metaflow-service ingress template --- charts/metaflow/charts/metaflow-service/Chart.yaml | 2 +- charts/metaflow/charts/metaflow-service/templates/ingress.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/metaflow/charts/metaflow-service/Chart.yaml b/charts/metaflow/charts/metaflow-service/Chart.yaml index 7d477ad..c2fe2e0 100644 --- a/charts/metaflow/charts/metaflow-service/Chart.yaml +++ b/charts/metaflow/charts/metaflow-service/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.4.13 description: A Helm chart to deploy Metadata Service for Metaflow name: metaflow-service type: application -version: 0.2.2 +version: 0.2.3 maintainers: - name: Savin Goyal email: savin@outerbounds.co diff --git a/charts/metaflow/charts/metaflow-service/templates/ingress.yaml b/charts/metaflow/charts/metaflow-service/templates/ingress.yaml index 1d31cb8..096fcd4 100644 --- a/charts/metaflow/charts/metaflow-service/templates/ingress.yaml +++ b/charts/metaflow/charts/metaflow-service/templates/ingress.yaml @@ -1,7 +1,6 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "metaflow-service.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- $kubeVersion := default "1.14.0" (lookup "version" "") -}} {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" $kubeVersion)) }} {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} From 54d16f75a93baabc7fa5eb809d60efdbb1f67027 Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Wed, 26 Mar 2025 14:51:54 -0300 Subject: [PATCH 10/11] fix: ingres template --- charts/metaflow/charts/metaflow-service/Chart.yaml | 2 +- charts/metaflow/charts/metaflow-service/templates/ingress.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/metaflow/charts/metaflow-service/Chart.yaml b/charts/metaflow/charts/metaflow-service/Chart.yaml index c2fe2e0..4a96b17 100644 --- a/charts/metaflow/charts/metaflow-service/Chart.yaml +++ b/charts/metaflow/charts/metaflow-service/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.4.13 description: A Helm chart to deploy Metadata Service for Metaflow name: metaflow-service type: application -version: 0.2.3 +version: 0.2.4 maintainers: - name: Savin Goyal email: savin@outerbounds.co diff --git a/charts/metaflow/charts/metaflow-service/templates/ingress.yaml b/charts/metaflow/charts/metaflow-service/templates/ingress.yaml index 096fcd4..46e2a07 100644 --- a/charts/metaflow/charts/metaflow-service/templates/ingress.yaml +++ b/charts/metaflow/charts/metaflow-service/templates/ingress.yaml @@ -1,6 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "metaflow-service.fullname" . -}} {{- $svcPort := .Values.service.port -}} +{{- $kubeVersion := default "1.14.0" .Capabilities.KubeVersion.GitVersion -}} {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" $kubeVersion)) }} {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} From 2d8d05349f6c64abb0cb0cac421903b67621daf5 Mon Sep 17 00:00:00 2001 From: Joao Moura Date: Thu, 17 Apr 2025 10:51:27 -0300 Subject: [PATCH 11/11] feat: add capability to mount volumes in backendui --- charts/metaflow/charts/metaflow-ui/Chart.yaml | 2 +- .../metaflow-ui/templates/backend_deployment.yaml | 8 ++++++++ charts/metaflow/charts/metaflow-ui/values.yaml | 10 ++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/charts/metaflow/charts/metaflow-ui/Chart.yaml b/charts/metaflow/charts/metaflow-ui/Chart.yaml index b5e1fc3..b2d96ad 100644 --- a/charts/metaflow/charts/metaflow-ui/Chart.yaml +++ b/charts/metaflow/charts/metaflow-ui/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v2.4.13 description: A Helm chart to deploy Metaflow UI components. name: metaflow-ui type: application -version: 0.3.2 +version: 0.4.0 maintainers: - name: Savin Goyal email: savin@outerbounds.co diff --git a/charts/metaflow/charts/metaflow-ui/templates/backend_deployment.yaml b/charts/metaflow/charts/metaflow-ui/templates/backend_deployment.yaml index d950d38..411f867 100644 --- a/charts/metaflow/charts/metaflow-ui/templates/backend_deployment.yaml +++ b/charts/metaflow/charts/metaflow-ui/templates/backend_deployment.yaml @@ -76,6 +76,14 @@ spec: {{- include "metaflow-ui.metadatadbEnvVars" . | nindent 12 }} resources: {{- toYaml .Values.uiBackend.resources | nindent 12 }} + {{- with .Values.uiBackend.volumeMounts }} + volumeMounts: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.uiBackend.volumes }} + volumes: + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/metaflow/charts/metaflow-ui/values.yaml b/charts/metaflow/charts/metaflow-ui/values.yaml index c8355f8..30e1505 100644 --- a/charts/metaflow/charts/metaflow-ui/values.yaml +++ b/charts/metaflow/charts/metaflow-ui/values.yaml @@ -31,6 +31,16 @@ uiBackend: # requests: # cpu: 100m # memory: 128Mi + + volumes: [] + # volumes: + # - name: x + # secret: + # name: x + volumeMounts: [] + # volumeMounts: + # - mountPath: /x + # name: x service: type: ClusterIP