From f1cb50a57126b36431eefc4309b21b474be0a58f Mon Sep 17 00:00:00 2001 From: David van der Spek Date: Fri, 15 Sep 2023 12:10:45 +0200 Subject: [PATCH] upgrade central dashboard + some general fixes Signed-off-by: David van der Spek --- kubeflow/helm/central-dashboard/Chart.yaml | 2 +- .../central-dashboard/templates/_helpers.tpl | 2 +- .../templates/clusterrole.yaml | 325 ------------------ .../templates/configmap.yaml | 23 +- .../templates/deployment.yaml | 5 + .../templates/kubeflow-cluster-roles.yaml | 324 +++++++++++++++++ kubeflow/helm/central-dashboard/values.yaml | 7 +- .../helm/central-dashboard/values.yaml.tpl | 9 +- kubeflow/helm/katib/templates/_helpers.tpl | 4 +- .../helm/notebooks/templates/_helpers.tpl | 4 +- .../profile-controller/templates/_helpers.tpl | 2 +- kubeflow/helm/serving/templates/_helpers.tpl | 1 - .../helm/tensorboards/templates/_helpers.tpl | 3 +- kubeflow/helm/volumes/templates/_helpers.tpl | 3 +- 14 files changed, 364 insertions(+), 350 deletions(-) diff --git a/kubeflow/helm/central-dashboard/Chart.yaml b/kubeflow/helm/central-dashboard/Chart.yaml index 5523ce308..24e228655 100644 --- a/kubeflow/helm/central-dashboard/Chart.yaml +++ b/kubeflow/helm/central-dashboard/Chart.yaml @@ -3,7 +3,7 @@ name: central-dashboard description: A Helm chart for Kubernetes type: application version: 0.1.37 -appVersion: "1.4.0" +appVersion: "v1.8.0-rc.0" # dependencies: # - name: profile-controller # version: 0.1.2 diff --git a/kubeflow/helm/central-dashboard/templates/_helpers.tpl b/kubeflow/helm/central-dashboard/templates/_helpers.tpl index c1bd8bff9..06c412160 100644 --- a/kubeflow/helm/central-dashboard/templates/_helpers.tpl +++ b/kubeflow/helm/central-dashboard/templates/_helpers.tpl @@ -37,6 +37,7 @@ Common labels helm.sh/chart: {{ include "central-dashboard.chart" . }} {{ include "central-dashboard.selectorLabels" . }} {{- if .Chart.AppVersion }} +version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} @@ -49,7 +50,6 @@ Selector labels app: {{ include "central-dashboard.name" . }} app.kubernetes.io/name: {{ include "central-dashboard.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} -version: {{ .Chart.AppVersion | quote }} {{- end }} {{/* diff --git a/kubeflow/helm/central-dashboard/templates/clusterrole.yaml b/kubeflow/helm/central-dashboard/templates/clusterrole.yaml index b3fd5b4ee..5cdac2c63 100644 --- a/kubeflow/helm/central-dashboard/templates/clusterrole.yaml +++ b/kubeflow/helm/central-dashboard/templates/clusterrole.yaml @@ -14,328 +14,3 @@ rules: - get - list - watch ---- -aggregationRule: - clusterRoleSelectors: - - matchLabels: - rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - labels: {{- include "central-dashboard.labels" . | nindent 4 }} - name: kubeflow-admin -rules: [] ---- -aggregationRule: - clusterRoleSelectors: - - matchLabels: - rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - labels: {{- include "central-dashboard.labels" . | nindent 4 }} - rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" - name: kubeflow-edit -rules: [] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - labels: {{- include "central-dashboard.labels" . | nindent 4 }} - rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" - name: kubeflow-kubernetes-admin -rules: - - apiGroups: - - authorization.k8s.io - resources: - - localsubjectaccessreviews - verbs: - - create - - apiGroups: - - rbac.authorization.k8s.io - resources: - - rolebindings - - roles - verbs: - - create - - delete - - deletecollection - - get - - list - - patch - - update - - watch ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - labels: {{- include "central-dashboard.labels" . | nindent 4 }} - rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" - name: kubeflow-kubernetes-edit -rules: - - apiGroups: - - "" - resources: - - pods/attach - - pods/exec - - pods/portforward - - pods/proxy - - secrets - - services/proxy - verbs: - - get - - list - - watch - - apiGroups: - - "" - resources: - - serviceaccounts - verbs: - - impersonate - - apiGroups: - - "" - resources: - - pods - - pods/attach - - pods/exec - - pods/portforward - - pods/proxy - verbs: - - create - - delete - - deletecollection - - patch - - update - - apiGroups: - - "" - resources: - - configmaps - - endpoints - - persistentvolumeclaims - - replicationcontrollers - - replicationcontrollers/scale - - secrets - - serviceaccounts - - services - - services/proxy - verbs: - - create - - delete - - deletecollection - - patch - - update - - apiGroups: - - apps - resources: - - daemonsets - - deployments - - deployments/rollback - - deployments/scale - - replicasets - - replicasets/scale - - statefulsets - - statefulsets/scale - verbs: - - create - - delete - - deletecollection - - patch - - update - - apiGroups: - - autoscaling - resources: - - horizontalpodautoscalers - verbs: - - create - - delete - - deletecollection - - patch - - update - - apiGroups: - - batch - resources: - - cronjobs - - jobs - verbs: - - create - - delete - - deletecollection - - patch - - update - - apiGroups: - - extensions - resources: - - daemonsets - - deployments - - deployments/rollback - - deployments/scale - - ingresses - - networkpolicies - - replicasets - - replicasets/scale - - replicationcontrollers/scale - verbs: - - create - - delete - - deletecollection - - patch - - update - - apiGroups: - - policy - resources: - - poddisruptionbudgets - verbs: - - create - - delete - - deletecollection - - patch - - update - - apiGroups: - - networking.k8s.io - resources: - - ingresses - - networkpolicies - verbs: - - create - - delete - - deletecollection - - patch - - update ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - labels: {{- include "central-dashboard.labels" . | nindent 4 }} - rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true" - name: kubeflow-kubernetes-view -rules: - - apiGroups: - - "" - resources: - - configmaps - - endpoints - - persistentvolumeclaims - - persistentvolumeclaims/status - - pods - - replicationcontrollers - - replicationcontrollers/scale - - serviceaccounts - - services - - services/status - verbs: - - get - - list - - watch - - apiGroups: - - "" - resources: - - bindings - - events - - limitranges - - namespaces/status - - pods/log - - pods/status - - replicationcontrollers/status - - resourcequotas - - resourcequotas/status - verbs: - - get - - list - - watch - - apiGroups: - - "" - resources: - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - apps - resources: - - controllerrevisions - - daemonsets - - daemonsets/status - - deployments - - deployments/scale - - deployments/status - - replicasets - - replicasets/scale - - replicasets/status - - statefulsets - - statefulsets/scale - - statefulsets/status - verbs: - - get - - list - - watch - - apiGroups: - - autoscaling - resources: - - horizontalpodautoscalers - - horizontalpodautoscalers/status - verbs: - - get - - list - - watch - - apiGroups: - - batch - resources: - - cronjobs - - cronjobs/status - - jobs - - jobs/status - verbs: - - get - - list - - watch - - apiGroups: - - extensions - resources: - - daemonsets - - daemonsets/status - - deployments - - deployments/scale - - deployments/status - - ingresses - - ingresses/status - - networkpolicies - - replicasets - - replicasets/scale - - replicasets/status - - replicationcontrollers/scale - verbs: - - get - - list - - watch - - apiGroups: - - policy - resources: - - poddisruptionbudgets - - poddisruptionbudgets/status - verbs: - - get - - list - - watch - - apiGroups: - - networking.k8s.io - resources: - - ingresses - - ingresses/status - - networkpolicies - verbs: - - get - - list - - watch ---- -aggregationRule: - clusterRoleSelectors: - - matchLabels: - rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true" -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - labels: {{- include "central-dashboard.labels" . | nindent 4 }} - rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" - name: kubeflow-view -rules: [] diff --git a/kubeflow/helm/central-dashboard/templates/configmap.yaml b/kubeflow/helm/central-dashboard/templates/configmap.yaml index 99f22ffb5..ba388d7c3 100644 --- a/kubeflow/helm/central-dashboard/templates/configmap.yaml +++ b/kubeflow/helm/central-dashboard/templates/configmap.yaml @@ -26,6 +26,14 @@ data: "text": "Tensorboards", "icon": "assessment" {{ end }} + {{ if eq .Values.kubeflowComponents.serving.enabled true }} + }, + { + "type": "item", + "link": "/models/", + "text": "Endpoints", + "icon": "kubeflow:models" + {{ end }} {{ if eq .Values.kubeflowComponents.katib.enabled true }} }, { @@ -72,14 +80,6 @@ data: "text": "Executions", "icon": "av:play-arrow" {{ end }} - {{ if eq .Values.kubeflowComponents.serving.enabled true }} - }, - { - "type": "item", - "link": "/models/", - "text": "Models", - "icon": "kubeflow:models" - {{ end }} } ], "externalLinks": [ ], @@ -136,6 +136,13 @@ data: PROFILES_KFAM_SERVICE_HOST: {{ .Values.config.profileControllerService }} PROFILES_KFAM_SERVICE_PORT: {{ .Values.config.kfamPort | quote }} DASHBOARD_CONFIGMAP: {{ include "central-dashboard.fullname" . }}-config + LOGOUT_URL: {{ .Values.config.logoutURL | quote }} + {{- if .Values.config.prometheusURL }} + PROMETHEUS_URL: {{ .Values.config.prometheusURL | quote }} + {{- end }} + {{- if .Values.config.metricsDashboard }} + METRICS_DASHBOARD: {{ .Values.config.metricsDashboard | quote }} + {{- end }} kind: ConfigMap metadata: labels: {{- include "central-dashboard.labels" . | nindent 4 }} diff --git a/kubeflow/helm/central-dashboard/templates/deployment.yaml b/kubeflow/helm/central-dashboard/templates/deployment.yaml index 4837d5f58..3323a3210 100644 --- a/kubeflow/helm/central-dashboard/templates/deployment.yaml +++ b/kubeflow/helm/central-dashboard/templates/deployment.yaml @@ -36,6 +36,11 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + env: + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace ports: - name: website containerPort: 8082 diff --git a/kubeflow/helm/central-dashboard/templates/kubeflow-cluster-roles.yaml b/kubeflow/helm/central-dashboard/templates/kubeflow-cluster-roles.yaml index 462f29737..87a525167 100644 --- a/kubeflow/helm/central-dashboard/templates/kubeflow-cluster-roles.yaml +++ b/kubeflow/helm/central-dashboard/templates/kubeflow-cluster-roles.yaml @@ -1,3 +1,327 @@ +aggregationRule: + clusterRoleSelectors: + - matchLabels: + rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: {{- include "central-dashboard.labels" . | nindent 4 }} + name: kubeflow-admin +rules: [] +--- +aggregationRule: + clusterRoleSelectors: + - matchLabels: + rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: {{- include "central-dashboard.labels" . | nindent 4 }} + rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" + name: kubeflow-edit +rules: [] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: {{- include "central-dashboard.labels" . | nindent 4 }} + rbac.authorization.kubeflow.org/aggregate-to-kubeflow-admin: "true" + name: kubeflow-kubernetes-admin +rules: + - apiGroups: + - authorization.k8s.io + resources: + - localsubjectaccessreviews + verbs: + - create + - apiGroups: + - rbac.authorization.k8s.io + resources: + - rolebindings + - roles + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: {{- include "central-dashboard.labels" . | nindent 4 }} + rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" + name: kubeflow-kubernetes-edit +rules: + - apiGroups: + - "" + resources: + - pods/attach + - pods/exec + - pods/portforward + - pods/proxy + - secrets + - services/proxy + verbs: + - get + - list + - watch + - apiGroups: + - "" + resources: + - serviceaccounts + verbs: + - impersonate + - apiGroups: + - "" + resources: + - pods + - pods/attach + - pods/exec + - pods/portforward + - pods/proxy + verbs: + - create + - delete + - deletecollection + - patch + - update + - apiGroups: + - "" + resources: + - configmaps + - endpoints + - persistentvolumeclaims + - replicationcontrollers + - replicationcontrollers/scale + - secrets + - serviceaccounts + - services + - services/proxy + verbs: + - create + - delete + - deletecollection + - patch + - update + - apiGroups: + - apps + resources: + - daemonsets + - deployments + - deployments/rollback + - deployments/scale + - replicasets + - replicasets/scale + - statefulsets + - statefulsets/scale + verbs: + - create + - delete + - deletecollection + - patch + - update + - apiGroups: + - autoscaling + resources: + - horizontalpodautoscalers + verbs: + - create + - delete + - deletecollection + - patch + - update + - apiGroups: + - batch + resources: + - cronjobs + - jobs + verbs: + - create + - delete + - deletecollection + - patch + - update + - apiGroups: + - extensions + resources: + - daemonsets + - deployments + - deployments/rollback + - deployments/scale + - ingresses + - networkpolicies + - replicasets + - replicasets/scale + - replicationcontrollers/scale + verbs: + - create + - delete + - deletecollection + - patch + - update + - apiGroups: + - policy + resources: + - poddisruptionbudgets + verbs: + - create + - delete + - deletecollection + - patch + - update + - apiGroups: + - networking.k8s.io + resources: + - ingresses + - networkpolicies + verbs: + - create + - delete + - deletecollection + - patch + - update +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: {{- include "central-dashboard.labels" . | nindent 4 }} + rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true" + name: kubeflow-kubernetes-view +rules: + - apiGroups: + - "" + resources: + - configmaps + - endpoints + - persistentvolumeclaims + - persistentvolumeclaims/status + - pods + - replicationcontrollers + - replicationcontrollers/scale + - serviceaccounts + - services + - services/status + verbs: + - get + - list + - watch + - apiGroups: + - "" + resources: + - bindings + - events + - limitranges + - namespaces/status + - pods/log + - pods/status + - replicationcontrollers/status + - resourcequotas + - resourcequotas/status + verbs: + - get + - list + - watch + - apiGroups: + - "" + resources: + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - apps + resources: + - controllerrevisions + - daemonsets + - daemonsets/status + - deployments + - deployments/scale + - deployments/status + - replicasets + - replicasets/scale + - replicasets/status + - statefulsets + - statefulsets/scale + - statefulsets/status + verbs: + - get + - list + - watch + - apiGroups: + - autoscaling + resources: + - horizontalpodautoscalers + - horizontalpodautoscalers/status + verbs: + - get + - list + - watch + - apiGroups: + - batch + resources: + - cronjobs + - cronjobs/status + - jobs + - jobs/status + verbs: + - get + - list + - watch + - apiGroups: + - extensions + resources: + - daemonsets + - daemonsets/status + - deployments + - deployments/scale + - deployments/status + - ingresses + - ingresses/status + - networkpolicies + - replicasets + - replicasets/scale + - replicasets/status + - replicationcontrollers/scale + verbs: + - get + - list + - watch + - apiGroups: + - policy + resources: + - poddisruptionbudgets + - poddisruptionbudgets/status + verbs: + - get + - list + - watch + - apiGroups: + - networking.k8s.io + resources: + - ingresses + - ingresses/status + - networkpolicies + verbs: + - get + - list + - watch +--- +aggregationRule: + clusterRoleSelectors: + - matchLabels: + rbac.authorization.kubeflow.org/aggregate-to-kubeflow-view: "true" +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: {{- include "central-dashboard.labels" . | nindent 4 }} + rbac.authorization.kubeflow.org/aggregate-to-kubeflow-edit: "true" + name: kubeflow-view +rules: [] --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole diff --git a/kubeflow/helm/central-dashboard/values.yaml b/kubeflow/helm/central-dashboard/values.yaml index fc97cc5c6..177839e00 100644 --- a/kubeflow/helm/central-dashboard/values.yaml +++ b/kubeflow/helm/central-dashboard/values.yaml @@ -33,10 +33,10 @@ kubeflowComponents: replicaCount: 1 image: - repository: public.ecr.aws/j1r0q0g6/notebooks/central-dashboard + repository: docker.io/kubeflownotebookswg/centraldashboard # TODO: switch to Angular version once it's decent pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: v1.4 + tag: v1.8.0-rc.0 imagePullSecrets: [] nameOverride: "" @@ -74,6 +74,9 @@ service: config: profileControllerService: kubeflow-profile-controller-kfam.kubeflow.svc.cluster.local kfamPort: 8082 + logoutURL: /logout + prometheusURL: "" # TODO: we need to add support for adding headers for compatibility with in-cluster Mimir. For Trace Shield we would need either basic auth or proper OAuth2 + metricsDashboard: "" # TODO: based on https://github.com/kubeflow/kubeflow/pull/7116 this allows you to add a link to a Grafana dashboard or something registrationFlow: enabled: true diff --git a/kubeflow/helm/central-dashboard/values.yaml.tpl b/kubeflow/helm/central-dashboard/values.yaml.tpl index 72a2d2f05..af0438295 100644 --- a/kubeflow/helm/central-dashboard/values.yaml.tpl +++ b/kubeflow/helm/central-dashboard/values.yaml.tpl @@ -1,7 +1,14 @@ -{{ $hostname := .Values.hostname }} +{{- $hostname := .Values.hostname -}} +{{- $monitoringNamespace := namespace "monitoring" -}} + global: application: links: - description: kubeflow dashboard ui url: {{ $hostname }} domain: {{ $hostname }} + +{{- if chartInstalled "monitoring" "monitoring" }} +config: + prometheusURL: http://monitoring-prometheus.{{ $monitoringNamespace }}:9090 +{{- end }} diff --git a/kubeflow/helm/katib/templates/_helpers.tpl b/kubeflow/helm/katib/templates/_helpers.tpl index b11aabf68..7ea541b2b 100644 --- a/kubeflow/helm/katib/templates/_helpers.tpl +++ b/kubeflow/helm/katib/templates/_helpers.tpl @@ -37,6 +37,7 @@ Common labels helm.sh/chart: {{ include "katib.chart" . }} {{ include "katib.selectorLabels" . }} {{- if .Chart.AppVersion }} +version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} @@ -49,7 +50,6 @@ Selector labels app: {{ include "katib.name" . }} app.kubernetes.io/name: {{ include "katib.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} -version: {{ .Chart.AppVersion | quote }} {{- end }} {{/* @@ -59,7 +59,6 @@ Controller selector labels app: {{ include "katib.name" . }}-controller app.kubernetes.io/name: {{ include "katib.name" . }}-controller app.kubernetes.io/instance: {{ .Release.Name }} -version: {{ .Chart.AppVersion | quote }} {{- end }} {{/* @@ -69,7 +68,6 @@ DB Manager selector labels app: {{ include "katib.name" . }}-db-manager app.kubernetes.io/name: {{ include "katib.name" . }}-db-manager app.kubernetes.io/instance: {{ .Release.Name }} -version: {{ .Chart.AppVersion | quote }} {{- end }} {{/* diff --git a/kubeflow/helm/notebooks/templates/_helpers.tpl b/kubeflow/helm/notebooks/templates/_helpers.tpl index e3dbcb725..6163d6edf 100644 --- a/kubeflow/helm/notebooks/templates/_helpers.tpl +++ b/kubeflow/helm/notebooks/templates/_helpers.tpl @@ -37,6 +37,7 @@ Common labels helm.sh/chart: {{ include "notebooks.chart" . }} {{ include "notebooks.selectorLabels" . }} {{- if .Chart.AppVersion }} +version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} @@ -49,7 +50,6 @@ Selector labels app: {{ include "notebooks.name" . }} app.kubernetes.io/name: {{ include "notebooks.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} -version: {{ .Chart.AppVersion | quote }} {{- end }} {{/* @@ -59,7 +59,6 @@ Controller selector labels app: {{ include "notebooks.name" . }}-controller app.kubernetes.io/name: {{ include "notebooks.name" . }}-controller app.kubernetes.io/instance: {{ .Release.Name }} -version: {{ .Chart.AppVersion | quote }} {{- end }} {{/* @@ -69,7 +68,6 @@ Pod Defaults selector labels app: {{ include "notebooks.name" . }}-pod-defaults app.kubernetes.io/name: {{ include "notebooks.name" . }}-pod-defaults app.kubernetes.io/instance: {{ .Release.Name }} -version: {{ .Chart.AppVersion | quote }} {{- end }} {{/* diff --git a/kubeflow/helm/profile-controller/templates/_helpers.tpl b/kubeflow/helm/profile-controller/templates/_helpers.tpl index 59f985a0a..238fbc23d 100644 --- a/kubeflow/helm/profile-controller/templates/_helpers.tpl +++ b/kubeflow/helm/profile-controller/templates/_helpers.tpl @@ -37,6 +37,7 @@ Common labels helm.sh/chart: {{ include "profile-controller.chart" . }} {{ include "profile-controller.selectorLabels" . }} {{- if .Chart.AppVersion }} +version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} @@ -49,7 +50,6 @@ Selector labels app: {{ include "profile-controller.name" . }} app.kubernetes.io/name: {{ include "profile-controller.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} -version: {{ .Chart.AppVersion | quote }} {{- end }} {{/* diff --git a/kubeflow/helm/serving/templates/_helpers.tpl b/kubeflow/helm/serving/templates/_helpers.tpl index 965803229..2ec794cd4 100644 --- a/kubeflow/helm/serving/templates/_helpers.tpl +++ b/kubeflow/helm/serving/templates/_helpers.tpl @@ -59,7 +59,6 @@ Controller selector labels app: {{ include "serving.name" . }}-controller app.kubernetes.io/name: {{ include "serving.name" . }}-controller app.kubernetes.io/instance: {{ .Release.Name }} -version: {{ .Chart.AppVersion | quote }} {{- end }} {{/* diff --git a/kubeflow/helm/tensorboards/templates/_helpers.tpl b/kubeflow/helm/tensorboards/templates/_helpers.tpl index e7b3491dd..997b43aeb 100644 --- a/kubeflow/helm/tensorboards/templates/_helpers.tpl +++ b/kubeflow/helm/tensorboards/templates/_helpers.tpl @@ -37,6 +37,7 @@ Common labels helm.sh/chart: {{ include "tensorboards.chart" . }} {{ include "tensorboards.selectorLabels" . }} {{- if .Chart.AppVersion }} +version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} @@ -49,7 +50,6 @@ Selector labels app: {{ include "tensorboards.name" . }} app.kubernetes.io/name: {{ include "tensorboards.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} -version: {{ .Chart.AppVersion | quote }} {{- end }} {{/* @@ -59,7 +59,6 @@ Controller selector labels app: {{ include "tensorboards.name" . }}-controller app.kubernetes.io/name: {{ include "tensorboards.name" . }}-controller app.kubernetes.io/instance: {{ .Release.Name }} -version: {{ .Chart.AppVersion | quote }} {{- end }} {{/* diff --git a/kubeflow/helm/volumes/templates/_helpers.tpl b/kubeflow/helm/volumes/templates/_helpers.tpl index 1971f39b9..ccf8531fd 100644 --- a/kubeflow/helm/volumes/templates/_helpers.tpl +++ b/kubeflow/helm/volumes/templates/_helpers.tpl @@ -37,6 +37,7 @@ Common labels helm.sh/chart: {{ include "volumes.chart" . }} {{ include "volumes.selectorLabels" . }} {{- if .Chart.AppVersion }} +version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} @@ -49,7 +50,6 @@ Selector labels app: {{ include "volumes.name" . }} app.kubernetes.io/name: {{ include "volumes.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} -version: {{ .Chart.AppVersion | quote }} {{- end }} {{/* @@ -59,7 +59,6 @@ Controller selector labels app: {{ include "volumes.name" . }}-controller app.kubernetes.io/name: {{ include "volumes.name" . }}-controller app.kubernetes.io/instance: {{ .Release.Name }} -version: {{ .Chart.AppVersion | quote }} {{- end }} {{/*