Merge branch 'develop'

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

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

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"])