tests: update simple tests to be compatible with kind

pulumi · Mar 12, 2024 · e2daf80 · e2daf80
1 parent 8b47f89
commit e2daf80
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 54 deletions.
diff --git a/tests/sdk/dotnet/dotnet_test.go b/tests/sdk/dotnet/dotnet_test.go
@@ -66,6 +66,7 @@ func TestDotnet_Basic(t *testing.T) {
 }
 
 func TestDotnet_Guestbook(t *testing.T) {
+	tests.SkipIfShort(t) // An external load balancer is required.
 	test := baseOptions.With(integration.ProgramTestOptions{
 		Dir:   "guestbook",
 		Quick: true,

diff --git a/tests/sdk/dotnet/kustomize/helloWorld/kustomization.yaml b/tests/sdk/dotnet/kustomize/helloWorld/kustomization.yaml
@@ -5,5 +5,4 @@ commonLabels:
 
 resources:
 - deployment.yaml
-- service.yaml
 - configMap.yaml
diff --git a/tests/sdk/dotnet/kustomize/helloWorld/service.yaml b/tests/sdk/dotnet/kustomize/helloWorld/service.yaml
diff --git a/tests/sdk/go/go_test.go b/tests/sdk/go/go_test.go
@@ -370,6 +370,7 @@ func TestGo(t *testing.T) {
 	})
 
 	t.Run("Import Deployment Created by Helm", func(t *testing.T) {
+		tests.SkipIfShort(t)
 		baseDir := filepath.Join(cwd, "helm-import-deployment", "step1")
 		namespace := getRandomNamespace("importdepl")
 		chartPath := filepath.Join(baseDir, "./nginx")

diff --git a/tests/sdk/go/kustomize/helloWorld/kustomization.yaml b/tests/sdk/go/kustomize/helloWorld/kustomization.yaml
@@ -5,5 +5,4 @@ commonLabels:
 
 resources:
 - deployment.yaml
-- service.yaml
 - configMap.yaml
diff --git a/tests/sdk/go/kustomize/helloWorld/service.yaml b/tests/sdk/go/kustomize/helloWorld/service.yaml
diff --git a/tests/sdk/nodejs/nodejs_test.go b/tests/sdk/nodejs/nodejs_test.go
@@ -453,6 +453,7 @@ func TestCRDs(t *testing.T) {
 }
 
 func TestPod(t *testing.T) {
+	tests.SkipIfShort(t) // statuses are different in Kind cluster
 	test := baseOptions.With(integration.ProgramTestOptions{
 		Dir:   filepath.Join("delete-before-replace", "step1"),
 		Quick: true,
@@ -794,6 +795,7 @@ func TestGet(t *testing.T) {
 }
 
 func TestIstio(t *testing.T) {
+	tests.SkipIfShort(t)
 	test := baseOptions.With(integration.ProgramTestOptions{
 		Dir:         filepath.Join("istio", "step1"),
 		Quick:       true,
@@ -1153,6 +1155,7 @@ func TestRenderYAML(t *testing.T) {
 			assert.Equal(t, len(files), 2)
 		},
 	})
+
 	integration.ProgramTest(t, &test)
 }
 
@@ -1954,6 +1957,7 @@ func TestClientSideDriftCorrectSSA(t *testing.T) {
 //  5. Re-enable access to the unreachable cluster and run `pulumi up` again.
 //  6. Validate that the resource in the unreachable cluster was updated.
 func TestSkipUpdateUnreachableFlag(t *testing.T) {
+	tests.SkipIfShort(t)
 	var ns0, ns1, cm0, cm1 string
 
 	test := baseOptions.With(integration.ProgramTestOptions{
@@ -2264,6 +2268,7 @@ func TestEmptyItemNormalization(t *testing.T) {
 //  3. Update the DeploymentPatch resource to further patch the deployment, setting the image to nginx:1.14.0,
 //     and verify that other fields managed by kubectl-client-side-apply remain unaffected (Step 2).
 func TestFieldManagerPatchResources(t *testing.T) {
+	tests.SkipIfShort(t)
 	testFolder := "field-manager-patch-resources"
 
 	createDeployment := func() string {

diff --git a/tests/sdk/nodejs/provider/step1/index.ts b/tests/sdk/nodejs/provider/step1/index.ts
@@ -20,15 +20,17 @@ import * as path from "path";
 const ns1 = new k8s.core.v1.Namespace("ns1");
 const ns2 = new k8s.core.v1.Namespace("ns2");
 
+const kcfg = process.env.KUBECONFIG|| path.join(os.homedir(), ".kube", "config");
+
 // Create a new provider using the contents of a k8s config.
 const kubeconfigContentsProvider = new k8s.Provider("kubeconfigContentsProvider", {
-    kubeconfig: fs.readFileSync(path.join(os.homedir(), ".kube", "config")).toString(),
+    kubeconfig: fs.readFileSync(kcfg).toString(),
     namespace: ns1.metadata.name,
 });
 
 // Create a new provider using the path to a k8s config.
 const kubeconfigPathProvider = new k8s.Provider("kubeconfigPathProvider", {
-    kubeconfig: "~/.kube/config",
+    kubeconfig: kcfg,
     namespace: ns1.metadata.name,
 });
 

diff --git a/tests/sdk/python/kustomize-unconfigured-provider/helloWorld/kustomization.yaml b/tests/sdk/python/kustomize-unconfigured-provider/helloWorld/kustomization.yaml
@@ -5,5 +5,4 @@ commonLabels:
 
 resources:
 - deployment.yaml
-- service.yaml
 - configMap.yaml
diff --git a/tests/sdk/python/kustomize-unconfigured-provider/helloWorld/service.yaml b/tests/sdk/python/kustomize-unconfigured-provider/helloWorld/service.yaml
diff --git a/tests/sdk/python/kustomize/helloWorld/kustomization.yaml b/tests/sdk/python/kustomize/helloWorld/kustomization.yaml
@@ -5,5 +5,4 @@ commonLabels:
 
 resources:
 - deployment.yaml
-- service.yaml
 - configMap.yaml
diff --git a/tests/sdk/python/kustomize/helloWorld/service.yaml b/tests/sdk/python/kustomize/helloWorld/service.yaml