upgrade central dashboard + some general fixes

Signed-off-by: David van der Spek <[email protected]>

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

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 }}
 
 {{/*

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: []

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 }}