Skip to content

fix duplicated labels in metaflow ui static deployment #70

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.

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

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
1 change: 0 additions & 1 deletion .github/workflows/publish_helm_charts.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name: Release Charts

on:
push:
branches:
Expand Down
2 changes: 1 addition & 1 deletion charts/metaflow/charts/metaflow-service/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4
maintainers:
- name: Savin Goyal
email: savin@outerbounds.co
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ spec:
{{- end }}
env:
{{- include "metaflow-service.metadatadbEnvVars" . | nindent 12 }}
{{- range .Values.env }}
- name: {{ .name | quote }}
value: {{ .value | quote }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "metaflow-service.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- $kubeVersion := default "1.14.0" (lookup "version" "") -}}
{{- $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}}
Expand Down
2 changes: 1 addition & 1 deletion charts/metaflow/charts/metaflow-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.0
maintainers:
- name: Savin Goyal
email: savin@outerbounds.co
Expand Down
1 change: 0 additions & 1 deletion charts/metaflow/charts/metaflow-ui/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,20 @@ 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 }}
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 }}
Expand Down
11 changes: 11 additions & 0 deletions charts/metaflow/charts/metaflow-ui/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,24 @@ uiBackend:
# requests:
# cpu: 100m
# memory: 128Mi

volumes: []
# volumes:
# - name: x
# secret:
# name: x
volumeMounts: []
# volumeMounts:
# - mountPath: /x
# name: x

service:
type: ClusterIP
port: 8083

replicaCount: 1

defaultMetastore: "s3"
metaflowDatastoreSysRootS3: ""
# The root S3 bucket prefix that will be used by metaflow

Expand Down