From 48c9e13137d63f28d9963ed99c88903d43dc93f1 Mon Sep 17 00:00:00 2001
From: Jon Edvald <edvald@gmail.com>
Date: Mon, 10 Dec 2018 19:26:37 -0800
Subject: [PATCH] feat(dashboard): expose provider links in sidebar

This also moves the dashboard link definitions from the plugin schema
to the environment status output, in order to accommodate dynamic links.
---
 garden-dashboard/public/index.html            |  2 +
 garden-dashboard/src/api/types.ts             |  2 +-
 garden-dashboard/src/app.tsx                  | 51 ++++++++++---------
 garden-dashboard/src/components/sidebar.tsx   | 34 ++++++++-----
 garden-dashboard/src/containers/overview.tsx  | 16 ++----
 garden-dashboard/src/containers/sidebar.tsx   | 22 ++++----
 garden-dashboard/src/context/config.tsx       |  2 +-
 garden-dashboard/src/context/status.tsx       | 32 ++++++++++++
 garden-service/gulpfile.ts                    |  1 +
 garden-service/src/commands/get/get-status.ts |  8 ++-
 garden-service/src/config/project.ts          |  3 --
 garden-service/src/garden.ts                  |  1 -
 garden-service/src/plugin-context.ts          |  2 -
 .../src/plugins/kubernetes/deployment.ts      |  3 +-
 garden-service/src/plugins/kubernetes/helm.ts | 11 ++--
 garden-service/src/plugins/kubernetes/init.ts | 38 ++++++++++++--
 .../src/plugins/kubernetes/local.ts           |  3 +-
 .../src/plugins/kubernetes/status.ts          | 24 +++++++--
 .../src/plugins/openfaas/openfaas.ts          |  2 +-
 garden-service/src/types/plugin/outputs.ts    |  3 ++
 garden-service/src/types/plugin/plugin.ts     |  5 --
 .../system/kubernetes-dashboard/garden.yml    |  5 +-
 garden-service/test/src/actions.ts            | 12 ++---
 garden-service/test/src/garden.ts             | 14 ++---
 .../test/src/plugins/kubernetes/ingress.ts    |  3 --
 25 files changed, 196 insertions(+), 103 deletions(-)
 create mode 100644 garden-dashboard/src/context/status.tsx

diff --git a/garden-dashboard/public/index.html b/garden-dashboard/public/index.html
index 998c41904e..e0ced75f0b 100644
--- a/garden-dashboard/public/index.html
+++ b/garden-dashboard/public/index.html
@@ -11,6 +11,8 @@
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
     <link href="https://fonts.googleapis.com/css?family=Raleway:400,400i,500,700" rel="stylesheet">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/solid.css" integrity="sha384-rdyFrfAIC05c5ph7BKz3l5NG5yEottvO/DQ0dCrwD8gzeQDjYBHNr1ucUpQuljos" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/fontawesome.css" integrity="sha384-u5J7JghGz0qUrmEsWzBQkfvc8nK3fUT7DCaQzNQ+q4oEXhGSx+P2OqjWsfIRB8QT" crossorigin="anonymous">
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/garden-dashboard/src/api/types.ts b/garden-dashboard/src/api/types.ts
index f1175d75e8..bf8569e0eb 100644
--- a/garden-dashboard/src/api/types.ts
+++ b/garden-dashboard/src/api/types.ts
@@ -20,7 +20,6 @@ export interface DashboardPage {
 
 export interface Provider {
   name: string
-  dashboardPages: DashboardPage[]
 }
 
 export interface Service {
@@ -70,6 +69,7 @@ export interface ServiceStatus {
 export interface EnvironmentStatus {
   ready: boolean
   needUserInput?: boolean
+  dashboardPages?: DashboardPage[]
   detail?: any
 }
 
diff --git a/garden-dashboard/src/app.tsx b/garden-dashboard/src/app.tsx
index 8d1fba851b..e9445469d4 100644
--- a/garden-dashboard/src/app.tsx
+++ b/garden-dashboard/src/app.tsx
@@ -24,6 +24,7 @@ import "flexboxgrid/dist/flexboxgrid.min.css"
 import "./styles/padding-margin-mixin.scss"
 import { EventProvider } from "./context/events"
 import { ConfigProvider } from "./context/config"
+import { StatusProvider } from "./context/status"
 
 const SidebarWrapper = styled.div`
   border-right: 1px solid ${colors.border};
@@ -35,36 +36,38 @@ const SidebarWrapper = styled.div`
 
 const App = () => (
   <div>
-    <ConfigProvider>
-      <EventProvider>
-        <div className={css`
-          display: flex;
-          height: 100vh;
-          max-height: 100vh;
-          overflow-y: hidden;
-        `}>
-          <SidebarWrapper>
-            <Sidebar />
-          </SidebarWrapper>
+    <StatusProvider>
+      <ConfigProvider>
+        <EventProvider>
           <div className={css`
             display: flex;
-            flex-direction: column;
-            flex-grow: 1;
-            overflow-y: auto;
+            height: 100vh;
+            max-height: 100vh;
+            overflow-y: hidden;
           `}>
-            <div className={cls(css`
-              background-color: ${colors.lightGray};
+            <SidebarWrapper>
+              <Sidebar />
+            </SidebarWrapper>
+            <div className={css`
+              display: flex;
+              flex-direction: column;
               flex-grow: 1;
-            `, "p-2")}>
-              <Route exact path="/" component={Overview} />
-              <Route path="/logs/" component={Logs} />
-              <Route path="/graph/" component={Graph} />
-              <Route path="/providers/:id" component={Provider} />
+              overflow-y: auto;
+            `}>
+              <div className={cls(css`
+                background-color: ${colors.lightGray};
+                flex-grow: 1;
+              `, "p-2")}>
+                <Route exact path="/" component={Overview} />
+                <Route path="/logs/" component={Logs} />
+                <Route path="/graph/" component={Graph} />
+                <Route path="/providers/:id" component={Provider} />
+              </div>
             </div>
           </div>
-        </div>
-      </EventProvider>
-    </ConfigProvider>
+        </EventProvider>
+      </ConfigProvider>
+    </StatusProvider>
   </div>
 )
 
diff --git a/garden-dashboard/src/components/sidebar.tsx b/garden-dashboard/src/components/sidebar.tsx
index 66029aceee..1ffc963416 100644
--- a/garden-dashboard/src/components/sidebar.tsx
+++ b/garden-dashboard/src/components/sidebar.tsx
@@ -6,6 +6,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+import { css } from "emotion/macro"
 import styled from "@emotion/styled/macro"
 import React, { Component } from "react"
 
@@ -36,7 +37,7 @@ const Button = styled.li`
   }
 `
 
-const Link = styled(NavLink)`
+const linkStyle = `
   display: inline-block;
   font-size: 1.025rem;
   margin-left: 1.5rem;
@@ -44,6 +45,9 @@ const Link = styled(NavLink)`
   width: 100%;
 `
 
+const A = styled.a(linkStyle)
+const Link = styled(NavLink)(linkStyle)
+
 // Style and align properly
 const Logo = styled.img`
   height: auto;
@@ -59,11 +63,6 @@ class Sidebar extends Component<Props, State> {
     this.state = {
       selectedTab: this.props.pages[0].path,
     }
-    this.handleClick = this.handleClick.bind(this)
-  }
-
-  handleClick(event) {
-    this.setState({ selectedTab: event.target.path })
   }
 
   render() {
@@ -76,16 +75,25 @@ class Sidebar extends Component<Props, State> {
         </div>
         <nav>
           <ul className="pt-2">
-            {this.props.pages.map(page => (
-              <Button tabName={name} onClick={this.handleClick} key={page.title}>
-                <Link
+            {this.props.pages.map(page => {
+              const link = page.url
+                ? <A href={page.url} target="_blank" title={page.description}>
+                  {page.title}
+                  <i className={`${css("color: #ccc; margin-left: 0.5em;")} fas fa-external-link-alt`}></i>
+                </A>
+                : <Link
                   exact
                   to={{ pathname: page.path, state: page }}
-                  title={page.description}>{page.title}
+                  title={page.description}>
+                  {page.title}
                 </Link>
-              </Button>
-            ),
-            )}
+
+              return (
+                <Button tabName={name} key={page.title}>
+                  {link}
+                </Button>
+              )
+            })}
           </ul>
         </nav>
       </div>
diff --git a/garden-dashboard/src/containers/overview.tsx b/garden-dashboard/src/containers/overview.tsx
index 1b629c451d..a00d42ff58 100644
--- a/garden-dashboard/src/containers/overview.tsx
+++ b/garden-dashboard/src/containers/overview.tsx
@@ -10,20 +10,14 @@ import React from "react"
 
 import { ConfigConsumer } from "../context/config"
 import Overview from "../components/overview"
-import FetchContainer from "./fetch-container"
-import { fetchStatus } from "../api"
-// tslint:disable-next-line:no-unused (https://github.com/palantir/tslint/issues/4022)
-import { FetchStatusResponse } from "../api/types"
-import PageError from "../components/page-error"
+import { StatusConsumer } from "../context/status"
 
 export default () => (
-  <FetchContainer<FetchStatusResponse> ErrorComponent={PageError} fetchFn={fetchStatus}>
-    {({ data: status }) => (
+  <StatusConsumer>
+    {({ status }) => (
       <ConfigConsumer>
-        {({ config }) => {
-          return <Overview config={config} status={status} />
-        }}
+        {({ config }) => <Overview config={config} status={status} />}
       </ConfigConsumer>
     )}
-  </FetchContainer>
+  </StatusConsumer>
 )
diff --git a/garden-dashboard/src/containers/sidebar.tsx b/garden-dashboard/src/containers/sidebar.tsx
index 439e71bed6..39cfb342f0 100644
--- a/garden-dashboard/src/containers/sidebar.tsx
+++ b/garden-dashboard/src/containers/sidebar.tsx
@@ -6,12 +6,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { flatten, kebabCase } from "lodash"
+import { kebabCase, flatten, entries } from "lodash"
 import React from "react"
 
-import { ConfigConsumer } from "../context/config"
 import Sidebar from "../components/sidebar"
 import { DashboardPage } from "../api/types"
+import { StatusConsumer } from "../context/status"
 
 export interface Page extends DashboardPage {
   path: string
@@ -42,13 +42,17 @@ const builtinPages: Page[] = [
 ]
 
 export default () => (
-  <ConfigConsumer>
-    {({ config }) => {
-      const pages = flatten(config.providers.map(p => p.dashboardPages)).map((p: Page) => {
-        p.path = `/provider/${kebabCase(p.title)}`
-        return p
-      })
+  <StatusConsumer>
+    {({ status }) => {
+      const pages: Page[] = flatten(entries(status.providers).map(([providerName, providerStatus]) => {
+        return providerStatus.dashboardPages.map(p => ({
+          ...p,
+          path: `/provider/${providerName}/${kebabCase(p.title)}`,
+          description: p.description + ` (from provider ${providerName})`,
+        }))
+      }))
+
       return <Sidebar pages={[...builtinPages, ...pages]} />
     }}
-  </ConfigConsumer>
+  </StatusConsumer>
 )
diff --git a/garden-dashboard/src/context/config.tsx b/garden-dashboard/src/context/config.tsx
index 426ebdb7e8..d1161eb8d1 100644
--- a/garden-dashboard/src/context/config.tsx
+++ b/garden-dashboard/src/context/config.tsx
@@ -17,7 +17,7 @@ const ConfigContext = React.createContext<Context | null>(null)
 
 const ConfigConsumer = ConfigContext.Consumer
 
-const Error = () => <p>Error loading sidebar</p>
+const Error = () => <p>Error loading project configuration. Please try refreshing the page.</p>
 
 const ConfigProvider = ({ children }) => (
   <FetchContainer<FetchConfigResponse> ErrorComponent={Error} skipSpinner fetchFn={fetchConfig}>
diff --git a/garden-dashboard/src/context/status.tsx b/garden-dashboard/src/context/status.tsx
new file mode 100644
index 0000000000..fd2b984993
--- /dev/null
+++ b/garden-dashboard/src/context/status.tsx
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2018 Garden Technologies, Inc. <info@garden.io>
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import React from "react"
+
+import { fetchStatus } from "../api"
+import { FetchStatusResponse } from "../api/types"
+import FetchContainer from "../containers/fetch-container"
+
+type Context = { status: FetchStatusResponse }
+const StatusContext = React.createContext<Context | null>(null)
+
+const StatusConsumer = StatusContext.Consumer
+
+const Error = () => <p>Error retrieving status</p>
+
+const StatusProvider = ({ children }) => (
+  <FetchContainer<FetchStatusResponse> ErrorComponent={Error} skipSpinner fetchFn={fetchStatus}>
+    {({ data: status }) => (
+      <StatusContext.Provider value={{ status }}>
+        {children}
+      </StatusContext.Provider>
+    )}
+  </FetchContainer>
+)
+
+export { StatusProvider, StatusConsumer }
diff --git a/garden-service/gulpfile.ts b/garden-service/gulpfile.ts
index 4147e6c6b8..7e02a0fd25 100644
--- a/garden-service/gulpfile.ts
+++ b/garden-service/gulpfile.ts
@@ -67,6 +67,7 @@ module.exports = (gulp) => {
       "--declaration",
       "-p", tsConfigPath,
       "--outDir", destDir,
+      "--rootDir", resolve(__dirname, "src"),
       "--preserveWatchOutput",
     ],
     ),
diff --git a/garden-service/src/commands/get/get-status.ts b/garden-service/src/commands/get/get-status.ts
index 137267cf34..3a1313f525 100644
--- a/garden-service/src/commands/get/get-status.ts
+++ b/garden-service/src/commands/get/get-status.ts
@@ -7,7 +7,7 @@
  */
 
 import * as yaml from "js-yaml"
-import { highlightYaml } from "../../util/util"
+import { highlightYaml, deepFilter } from "../../util/util"
 import {
   Command,
   CommandResult,
@@ -21,7 +21,11 @@ export class GetStatusCommand extends Command {
 
   async action({ garden, log }: CommandParams): Promise<CommandResult<EnvironmentStatus>> {
     const status = await garden.actions.getStatus({ log })
-    const yamlStatus = yaml.safeDump(status, { noRefs: true, skipInvalid: true })
+
+    // TODO: we should change the status format because this will remove services called "detail"
+    const withoutDetail = deepFilter(status, (_, key) => key !== "detail")
+
+    const yamlStatus = yaml.safeDump(withoutDetail, { noRefs: true, skipInvalid: true })
 
     // TODO: do a nicer print of this by default and use --yaml/--json options for exporting
     log.info(highlightYaml(yamlStatus))
diff --git a/garden-service/src/config/project.ts b/garden-service/src/config/project.ts
index 0dd2a2d1a8..0a6ae7dc34 100644
--- a/garden-service/src/config/project.ts
+++ b/garden-service/src/config/project.ts
@@ -15,7 +15,6 @@ import {
   Primitive,
   joiRepositoryUrl,
 } from "./common"
-import { DashboardPage } from "../config/dashboard"
 
 export interface ProviderConfig {
   name: string
@@ -33,7 +32,6 @@ export const providerConfigBaseSchema = Joi.object()
 
 export interface Provider<T extends ProviderConfig = any> {
   name: string
-  dashboardPages: DashboardPage[]
   config: T
 }
 
@@ -148,6 +146,5 @@ export const projectSchema = Joi.object()
 // this is used for default handlers in the action handler
 export const defaultProvider: Provider = {
   name: "_default",
-  dashboardPages: [],
   config: {},
 }
diff --git a/garden-service/src/garden.ts b/garden-service/src/garden.ts
index ef823fe4eb..27a3c7dc7e 100644
--- a/garden-service/src/garden.ts
+++ b/garden-service/src/garden.ts
@@ -437,7 +437,6 @@ export class Garden {
     } else {
       const provider: Provider = {
         name: pluginName,
-        dashboardPages: plugin.dashboardPages,
         config: extend({ name: pluginName }, plugin.config, config),
       }
       this.environment.providers.push(provider)
diff --git a/garden-service/src/plugin-context.ts b/garden-service/src/plugin-context.ts
index 540bf1d389..fb12fe67c1 100644
--- a/garden-service/src/plugin-context.ts
+++ b/garden-service/src/plugin-context.ts
@@ -19,7 +19,6 @@ import {
 import { joiIdentifier, joiIdentifierMap } from "./config/common"
 import { PluginError } from "./exceptions"
 import { defaultProvider } from "./config/project"
-import { dashboardPagesSchema } from "./config/dashboard"
 
 type WrappedFromGarden = Pick<Garden,
   "projectName" |
@@ -35,7 +34,6 @@ const providerSchema = Joi.object()
   .keys({
     name: joiIdentifier()
       .description("The name of the provider (plugin)."),
-    dashboardPages: dashboardPagesSchema,
     config: providerConfigBaseSchema,
   })
 
diff --git a/garden-service/src/plugins/kubernetes/deployment.ts b/garden-service/src/plugins/kubernetes/deployment.ts
index 84cf68a2c5..11e87b4b1b 100644
--- a/garden-service/src/plugins/kubernetes/deployment.ts
+++ b/garden-service/src/plugins/kubernetes/deployment.ts
@@ -75,13 +75,14 @@ export async function getContainerServiceStatus(
 
   // FIXME: [objects, matched] and ingresses can be run in parallel
   const objects = await createContainerObjects(ctx, service, runtimeContext, enableHotReload)
-  const state = await compareDeployedObjects(ctx, objects)
+  const { state, remoteObjects } = await compareDeployedObjects(ctx, objects)
   const ingresses = await getIngresses(service, api)
 
   return {
     ingresses,
     state,
     version: state === "ready" ? version.versionString : undefined,
+    detail: { remoteObjects },
   }
 }
 
diff --git a/garden-service/src/plugins/kubernetes/helm.ts b/garden-service/src/plugins/kubernetes/helm.ts
index 79bad6ab1a..0ec99351ab 100644
--- a/garden-service/src/plugins/kubernetes/helm.ts
+++ b/garden-service/src/plugins/kubernetes/helm.ts
@@ -314,10 +314,11 @@ async function getServiceStatus(
 
   // first check if the installed objects on the cluster match the current code
   const objects = await getChartObjects(ctx, service, log)
-  let state = await compareDeployedObjects(ctx, objects)
+  let { state, remoteObjects } = await compareDeployedObjects(ctx, objects)
+  const detail = { remoteObjects }
 
   if (state !== "ready") {
-    return { state }
+    return { state, detail }
   }
 
   // then check if the rollout is complete
@@ -329,7 +330,11 @@ async function getServiceStatus(
   // TODO: set state to "unhealthy" if any status is "unhealthy"
   state = ready ? "ready" : "deploying"
 
-  return { state, version: version.versionString }
+  return {
+    state,
+    version: version.versionString,
+    detail,
+  }
 }
 
 function getReleaseName(namespace: string, service: Service) {
diff --git a/garden-service/src/plugins/kubernetes/init.ts b/garden-service/src/plugins/kubernetes/init.ts
index 686828e730..25dec1d723 100644
--- a/garden-service/src/plugins/kubernetes/init.ts
+++ b/garden-service/src/plugins/kubernetes/init.ts
@@ -9,7 +9,7 @@
 import * as Bluebird from "bluebird"
 import * as inquirer from "inquirer"
 import * as Joi from "joi"
-import { uniq, every, values } from "lodash"
+import { uniq, every, values, pick, find } from "lodash"
 
 import { DeploymentError, NotFoundError, TimeoutError, PluginError } from "../../exceptions"
 import {
@@ -32,6 +32,7 @@ import { isSystemGarden, getSystemGarden } from "./system"
 import { PluginContext } from "../../plugin-context"
 import { LogEntry } from "../../logger/log-entry"
 import { helm } from "./helm"
+import { DashboardPage } from "../../config/dashboard"
 
 const MAX_STORED_USERNAMES = 5
 
@@ -87,6 +88,7 @@ export async function getRemoteEnvironmentStatus({ ctx, log }: GetEnvironmentSta
 export async function getLocalEnvironmentStatus({ ctx, log }: GetEnvironmentStatusParams) {
   let ready = true
   let needUserInput = false
+  const dashboardPages: DashboardPage[] = []
 
   await prepareNamespaces({ ctx, log })
   await helm(ctx.provider, log, "init", "--client-only")
@@ -99,17 +101,46 @@ export async function getLocalEnvironmentStatus({ ctx, log }: GetEnvironmentStat
     const sysGarden = await getSystemGarden(ctx.provider)
     const sysStatus = await sysGarden.actions.getStatus({ log })
 
-    const systemReady = sysStatus.providers[ctx.provider.config.name].ready &&
-      every(values(sysStatus.services).map(s => s.state === "ready"))
+    const serviceStatuses = ctx.provider.config._systemServices
+      ? pick(sysStatus.services, ctx.provider.config._systemServices)
+      : sysStatus.services
+
+    const servicesReady = every(values(serviceStatuses).map(s => s.state === "ready"))
+
+    const systemReady = sysStatus.providers[ctx.provider.config.name].ready && servicesReady
 
     if (!systemReady) {
       ready = false
     }
+
+    // Add the Kubernetes dashboard to the Garden dashboard
+    const namespace = await getAppNamespace(ctx, ctx.provider)
+    const defaultHostname = ctx.provider.config.defaultHostname
+
+    const dashboardStatus = sysStatus.services["kubernetes-dashboard"]
+    const dashboardServiceResource = find(
+      dashboardStatus.detail.remoteObjects,
+      o => o.kind === "Service",
+    )
+
+    if (!!dashboardServiceResource) {
+      const dashboardPort = dashboardServiceResource.spec.ports[0].nodePort
+
+      if (!!dashboardPort) {
+        dashboardPages.push({
+          title: "Kubernetes",
+          description: "The standard Kubernetes dashboard for this project",
+          url: `https://${defaultHostname}:${dashboardPort}/#!/workload?namespace=${namespace}`,
+          newWindow: true,
+        })
+      }
+    }
   }
 
   return {
     ready,
     needUserInput,
+    dashboardPages,
   }
 }
 
@@ -299,6 +330,7 @@ async function configureSystemServices(
     const results = await sysGarden.actions.deployServices({
       log,
       serviceNames: provider.config._systemServices,
+      force,
     })
 
     const failed = values(results.taskResults).filter(r => !!r.error).length
diff --git a/garden-service/src/plugins/kubernetes/local.ts b/garden-service/src/plugins/kubernetes/local.ts
index 000c764e1b..a8dab1c9f0 100644
--- a/garden-service/src/plugins/kubernetes/local.ts
+++ b/garden-service/src/plugins/kubernetes/local.ts
@@ -118,7 +118,7 @@ export async function gardenPlugin({ projectName, config, log }): Promise<Garden
       setMinikubeDockerEnv(),
     ])
 
-    systemServices = []
+    systemServices = ["kubernetes-dashboard"]
   } else {
     if (!defaultHostname) {
       defaultHostname = `${projectName}.local.app.garden`
@@ -140,7 +140,6 @@ export async function gardenPlugin({ projectName, config, log }): Promise<Garden
     ingressHttpsPort: 443,
     ingressClass: "nginx",
     tlsCertificates: config.tlsCertificates,
-    // TODO: support SSL on local deployments
     _system: config._system,
     _systemServices: systemServices,
   }
diff --git a/garden-service/src/plugins/kubernetes/status.ts b/garden-service/src/plugins/kubernetes/status.ts
index 13f5fbd891..badbe42465 100644
--- a/garden-service/src/plugins/kubernetes/status.ts
+++ b/garden-service/src/plugins/kubernetes/status.ts
@@ -437,13 +437,26 @@ export async function waitForServices(
 
 }
 
+interface ComparisonResult {
+  state: ServiceState
+  remoteObjects: KubernetesObject[]
+}
+
 /**
  * Check if each of the given Kubernetes objects matches what's installed in the cluster
  */
-export async function compareDeployedObjects(ctx: PluginContext, objects: KubernetesObject[]): Promise<ServiceState> {
+export async function compareDeployedObjects(
+  ctx: PluginContext, objects: KubernetesObject[],
+): Promise<ComparisonResult> {
   const existingObjects = await Bluebird.map(objects, obj => getDeployedObject(ctx, ctx.provider, obj))
+
   let missing = true
 
+  const result: ComparisonResult = {
+    state: "ready",
+    remoteObjects: <KubernetesObject[]>existingObjects.filter(o => o !== null),
+  }
+
   for (let [obj, existingSpec] of zip(objects, existingObjects)) {
     if (existingSpec && obj) {
       missing = false
@@ -487,11 +500,16 @@ export async function compareDeployedObjects(ctx: PluginContext, objects: Kubern
       // console.log(JSON.stringify(existingSpec, null, 4))
       // console.log("----------------------------------------------------")
       // throw new Error("bla")
-      return "outdated"
+      result.state = "outdated"
+      return result
     }
   }
 
-  return missing ? "missing" : "ready"
+  if (missing) {
+    result.state = "missing"
+  }
+
+  return result
 }
 
 async function getDeployedObject(
diff --git a/garden-service/src/plugins/openfaas/openfaas.ts b/garden-service/src/plugins/openfaas/openfaas.ts
index d7689951bd..7557523fcc 100644
--- a/garden-service/src/plugins/openfaas/openfaas.ts
+++ b/garden-service/src/plugins/openfaas/openfaas.ts
@@ -119,7 +119,7 @@ export function gardenPlugin({ config }: { config: OpenFaasConfig }): GardenPlug
 
         return {
           ready: envReady && servicesReady,
-          detail: status,
+          detail: status.services,
         }
       },
 
diff --git a/garden-service/src/types/plugin/outputs.ts b/garden-service/src/types/plugin/outputs.ts
index 968ec026b4..f598e7dd81 100644
--- a/garden-service/src/types/plugin/outputs.ts
+++ b/garden-service/src/types/plugin/outputs.ts
@@ -12,10 +12,12 @@ import { PrimitiveMap } from "../../config/common"
 import { Module } from "../module"
 import { ServiceStatus } from "../service"
 import { moduleConfigSchema, ModuleConfig } from "../../config/module"
+import { DashboardPage, dashboardPagesSchema } from "../../config/dashboard"
 
 export interface EnvironmentStatus {
   ready: boolean
   needUserInput?: boolean
+  dashboardPages?: DashboardPage[]
   detail?: any
 }
 
@@ -29,6 +31,7 @@ export const environmentStatusSchema = Joi.object()
         "Set to true if the environment needs user input to be initialized, " +
         "and thus needs to be initialized via `garden init`.",
       ),
+    dashboardPages: dashboardPagesSchema,
     detail: Joi.object()
       .meta({ extendable: true })
       .description("Use this to include additional information that is specific to the provider."),
diff --git a/garden-service/src/types/plugin/plugin.ts b/garden-service/src/types/plugin/plugin.ts
index c50cb7afc2..ad0e46d19e 100644
--- a/garden-service/src/types/plugin/plugin.ts
+++ b/garden-service/src/types/plugin/plugin.ts
@@ -19,7 +19,6 @@ import { serviceStatusSchema } from "../service"
 import { serviceOutputsSchema } from "../../config/service"
 import { LogNode } from "../../logger/log-node"
 import { Provider } from "../../config/project"
-import { dashboardPagesSchema, DashboardPage } from "../../config/dashboard"
 import {
   ModuleActionParams,
   PluginActionParams,
@@ -414,9 +413,6 @@ export interface GardenPlugin {
 
   modules?: string[]
 
-  // TODO: move this to the configureProvider output, once that's implemented
-  dashboardPages?: DashboardPage[]
-
   actions?: Partial<PluginActions>
   moduleActions?: { [moduleType: string]: Partial<ModuleAndRuntimeActions> }
 }
@@ -443,7 +439,6 @@ export const pluginSchema = Joi.object()
         "Plugins may use this key to override or augment their configuration " +
         "(as specified in the garden.yml provider configuration.",
       ),
-    dashboardPages: dashboardPagesSchema,
     modules: joiArray(Joi.string())
       .description(
         "Plugins may optionally provide paths to Garden modules that are loaded as part of the plugin. " +
diff --git a/garden-service/static/kubernetes/system/kubernetes-dashboard/garden.yml b/garden-service/static/kubernetes/system/kubernetes-dashboard/garden.yml
index 9aabe4aaf9..e51bbe79b7 100644
--- a/garden-service/static/kubernetes/system/kubernetes-dashboard/garden.yml
+++ b/garden-service/static/kubernetes/system/kubernetes-dashboard/garden.yml
@@ -3,6 +3,7 @@ module:
   name: kubernetes-dashboard
   type: helm
   chart: stable/kubernetes-dashboard
+  version: 0.9.0
   parameters:
-    ingress.enabled: true
-    ingress.hosts: [dashboard.local.sys.garden]
+    # The dashboard currently needs to be exposed directly, because it does its own SSL termination.
+    service.type: NodePort
diff --git a/garden-service/test/src/actions.ts b/garden-service/test/src/actions.ts
index 9833829e8e..bee65baf97 100644
--- a/garden-service/test/src/actions.ts
+++ b/garden-service/test/src/actions.ts
@@ -65,15 +65,15 @@ describe("ActionHelper", () => {
       it("should return a map of statuses for providers that have a getEnvironmentStatus handler", async () => {
         const result = await actions.getEnvironmentStatus({ log })
         expect(result).to.eql({
-          "test-plugin": { ready: false },
-          "test-plugin-b": { ready: false },
+          "test-plugin": { ready: false, dashboardPages: [] },
+          "test-plugin-b": { ready: false, dashboardPages: [] },
         })
       })
 
       it("should optionally filter to single plugin", async () => {
         const result = await actions.getEnvironmentStatus({ log, pluginName: "test-plugin" })
         expect(result).to.eql({
-          "test-plugin": { ready: false },
+          "test-plugin": { ready: false, dashboardPages: [] },
         })
       })
     })
@@ -99,15 +99,15 @@ describe("ActionHelper", () => {
       it("should clean up environment for each configured provider", async () => {
         const result = await actions.cleanupEnvironment({ log })
         expect(result).to.eql({
-          "test-plugin": { ready: false },
-          "test-plugin-b": { ready: false },
+          "test-plugin": { ready: false, dashboardPages: [] },
+          "test-plugin-b": { ready: false, dashboardPages: [] },
         })
       })
 
       it("should optionally filter to single plugin", async () => {
         const result = await actions.cleanupEnvironment({ log, pluginName: "test-plugin" })
         expect(result).to.eql({
-          "test-plugin": { ready: false },
+          "test-plugin": { ready: false, dashboardPages: [] },
         })
       })
     })
diff --git a/garden-service/test/src/garden.ts b/garden-service/test/src/garden.ts
index b6762f8787..a8c8ee94ef 100644
--- a/garden-service/test/src/garden.ts
+++ b/garden-service/test/src/garden.ts
@@ -52,10 +52,10 @@ describe("Garden", () => {
       expect(garden.environment).to.eql({
         name: "local",
         providers: [
-          { name: "generic", dashboardPages: [], config: { name: "generic" } },
-          { name: "container", dashboardPages: [], config: { name: "container" } },
-          { name: "test-plugin", dashboardPages: [], config: { name: "test-plugin" } },
-          { name: "test-plugin-b", dashboardPages: [], config: { name: "test-plugin-b" } },
+          { name: "generic", config: { name: "generic" } },
+          { name: "container", config: { name: "container" } },
+          { name: "test-plugin", config: { name: "test-plugin" } },
+          { name: "test-plugin-b", config: { name: "test-plugin-b" } },
         ],
         variables: {
           some: "variable",
@@ -77,9 +77,9 @@ describe("Garden", () => {
       expect(garden.environment).to.eql({
         name: "local",
         providers: [
-          { name: "generic", dashboardPages: [], config: { name: "generic" } },
-          { name: "container", dashboardPages: [], config: { name: "container" } },
-          { name: "test-plugin", dashboardPages: [], config: { name: "test-plugin" } },
+          { name: "generic", config: { name: "generic" } },
+          { name: "container", config: { name: "container" } },
+          { name: "test-plugin", config: { name: "test-plugin" } },
         ],
         variables: {
           "some": "banana",
diff --git a/garden-service/test/src/plugins/kubernetes/ingress.ts b/garden-service/test/src/plugins/kubernetes/ingress.ts
index 4bdeb99552..3c0e6cba25 100644
--- a/garden-service/test/src/plugins/kubernetes/ingress.ts
+++ b/garden-service/test/src/plugins/kubernetes/ingress.ts
@@ -43,7 +43,6 @@ const basicConfig: KubernetesConfig = {
 const basicProvider: KubernetesProvider = {
   name: "kubernetes",
   config: basicConfig,
-  dashboardPages: [],
 }
 
 const singleTlsConfig: KubernetesConfig = {
@@ -61,7 +60,6 @@ const singleTlsConfig: KubernetesConfig = {
 const singleTlsProvider: KubernetesProvider = {
   name: "kubernetes",
   config: singleTlsConfig,
-  dashboardPages: [],
 }
 
 const multiTlsConfig: KubernetesConfig = {
@@ -95,7 +93,6 @@ const multiTlsConfig: KubernetesConfig = {
 const multiTlsProvider: KubernetesProvider = {
   name: "kubernetes",
   config: multiTlsConfig,
-  dashboardPages: [],
 }
 
 // generated with `openssl req -newkey rsa:2048 -nodes -keyout key.pem -x509 -days 365 -out certificate.pem`