commit c6f636ca0229630f57193ece917a4542978297ee
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Aug 08 11:27:56 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Wed Aug 08 11:27:56 2018 +0000
tree ea2a8275a89993b8add57bb5a1c9bd0d463e3a3a
parent 161f782409ee5b3e7165b478bfb31fc2c27a98cf
parent cdc6228e29989c55af34a9c4c723c92364639d5e

Merge "Fix k8s dashboard definition"

kubernetes/common.yml

diff --git a/kubernetes/common.yml b/kubernetes/common.yml
index 2dbccc4..60876ae 100644
--- a/kubernetes/common.yml
+++ b/kubernetes/common.yml
@@ -16,6 +16,7 @@
     kubernetes_metallb_repo: metallb
     kubernetes_sriov_repo: https://artifactory.mcp.mirantis.net/artifactory/binary-prod-local/mirantis/kubernetes/sriov-cni
     kubernetes_cniplugins_repo: https://artifactory.mcp.mirantis.net/artifactory/binary-prod-local/mirantis/kubernetes/containernetworking-plugins
+    kubernetes_dashboard_repo: k8s.gcr.io
 
     # component docker images
     kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
@@ -45,8 +46,10 @@
     kubernetes_sriov_source_hash: md5=c0cc33202afd02e4cc44b977a8faf6e7
     kubernetes_cniplugins_source: ${_param:kubernetes_cniplugins_repo}/cni-plugins_v0.7.1-48-g696b1f9.tar.gz
     kubernetes_cniplugins_source_hash: md5=5ec1cf5e989097c6127ea5365e277b02
+    kubernetes_dashboard_image: ${_param:kubernetes_dashboard_repo}/kubernetes-dashboard-amd64:v1.8.3
 
     kubelet_fail_on_swap: true
+    kubernetes_dashboard_enabled: true
     kubernetes_kubedns_enabled: true
     kubernetes_externaldns_enabled: false
     kubernetes_coredns_enabled: false
@@ -79,6 +82,9 @@
           source: ${_param:kubernetes_cniplugins_source}
           hash: ${_param:kubernetes_cniplugins_source_hash}
       addons:
+        dashboard:
+          enabled: ${_param:kubernetes_dashboard_enabled}
+          image: ${_param:kubernetes_dashboard_image}
         dns:
           enabled: ${_param:kubernetes_kubedns_enabled}
           kubedns_image: ${_param:kubernetes_kubedns_image}