From e5371dd8864c676ec0c7e9a169d2990f82e2d2e0 Mon Sep 17 00:00:00 2001
From: jaydesl <jay.deslauriers@gmail.com>
Date: Tue, 4 Dec 2018 16:58:52 +0000
Subject: [PATCH 1/3] Serve Kubernetes Dash via MiCADO Dashboard

---
 Docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 0b0c65e..587207c 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -2,7 +2,7 @@ FROM python:2.7-slim
 
 ENV MICADO_FRONTEND_IP 127.0.0.1
 
-ARG GIT_BRANCH=master
+ARG GIT_BRANCH=k8s
 ARG GIT_USER=micado-scale
 ARG GIT_REPO=component-dashboard
 ARG GIT_EXPORT_DIR=/srv/micado-dashboard

From 1d9d94328c78c0597a049da381418a4c5c6b4007 Mon Sep 17 00:00:00 2001
From: jaydesl <jay.deslauriers@gmail.com>
Date: Wed, 5 Dec 2018 10:30:50 +0000
Subject: [PATCH 2/3] Serve k8s-dash via MiCADO Dashboard

---
 dashboard/templates/docker-visualizer.html    | 12 ------------
 dashboard/templates/kubernetes-dashboard.html | 12 ++++++++++++
 dashboard/views/home.py                       |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 dashboard/templates/docker-visualizer.html
 create mode 100644 dashboard/templates/kubernetes-dashboard.html

diff --git a/dashboard/templates/docker-visualizer.html b/dashboard/templates/docker-visualizer.html
deleted file mode 100644
index 9af8dde..0000000
--- a/dashboard/templates/docker-visualizer.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends "layout.html" %}
-
-{% block page_header %}
-    Docker Visualizer
-    <small>(<a href="https://{{ request.host }}/docker-visualizer" target="_blank">pop out</a>)</small>
-{% endblock %}
-
-{% block content %}
-        <div class="intrinsic-container">
-            <iframe src="https://{{ request.host }}/docker-visualizer" allowfullscreen></iframe>
-        </div>
-{% endblock %}
diff --git a/dashboard/templates/kubernetes-dashboard.html b/dashboard/templates/kubernetes-dashboard.html
new file mode 100644
index 0000000..401bbfe
--- /dev/null
+++ b/dashboard/templates/kubernetes-dashboard.html
@@ -0,0 +1,12 @@
+{% extends "layout.html" %}
+
+{% block page_header %}
+    Kubernetes Dashboard
+    <small>(<a href="https://{{ request.host }}/kubernetes/api/v1/namespaces/kube-system/services/https:kubernetes-dashboard:/proxy/" target="_blank">pop out</a>)</small>
+{% endblock %}
+
+{% block content %}
+        <div class="intrinsic-container">
+            <iframe src="https://{{ request.host }}/kubernetes/api/v1/namespaces/kube-system/services/https:kubernetes-dashboard:/proxy/" allowfullscreen></iframe>
+        </div>
+{% endblock %}
diff --git a/dashboard/views/home.py b/dashboard/views/home.py
index b0f7234..8e33b83 100644
--- a/dashboard/views/home.py
+++ b/dashboard/views/home.py
@@ -22,11 +22,11 @@ def home_grafana():
         frontend_ip=current_app.config["FRONTEND_IP"])
 
 
-@home.route("/docker-visualizer")
-@home.route("/dashboard/docker-visualizer")
-@register_menu(home, '.docker-visualizer', "Docker Visualizer", order=0)
+@home.route("/kubernetes")
+@home.route("/dashboard/kubernetes")
+@register_menu(home, '.kubernetes-dashboard', "Kubernetes Dashboard", order=0)
 def home_docker_visualizer():
-    return render_template("docker-visualizer.html",
+    return render_template("kubernetes-dashboard.html",
         frontend_ip=current_app.config["FRONTEND_IP"])
 
 

From b8d66af890ee60fef358fed8e65e5b8038d7267c Mon Sep 17 00:00:00 2001
From: maystery <emodi.mark@gmail.com>
Date: Fri, 7 Dec 2018 15:03:20 +0100
Subject: [PATCH 3/3] fix logout order

---
 dashboard/views/home.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dashboard/views/home.py b/dashboard/views/home.py
index 8e33b83..9adef9d 100644
--- a/dashboard/views/home.py
+++ b/dashboard/views/home.py
@@ -31,6 +31,6 @@ def home_docker_visualizer():
 
 
 @home.route("/logout")
-@register_menu(home, '.logout', "Log out", order=0)
+@register_menu(home, '.logout', "Log out", order=1)
 def home_logout():
     return "Logging you out"