refactor(k8s): rename "local" build mode to "local-docker"

garden-io · Jun 13, 2019 · 55d9cec · 55d9cec
1 parent a5ed2cf
commit 55d9cec
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/docs/reference/providers/kubernetes.md b/docs/reference/providers/kubernetes.md
@@ -774,7 +774,7 @@ variables: {}
 environments:
   - providers:
       - environments:
-        buildMode: local
+        buildMode: local-docker
         defaultHostname:
         defaultUsername:
         forceSsl: false

diff --git a/docs/reference/providers/local-kubernetes.md b/docs/reference/providers/local-kubernetes.md
@@ -699,7 +699,7 @@ variables: {}
 environments:
   - providers:
       - environments:
-        buildMode: local
+        buildMode: local-docker
         defaultHostname:
         defaultUsername:
         forceSsl: false

diff --git a/garden-service/src/plugins/kubernetes/config.ts b/garden-service/src/plugins/kubernetes/config.ts
@@ -56,7 +56,7 @@ interface KubernetesStorage {
   sync: KubernetesStorageSpec
 }
 
-export type ContainerBuildMode = "local" | "cluster-docker" | "kaniko"
+export type ContainerBuildMode = "local-docker" | "cluster-docker" | "kaniko"
 
 export interface KubernetesBaseConfig extends ProviderConfig {
   buildMode: ContainerBuildMode
@@ -220,8 +220,8 @@ const tlsCertificateSchema = Joi.object()
 export const kubernetesConfigBase = providerConfigBaseSchema
   .keys({
     buildMode: Joi.string()
-      .allow("local", "cluster-docker", "kaniko")
-      .default("local")
+      .allow("local-docker", "cluster-docker", "kaniko")
+      .default("local-docker")
       .description(deline`
         Choose the mechanism used to build containers before deploying. By default it uses the local docker, but you
         can set it to 'cluster-docker' or 'kaniko' to sync files to a remote docker daemon, installed in the cluster,

diff --git a/garden-service/src/plugins/kubernetes/container/build.ts b/garden-service/src/plugins/kubernetes/container/build.ts
@@ -114,7 +114,7 @@ const getRemoteBuildStatus: BuildStatusHandler = async (params) => {
 }
 
 const buildStatusHandlers: { [mode in ContainerBuildMode]: BuildStatusHandler } = {
-  "local": getLocalBuildStatus,
+  "local-docker": getLocalBuildStatus,
   "cluster-docker": getRemoteBuildStatus,
   "kaniko": getRemoteBuildStatus,
 }
@@ -248,7 +248,7 @@ interface BuilderExecParams {
 }
 
 const buildHandlers: { [mode in ContainerBuildMode]: BuildHandler } = {
-  "local": localBuild,
+  "local-docker": localBuild,
   "cluster-docker": remoteBuild,
   "kaniko": remoteBuild,
 }

diff --git a/garden-service/test/unit/src/plugins/kubernetes/container/ingress.ts b/garden-service/test/unit/src/plugins/kubernetes/container/ingress.ts
@@ -33,7 +33,7 @@ const ports = [{
 
 const basicConfig: KubernetesConfig = {
   name: "kubernetes",
-  buildMode: "local",
+  buildMode: "local-docker",
   context: "my-cluster",
   defaultHostname: "my.domain.com",
   deploymentRegistry: {