fix: test errors (TBS)

docs/example-projects/using-garden-in-ci.md

@@ -44,7 +44,7 @@ name: ci-demo-project
 environments:
   ...
   - name: preview
-    defaultNamespace: ${project.name}-${local.env.CIRCLE_BRANCH || local.username}
+    defaultNamespace: preview-${local.env.CIRCLE_BRANCH || local.username}
 providers:
   - name: kubernetes
     environments: [preview]

examples/build-dependencies/garden.yml

@@ -4,7 +4,7 @@ name: build-dependencies
 environments:
   - name: local
   - name: remote
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
 providers:
   - name: local-kubernetes
     environments: [local]

examples/deployment-strategies/garden.yml

@@ -5,7 +5,7 @@ environments:
   - name: local-default
   - name: local-blue-green
   - name: testing
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
 providers:
     # Default deployment strategy
   - name: local-kubernetes

examples/disabled-configs/garden.yml

@@ -7,9 +7,9 @@ environments:
 providers:
   - name: local-kubernetes
     environments: [local]
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
   - name: kubernetes
     environments: [remote]
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
     # Replace these values as appropriate
     context: gke_garden-dev-200012_europe-west1-b_garden-dev-1
     defaultHostname: ${local.username}-disabled-configs.dev-1.sys.garden

examples/hadolint/garden.yml

@@ -3,7 +3,7 @@ name: demo-project
 environments:
   - name: local
   - name: testing
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
 providers:
   - name: hadolint
   - name: local-kubernetes

examples/hot-reload-post-sync-command/garden.yml

@@ -3,7 +3,7 @@ name: hot-reload-post-sync-command
 environments:
   - name: local
   - name: testing
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
 providers:
   - name: local-kubernetes
     environments: [local]

examples/hot-reload/garden.yml

@@ -3,7 +3,7 @@ name: hot-reload
 environments:
   - name: local
   - name: testing
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
 providers:
   - name: local-kubernetes
     environments: [local]

examples/kaniko/garden.yml

@@ -4,7 +4,7 @@ name: kaniko
 environments:
   - name: local
   - name: remote
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
 providers:
   - name: local-kubernetes
     environments: [local]

examples/kubernetes-secrets/garden.yml

@@ -3,7 +3,7 @@ name: kubernetes-secrets
 environments:
   - name: local
   - name: testing
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
 providers:
   - name: local-kubernetes
     environments: [local]

examples/openfaas/garden.yml

@@ -3,7 +3,7 @@ name: openfaas
 environments:
   - name: local
   - name: testing
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
 providers:
   - name: local-kubernetes
     environments: [local]

examples/project-variables/garden.yml

@@ -9,7 +9,7 @@ environments:
       # We only want one replica of each service when developing locally
       service-replicas: 1
   - name: testing
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
 providers:
   - name: local-kubernetes
     environments: [local]

examples/remote-sources/garden.yml

@@ -8,7 +8,7 @@ sources:
 environments:
   - name: local
   - name: testing
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
 providers:
   - name: local-kubernetes
     environments: [local]

examples/tasks/garden.yml

@@ -3,7 +3,7 @@ name: tasks
 environments:
   - name: local
   - name: testing
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
 providers:
   - name: local-kubernetes
     environments: [local]

examples/vote-helm/garden.yml

@@ -3,7 +3,7 @@ name: vote-helm
 environments:
   - name: local
   - name: testing
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
 providers:
   - name: local-kubernetes
     environments: [local]

examples/vote/garden.yml

@@ -4,7 +4,7 @@ environments:
   - name: local
   - name: remote
   - name: testing
-    defaultNamespace: ${project.name}-testing-${local.env.CIRCLE_BUILD_NUM || local.username}
+    defaultNamespace: testing-${local.env.CIRCLE_BUILD_NUM || local.username}
 providers:
   - name: local-kubernetes
     environments: [local]

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

@@ -136,23 +136,19 @@ class Kubectl extends PluginTool {
   }
 
   async stdout(params: KubectlParams) {
-    this.prepareArgs(params)
     return super.stdout(params)
   }
 
   async exec(params: KubectlParams) {
-    this.prepareArgs(params)
-    return super.exec(params)
+    return super.exec(this.prepareArgs(params))
   }
 
   async spawn(params: KubectlParams) {
-    this.prepareArgs(params)
-    return super.spawn(params)
+    return super.spawn(this.prepareArgs(params))
   }
 
   async spawnAndWait(params: KubectlSpawnParams) {
-    this.prepareArgs(params)
-    return super.spawnAndWait(params)
+    return super.spawnAndWait(this.prepareArgs(params))
   }
 
   async json(params: KubectlParams): Promise<any> {
@@ -168,7 +164,11 @@ class Kubectl extends PluginTool {
   private prepareArgs(params: KubectlParams) {
     const { namespace, configPath, args } = params
 
-    const opts: string[] = [`--context=${this.provider.config.context}`]
+    const opts: string[] = []
+
+    if (this.provider.config.context) {
+      opts.push(`--context=${this.provider.config.context}`)
+    }
 
     if (this.provider.config.kubeconfig) {
       opts.push(`--kubeconfig=${this.provider.config.kubeconfig}`)
@@ -182,7 +182,7 @@ class Kubectl extends PluginTool {
       opts.push(`--kubeconfig=${configPath}`)
     }
 
-    params.args = opts.concat(args)
+    return { ...params, args: opts.concat(args) }
   }
 }
 

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

@@ -157,7 +157,7 @@ export async function runAndCopy({
       podName: runner.podName,
       containerNames: [mainContainerName],
     })
-    return containerLogs[0].log
+    return containerLogs[0]?.log || ""
   }
 
   const timedOutResult = async () => {

garden-service/test/integ/src/plugins/kubernetes/container/container.ts

@@ -108,7 +108,7 @@ describe("kubernetes container module handlers", () => {
   before(async () => {
     garden = await makeTestGarden(root)
     provider = <KubernetesProvider>await garden.resolveProvider(garden.log, "local-kubernetes")
-    namespace = garden.projectName
+    namespace = provider.config.namespace!
   })
 
   beforeEach(async () => {
@@ -161,7 +161,7 @@ describe("kubernetes container module handlers", () => {
         args: [],
         interactive: false,
         module,
-        namespace: garden.projectName,
+        namespace: provider.config.namespace!,
         podName,
         runtimeContext: { envVars: {}, dependencies: [] },
         image,

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

@@ -51,13 +51,14 @@ describe("kubernetes container deployment handlers", () => {
 
     it("should create a basic Deployment resource", async () => {
       const service = graph.getService("simple-service")
+      const namespace = provider.config.namespace!
 
       const resource = await createWorkloadManifest({
         api,
         provider,
         service,
         runtimeContext: emptyRuntimeContext,
-        namespace: garden.projectName,
+        namespace,
         enableHotReload: false,
         log: garden.log,
         production: false,
@@ -71,7 +72,7 @@ describe("kubernetes container deployment handlers", () => {
         metadata: {
           name: "simple-service-" + version,
           annotations: { "garden.io/configured.replicas": "1" },
-          namespace: "container",
+          namespace,
           labels: { "module": "simple-service", "service": "simple-service", "garden.io/version": version },
         },
         spec: {
@@ -131,7 +132,7 @@ describe("kubernetes container deployment handlers", () => {
       }
       await api.upsert({ kind: "Secret", namespace: "default", obj: authSecret, log: garden.log })
 
-      const namespace = garden.projectName
+      const namespace = provider.config.namespace!
       const _provider = cloneDeep(provider)
       _provider.config.imagePullSecrets = [{ name: secretName, namespace: "default" }]
 
@@ -169,7 +170,7 @@ describe("kubernetes container deployment handlers", () => {
       }
       await api.upsert({ kind: "Secret", namespace: "default", obj: authSecret, log: garden.log })
 
-      const namespace = garden.projectName
+      const namespace = provider.config.namespace!
       const _provider = cloneDeep(provider)
       _provider.config.imagePullSecrets = [{ name: secretName, namespace: "default" }]
 
@@ -191,7 +192,7 @@ describe("kubernetes container deployment handlers", () => {
 
     it("should correctly mount a referenced PVC module", async () => {
       const service = graph.getService("volume-reference")
-      const namespace = garden.projectName
+      const namespace = provider.config.namespace!
 
       const resource = await createWorkloadManifest({
         api,
@@ -212,7 +213,7 @@ describe("kubernetes container deployment handlers", () => {
 
     it("should throw if incompatible module is specified as a volume module", async () => {
       const service = graph.getService("volume-reference")
-      const namespace = garden.projectName
+      const namespace = provider.config.namespace!
 
       service.spec.volumes = [{ name: "test", module: "simple-service" }]
 

garden-service/test/integ/src/plugins/kubernetes/util.ts

@@ -96,7 +96,7 @@ describe("util", () => {
           provider,
           service,
           runtimeContext: emptyRuntimeContext,
-          namespace: "container",
+          namespace: provider.config.namespace!,
           enableHotReload: false,
           log: garden.log,
           production: false,