garden-io · stefreak · Dec 20, 2024 · Dec 20, 2024
diff --git a/plugins/pulumi/src/action.ts b/plugins/pulumi/src/action.ts
@@ -22,6 +22,7 @@ export interface PulumiDeploySpec {
   stackReferences: string[]
   deployFromPreview: boolean
   root: string
+  useNewPulumiVarfileSchema: boolean
   stack?: string
   showSecretsInOutput: boolean
 }

diff --git a/plugins/pulumi/src/helpers.ts b/plugins/pulumi/src/helpers.ts
@@ -302,7 +302,7 @@ export async function applyConfig(params: PulumiParams & { previewDirPath?: stri
   // Pulumi variables (from action.spec.pulumiVariables) take precedence over any variables declared in pulumi varfiles.
   let vars: DeepPrimitiveMap = {}
 
-  if (action.getSpec()["useNewPulumiVarfileSchema"] || provider.config.useNewPulumiVarfileSchema) {
+  if (action.getSpec().useNewPulumiVarfileSchema || provider.config.useNewPulumiVarfileSchema) {
     for (const varfileVars of varfileContents) {
       vars = <DeepPrimitiveMap>merge(vars, varfileVars)
     }

diff --git a/plugins/pulumi/src/index.ts b/plugins/pulumi/src/index.ts
@@ -124,6 +124,7 @@ export const gardenPlugin = () =>
                 cacheStatus: module.spec.cacheStatus || false,
                 stackReferences: module.spec.stackReferences || [],
                 deployFromPreview: module.spec.deployFromPreview || false,
+                useNewPulumiVarfileSchema: module.spec.useNewPulumiVarfileSchema || false,
                 showSecretsInOutput: module.spec.showSecretsInOutput || false,
                 root: module.spec.root || ".",
                 ...omit(module.spec, ["build", "dependencies"]),

diff --git a/plugins/pulumi/test/test-project-k8s/k8s-namespace-new-module/Pulumi.local.yaml b/plugins/pulumi/test/test-project-k8s/k8s-namespace-new-module/Pulumi.local.yaml
@@ -0,0 +1,8 @@
+config:
+  pulumi-k8s-test:namespace: pulumi-test
+  pulumi-k8s-test:appName: app-name-from-pulumi-varfile
+  pulumi-k8s-test:orgName: foobar123
+  pulumi-k8s-test:isMinikube: 'true'
+backend:
+  url: https://api.pulumi.com
+test: foo
diff --git a/plugins/pulumi/test/test-project-k8s/k8s-namespace-new-module/Pulumi.yaml b/plugins/pulumi/test/test-project-k8s/k8s-namespace-new-module/Pulumi.yaml
@@ -0,0 +1,3 @@
+name: pulumi-k8s-test
+runtime: nodejs
+description: A minimal Kubernetes TypeScript Pulumi program
diff --git a/plugins/pulumi/test/test-project-k8s/k8s-namespace-new-module/garden.yml b/plugins/pulumi/test/test-project-k8s/k8s-namespace-new-module/garden.yml
@@ -0,0 +1,15 @@
+kind: Module
+type: pulumi
+name: k8s-namespace-new-module
+description: Creates a Namespace
+useNewPulumiVarfileSchema: true
+pulumiVarfiles: [varfile-new-schema.yaml]
+createStack: true
+cacheStatus: true
+allowDestroy: true
+pulumiVariables:
+  pulumi-k8s-test:orgName: ${var.orgName}
+  pulumi-k8s-test:namespace: pulumi-test
+  pulumi-k8s-test:isMinikube: "true"
+
+
diff --git a/plugins/pulumi/test/test-project-k8s/k8s-namespace-new-module/index.ts b/plugins/pulumi/test/test-project-k8s/k8s-namespace-new-module/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2018-2024 Garden Technologies, Inc. <[email protected]>
+ *
+ * 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 * as pulumi from "@pulumi/pulumi"
+import * as k8s from "@pulumi/kubernetes"
+
+// Minikube does not implement services of type `LoadBalancer`; require the user to specify if we're
+// running on minikube, and if so, create only services of type ClusterIP.
+const config = new pulumi.Config()
+
+const name = config.require("namespace")
+
+const ns = new k8s.core.v1.Namespace(config.require("namespace"), { metadata: { name } })
+export const namespace = ns.metadata.name