feat(k8s): allow specifying namespace to deploy to

garden-io · Aug 8, 2018 · 0aebc2b · 0aebc2b
1 parent 49f83e4
commit 0aebc2b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/garden-cli/src/plugins/kubernetes/kubernetes.ts b/garden-cli/src/plugins/kubernetes/kubernetes.ts
@@ -19,7 +19,6 @@ import {
   ProviderConfig,
   providerConfigBase,
 } from "../../types/project"
-
 import {
   configureEnvironment,
   deleteConfig,
@@ -48,6 +47,7 @@ export interface KubernetesConfig extends ProviderConfig {
   ingressPort: number
   ingressClass: string
   forceSsl: boolean
+  namespace?: string
   defaultUsername?: string
 }
 
@@ -64,6 +64,11 @@ const kubernetesConfigBase = providerConfigBase
       .description("The external hostname of the cluster's ingress controller."),
     defaultUsername: joiIdentifier()
       .description("Set a default username (used for namespacing within a cluster)."),
+    namespace: Joi.string()
+      .description(
+        "Specify which namespace to deploy services to (auto-generated by default). " +
+        "Note that the framework generates other namespaces as well with this name as a prefix.",
+      ),
   })
 
 const configSchema = kubernetesConfigBase

diff --git a/garden-cli/src/plugins/kubernetes/namespace.ts b/garden-cli/src/plugins/kubernetes/namespace.ts
@@ -50,8 +50,8 @@ export async function ensureNamespace(context: string, namespace: string) {
 export async function getNamespace(ctx: PluginContext, provider: KubernetesProvider, suffix?: string) {
   let namespace
 
-  if (isSystemGarden(provider)) {
-    namespace = GARDEN_SYSTEM_NAMESPACE
+  if (provider.config.namespace) {
+    namespace = provider.config.namespace
   } else {
     const localConfig = await ctx.localConfigStore.get()
     const k8sConfig = localConfig.kubernetes || {}

diff --git a/garden-cli/src/plugins/kubernetes/system.ts b/garden-cli/src/plugins/kubernetes/system.ts
@@ -41,6 +41,7 @@ export async function getSystemGarden(provider: KubernetesProvider): Promise<Gar
               {
                 name: "local-kubernetes",
                 context: provider.config.context,
+                namespace: GARDEN_SYSTEM_NAMESPACE,
                 _system: systemSymbol,
               },
             ],