From 2b76841d78cbc20f89f1874710072a1a55defcbd Mon Sep 17 00:00:00 2001 From: Jon Edvald Date: Mon, 4 Feb 2019 10:34:30 -0800 Subject: [PATCH] fix(k8s): kubernetes dashboard wasn't showing up in dashboard --- garden-service/src/plugins/kubernetes/init.ts | 4 ++-- .../kubernetes/system/kubernetes-dashboard/garden.yml | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/garden-service/src/plugins/kubernetes/init.ts b/garden-service/src/plugins/kubernetes/init.ts index 2613c52492..e5d22675b2 100644 --- a/garden-service/src/plugins/kubernetes/init.ts +++ b/garden-service/src/plugins/kubernetes/init.ts @@ -143,7 +143,7 @@ export async function getLocalEnvironmentStatus({ ctx, log }: GetEnvironmentStat const dashboardStatus = sysStatus.services["kubernetes-dashboard"] const dashboardServiceResource = find( - (dashboardStatus.detail || {}).remoteObjects, + (dashboardStatus.detail || {}).remoteObjects || [], o => o.kind === "Service", ) @@ -154,7 +154,7 @@ export async function getLocalEnvironmentStatus({ ctx, log }: GetEnvironmentStat dashboardPages.push({ title: "Kubernetes", description: "The standard Kubernetes dashboard for this project", - url: `https://${defaultHostname}:${dashboardPort}/#!/workload?namespace=${namespace}`, + url: `http://${defaultHostname}:${dashboardPort}/#!/workload?namespace=${namespace}`, newWindow: true, }) } diff --git a/garden-service/static/kubernetes/system/kubernetes-dashboard/garden.yml b/garden-service/static/kubernetes/system/kubernetes-dashboard/garden.yml index d07b4a1fa6..ea5a68338b 100644 --- a/garden-service/static/kubernetes/system/kubernetes-dashboard/garden.yml +++ b/garden-service/static/kubernetes/system/kubernetes-dashboard/garden.yml @@ -3,7 +3,12 @@ module: name: kubernetes-dashboard type: helm chart: stable/kubernetes-dashboard - version: 0.9.0 + version: 1.2.0 values: - # The dashboard currently needs to be exposed directly, because it does its own SSL termination. - service.type: NodePort + fullnameOverride: kubernetes-dashboard + service: + type: NodePort + # This is only okay because it's just used for the local-kubernetes plugin. + # Don't use this config for remote clusters! + enableInsecureLogin: true + enableSkipLogin: true