From a90aec40e6086d2283d3cd68cba023b822e7090a Mon Sep 17 00:00:00 2001 From: wg102 Date: Mon, 17 Jan 2022 17:58:46 -0500 Subject: [PATCH 1/2] feat(component): Add apps component centraldashboard Signed-off-by: wg102 --- .../apps/central-dashboard/deployment.yaml | 17 +++ .../central-dashboard/deployment_patch.yaml | 16 +++ .../enable-registration-flow.yaml | 13 ++ .../apps/central-dashboard/kustomization.yaml | 11 ++ .../central-dashboard/links-configmap.yaml | 132 ++++++++++++++++++ 5 files changed, 189 insertions(+) create mode 100644 kustomize/apps/central-dashboard/deployment.yaml create mode 100644 kustomize/apps/central-dashboard/deployment_patch.yaml create mode 100644 kustomize/apps/central-dashboard/enable-registration-flow.yaml create mode 100644 kustomize/apps/central-dashboard/kustomization.yaml create mode 100644 kustomize/apps/central-dashboard/links-configmap.yaml diff --git a/kustomize/apps/central-dashboard/deployment.yaml b/kustomize/apps/central-dashboard/deployment.yaml new file mode 100644 index 0000000..bb85f23 --- /dev/null +++ b/kustomize/apps/central-dashboard/deployment.yaml @@ -0,0 +1,17 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: centraldashboard + name: centraldashboard +spec: + replicas: 1 + template: + spec: + containers: + - image: k8scc01covidacr.azurecr.io/kubeflow/centraldashboard:a96d1cd8523f895904051e122fa98db5c0017bd6 + imagePullPolicy: IfNotPresent + name: centraldashboard + serviceAccountName: centraldashboard + imagePullSecrets: + - name: k8scc01covidacr-registry-connection diff --git a/kustomize/apps/central-dashboard/deployment_patch.yaml b/kustomize/apps/central-dashboard/deployment_patch.yaml new file mode 100644 index 0000000..0fdf121 --- /dev/null +++ b/kustomize/apps/central-dashboard/deployment_patch.yaml @@ -0,0 +1,16 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: centraldashboard + labels: + app: centraldashboard +spec: + template: + spec: + containers: + - name: centraldashboard + env: + - name: UI + value: default + - name: DASHBOARD_LINKS_CONFIGMAP + value: centraldashboard-links-config diff --git a/kustomize/apps/central-dashboard/enable-registration-flow.yaml b/kustomize/apps/central-dashboard/enable-registration-flow.yaml new file mode 100644 index 0000000..b1e691b --- /dev/null +++ b/kustomize/apps/central-dashboard/enable-registration-flow.yaml @@ -0,0 +1,13 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: centraldashboard + namespace: kubeflow +spec: + template: + spec: + containers: + - name: centraldashboard + env: + - name: REGISTRATION_FLOW + value: "true" \ No newline at end of file diff --git a/kustomize/apps/central-dashboard/kustomization.yaml b/kustomize/apps/central-dashboard/kustomization.yaml new file mode 100644 index 0000000..e7d40c6 --- /dev/null +++ b/kustomize/apps/central-dashboard/kustomization.yaml @@ -0,0 +1,11 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- github.com/kubeflow/kubeflow/components/centraldashboard/manifests/overlays/istio?ref=8901e3af3b83f599b89562162cdb2854f57082d3 # tag=v1.3.0-rc.1 +- links-configmap.yaml + +patchesStrategicMerge: +- enable-registration-flow.yaml +- deployment.yaml +- deployment_patch.yaml diff --git a/kustomize/apps/central-dashboard/links-configmap.yaml b/kustomize/apps/central-dashboard/links-configmap.yaml new file mode 100644 index 0000000..43ecdf2 --- /dev/null +++ b/kustomize/apps/central-dashboard/links-configmap.yaml @@ -0,0 +1,132 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: centraldashboard-links-config + namespace: kubeflow +data: + defaultLanguage: "en" + links: |- + { + "en": { + "menuLinks": [ + { + "link": "/pipeline/", + "text": "Pipelines" + }, + { + "link": "/jupyter/", + "text": "Notebook Servers" + }, + { + "link": "/katib/", + "text": "Katib" + } + ], + "externalLinks": [], + "quickLinks": [ + { + "text": "Upload a pipeline", + "desc": "Pipelines", + "link": "/pipeline/" + }, + { + "text": "View all pipeline runs", + "desc": "Pipelines", + "link": "/pipeline/#/runs" + }, + { + "text": "Create a new Notebook server", + "desc": "Notebook Servers", + "link": "/jupyter/new?namespace=kubeflow" + }, + { + "text": "View Katib Studies", + "desc": "Katib", + "link": "/katib/" + } + ], + "documentationItems": [ + { + "text": "Advanced Analytics Workspace Docs", + "desc": "Helpful guides about our data and analysis tools", + "link": "https://statcan.github.io/daaas/" + }, + { + "text": "Video Tutorial Series", + "desc": "YouTube playlist of videos for getting started with Advanced Analytics Workspace tools", + "link": "https://www.youtube.com/playlist?list=PL1zlA2D7AHugkDdiyeUHWOKGKUd3MB_nD" + }, + { + "text": "Community Chat", + "desc": "Slack workspace for discussion/support - requires sign-up for emails outside @canada.ca", + "link": "https://statcan-aaw.slack.com/" + }, + { + "text": "Official Kubeflow Docs", + "desc": "Advanced documentation for installing, running, and using Kubeflow", + "link": "https://www.kubeflow.org/docs/" + } + ] + }, + "fr": { + "menuLinks": [ + { + "link": "/pipeline/", + "text": "Pipelines" + }, + { + "link": "/jupyter/", + "text": "Serveur Bloc-notes" + }, + { + "link": "/katib/", + "text": "Katib" + } + ], + "externalLinks": [], + "quickLinks": [ + { + "text": "Télécharger un pipeline", + "desc": "Pipelines", + "link": "/pipeline/" + }, + { + "text": "Voir tous les pipelines exécutés", + "desc": "Pipelines", + "link": "/pipeline/#/runs" + }, + { + "text": "Créer un nouveau serveur bloc-notes", + "desc": "Serveur bloc-notes", + "link": "/jupyter/new?namespace=kubeflow" + }, + { + "text": "Voir Katib Studies", + "desc": "Katib", + "link": "/katib/" + } + ], + "documentationItems": [ + { + "text": "Documents de l'espace d'analyses avancées", + "desc": "Guides utiles pour nos données et outils d'analyse", + "link": "https://statcan.github.io/daaas/" + }, + { + "text": "Série de didacticiels vidéos", + "desc": "Playlist de vidéos YouTube pour commencer avec les outils de l'espace d'analyses avancées", + "link": "https://www.youtube.com/playlist?list=PL1zlA2D7AHugkDdiyeUHWOKGKUd3MB_nD" + }, + { + "text": "Clavardage de la communauté", + "desc": "Espace de travail Slack pour discussion/support - besoin de s'inscrire pour les courriels en dehors de @canada.ca", + "link": "https://statcan-aaw.slack.com/" + }, + { + "text": "Documents Kubeflow Officiels", + "desc": "Documentation avancé pour installer, exécuter et utiliser Kubeflow", + "link": "https://www.kubeflow.org/docs/" + } + ] + } + } \ No newline at end of file From a36830758cc632cc9841739bbfbe9817a0026663 Mon Sep 17 00:00:00 2001 From: William Hearn Date: Mon, 17 Jan 2022 19:03:40 -0500 Subject: [PATCH 2/2] feat(component): Add apps component centraldashboard Signed-off-by: William Hearn --- .../apps/central-dashboard/deployment_patch.yaml | 16 ---------------- .../enable-registration-flow.yaml | 13 ------------- .../apps/central-dashboard/kustomization.yaml | 11 ----------- .../centraldashboard-config.yaml} | 8 ++++++-- .../deployment.yaml | 5 ++++- .../apps/centraldashboard/kustomization.yaml | 9 +++++++++ 6 files changed, 19 insertions(+), 43 deletions(-) delete mode 100644 kustomize/apps/central-dashboard/deployment_patch.yaml delete mode 100644 kustomize/apps/central-dashboard/enable-registration-flow.yaml delete mode 100644 kustomize/apps/central-dashboard/kustomization.yaml rename kustomize/apps/{central-dashboard/links-configmap.yaml => centraldashboard/centraldashboard-config.yaml} (97%) rename kustomize/apps/{central-dashboard => centraldashboard}/deployment.yaml (74%) create mode 100644 kustomize/apps/centraldashboard/kustomization.yaml diff --git a/kustomize/apps/central-dashboard/deployment_patch.yaml b/kustomize/apps/central-dashboard/deployment_patch.yaml deleted file mode 100644 index 0fdf121..0000000 --- a/kustomize/apps/central-dashboard/deployment_patch.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: centraldashboard - labels: - app: centraldashboard -spec: - template: - spec: - containers: - - name: centraldashboard - env: - - name: UI - value: default - - name: DASHBOARD_LINKS_CONFIGMAP - value: centraldashboard-links-config diff --git a/kustomize/apps/central-dashboard/enable-registration-flow.yaml b/kustomize/apps/central-dashboard/enable-registration-flow.yaml deleted file mode 100644 index b1e691b..0000000 --- a/kustomize/apps/central-dashboard/enable-registration-flow.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: centraldashboard - namespace: kubeflow -spec: - template: - spec: - containers: - - name: centraldashboard - env: - - name: REGISTRATION_FLOW - value: "true" \ No newline at end of file diff --git a/kustomize/apps/central-dashboard/kustomization.yaml b/kustomize/apps/central-dashboard/kustomization.yaml deleted file mode 100644 index e7d40c6..0000000 --- a/kustomize/apps/central-dashboard/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: -- github.com/kubeflow/kubeflow/components/centraldashboard/manifests/overlays/istio?ref=8901e3af3b83f599b89562162cdb2854f57082d3 # tag=v1.3.0-rc.1 -- links-configmap.yaml - -patchesStrategicMerge: -- enable-registration-flow.yaml -- deployment.yaml -- deployment_patch.yaml diff --git a/kustomize/apps/central-dashboard/links-configmap.yaml b/kustomize/apps/centraldashboard/centraldashboard-config.yaml similarity index 97% rename from kustomize/apps/central-dashboard/links-configmap.yaml rename to kustomize/apps/centraldashboard/centraldashboard-config.yaml index 43ecdf2..43e870c 100644 --- a/kustomize/apps/central-dashboard/links-configmap.yaml +++ b/kustomize/apps/centraldashboard/centraldashboard-config.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: centraldashboard-links-config + name: centraldashboard-config namespace: kubeflow data: defaultLanguage: "en" @@ -129,4 +129,8 @@ data: } ] } - } \ No newline at end of file + } + settings: |- + { + "DASHBOARD_FORCE_IFRAME": true + } diff --git a/kustomize/apps/central-dashboard/deployment.yaml b/kustomize/apps/centraldashboard/deployment.yaml similarity index 74% rename from kustomize/apps/central-dashboard/deployment.yaml rename to kustomize/apps/centraldashboard/deployment.yaml index bb85f23..6f518b9 100644 --- a/kustomize/apps/central-dashboard/deployment.yaml +++ b/kustomize/apps/centraldashboard/deployment.yaml @@ -9,7 +9,10 @@ spec: template: spec: containers: - - image: k8scc01covidacr.azurecr.io/kubeflow/centraldashboard:a96d1cd8523f895904051e122fa98db5c0017bd6 + - env: + - name: REGISTRATION_FLOW + value: "true" + image: k8scc01covidacr.azurecr.io/kubeflow/centraldashboard:a96d1cd8523f895904051e122fa98db5c0017bd6 imagePullPolicy: IfNotPresent name: centraldashboard serviceAccountName: centraldashboard diff --git a/kustomize/apps/centraldashboard/kustomization.yaml b/kustomize/apps/centraldashboard/kustomization.yaml new file mode 100644 index 0000000..a3e2706 --- /dev/null +++ b/kustomize/apps/centraldashboard/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- github.com/kubeflow/manifests/apps/centraldashboard/upstream/overlays/istio?ref=v1.3.1 + +patchesStrategicMerge: +- deployment.yaml +- centraldashboard-config.yaml