Merge pull request #917 from hashicorp/enable-psp-vault

add psp support when its configured in acceptance tests
hashicorp · Dec 10, 2021 · c4cafff · c4cafff
2 parents 9c4bee4 + 363186b
commit c4cafff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 231 deletions.
diff --git a/acceptance/framework/vault/vault_cluster.go b/acceptance/framework/vault/vault_cluster.go
@@ -56,6 +56,9 @@ func NewVaultCluster(t *testing.T, ctx environment.TestContext, cfg *config.Test
 		KubectlOptions: kopts,
 		Logger:         logger,
 	}
+	if cfg.EnablePodSecurityPolicies {
+		vaultHelmOpts.SetValues["global.psp.enable"] = "true"
+	}
 	helm.AddRepo(t, vaultHelmOpts, "hashicorp", "https://helm.releases.hashicorp.com")
 	// Ignoring the error from `helm repo update` as it could fail due to stale cache or unreachable servers and we're
 	// asserting a chart version on Install which would fail in an obvious way should this not succeed.

diff --git a/acceptance/go.mod b/acceptance/go.mod
@@ -70,8 +70,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/oklog/run v1.0.0 // indirect
-	github.com/onsi/ginkgo v1.16.4 // indirect
-	github.com/onsi/gomega v1.15.0 // indirect
 	github.com/pierrec/lz4 v2.5.2+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect