improvement(k8s): more robust and useful deployment status checks

garden-service/src/logger/renderers.ts

@@ -42,7 +42,7 @@ const cliPadEnd = (s: string, width: number): string => {
 const truncateSection = (s: string) => cliTruncate(s, SECTION_PREFIX_WIDTH)
 const sectionStyle = (s: string) => chalk.cyan.italic(cliPadEnd(truncateSection(s), SECTION_PREFIX_WIDTH))
 export const msgStyle = (s: string) => hasAnsi(s) ? s : chalk.gray(s)
-export const errorStyle = chalk.red
+export const errorStyle = (s: string) => hasAnsi(s) ? s : chalk.red(s)
 
 /*** RENDER HELPERS ***/
 function insertVal(out: string[], idx: number, toRender: Function | string, renderArgs: any[]): string[] {

garden-service/src/plugins/kubernetes/api.ts

@@ -295,7 +295,8 @@ export class KubeApi {
       ? `${basePath}/namespaces/${namespace}/${resource.name}/${name}`
       : `${basePath}/${resource.name}/${name}`
 
-    return this.request(log, apiPath)
+    const res = await this.request(log, apiPath)
+    return res.body
   }
 
   async upsert<K extends keyof CrudMapType>(

garden-service/src/plugins/kubernetes/container/deployment.ts

@@ -12,7 +12,7 @@ import { RuntimeContext, Service, ServiceStatus } from "../../../types/service"
 import { ContainerModule, ContainerService } from "../../container/config"
 import { createIngressResources } from "./ingress"
 import { createServiceResources } from "./service"
-import { waitForResources } from "../status"
+import { waitForResources } from "../status/status"
 import { apply, deleteObjectsByLabel } from "../kubectl"
 import { getAppNamespace } from "../namespace"
 import { PluginContext } from "../../../plugin-context"

garden-service/src/plugins/kubernetes/container/status.ts

@@ -16,7 +16,7 @@ import { sleep } from "../../../util/util"
 import { GetServiceStatusParams } from "../../../types/plugin/service/getServiceStatus"
 import { ContainerModule } from "../../container/config"
 import { KubeApi } from "../api"
-import { compareDeployedObjects } from "../status"
+import { compareDeployedObjects } from "../status/status"
 import { getIngresses } from "./ingress"
 import { getAppNamespace } from "../namespace"
 import { KubernetesPluginContext } from "../config"

garden-service/src/plugins/kubernetes/helm/deployment.ts

@@ -8,7 +8,7 @@
 
 import { ServiceStatus } from "../../../types/service"
 import { getAppNamespace } from "../namespace"
-import { waitForResources } from "../status"
+import { waitForResources } from "../status/status"
 import { helm } from "./helm-cli"
 import { HelmModule } from "./config"
 import {

garden-service/src/plugins/kubernetes/helm/status.ts

@@ -9,7 +9,7 @@
 import { ServiceStatus, ServiceState } from "../../../types/service"
 import { GetServiceStatusParams } from "../../../types/plugin/service/getServiceStatus"
 import { getExecModuleBuildStatus } from "../../exec"
-import { compareDeployedObjects } from "../status"
+import { compareDeployedObjects } from "../status/status"
 import { KubeApi } from "../api"
 import { getAppNamespace } from "../namespace"
 import { LogEntry } from "../../../logger/log-entry"

garden-service/src/plugins/kubernetes/helm/tiller.ts

@@ -13,7 +13,7 @@ import { helm } from "./helm-cli"
 import { safeLoadAll } from "js-yaml"
 import { KubeApi } from "../api"
 import { getAppNamespace } from "../namespace"
-import { checkResourceStatuses, waitForResources } from "../status"
+import { checkResourceStatuses, waitForResources } from "../status/status"
 import { combineStates } from "../../../types/service"
 import { apply } from "../kubectl"
 import { KubernetesProvider } from "../config"

garden-service/src/plugins/kubernetes/kubernetes-module/handlers.ts

@@ -17,7 +17,7 @@ import { getNamespace, getAppNamespace } from "../namespace"
 import { KubernetesPluginContext } from "../config"
 import { KubernetesResource } from "../types"
 import { ServiceStatus } from "../../../types/service"
-import { compareDeployedObjects, waitForResources } from "../status"
+import { compareDeployedObjects, waitForResources } from "../status/status"
 import { KubeApi } from "../api"
 import { ModuleAndRuntimeActions } from "../../../types/plugin/plugin"
 import { getAllLogs } from "../logs"