Re-enable psps in accceptance tests (hashicorp#629)

duckhan · Aug 24, 2021 · ee817fc · ee817fc
1 parent a914bf2
commit ee817fc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charts/consul/test/acceptance/framework/consul/consul_cluster.go b/charts/consul/test/acceptance/framework/consul/consul_cluster.go
@@ -356,7 +356,7 @@ func configurePodSecurityPolicies(t *testing.T, client kubernetes.Interface, cfg
 					Name: "test-psp",
 				},
 				Spec: policyv1beta.PodSecurityPolicySpec{
-					Privileged:          false,
+					Privileged:          true,
 					AllowedCapabilities: []corev1.Capability{"NET_ADMIN"},
 					SELinux: policyv1beta.SELinuxStrategyOptions{
 						Rule: policyv1beta.SELinuxStrategyRunAsAny,

diff --git a/charts/consul/test/acceptance/framework/helpers/helpers.go b/charts/consul/test/acceptance/framework/helpers/helpers.go
@@ -37,7 +37,7 @@ func WaitForAllPodsToBeReady(t *testing.T, client kubernetes.Interface, namespac
 	// Wait up to 15m.
 	// On Azure, volume provisioning can sometimes take close to 5 min,
 	// so we need to give a bit more time for pods to become healthy.
-	counter := &retry.Counter{Count: 180, Wait: 5 * time.Second}
+	counter := &retry.Counter{Count: 180, Wait: 1 * time.Second}
 	retry.RunWith(counter, t, func(r *retry.R) {
 		pods, err := client.CoreV1().Pods(namespace).List(context.Background(), metav1.ListOptions{LabelSelector: podLabelSelector})
 		require.NoError(r, err)

diff --git a/charts/consul/test/terraform/gke/main.tf b/charts/consul/test/terraform/gke/main.tf
@@ -26,7 +26,7 @@ resource "google_container_cluster" "cluster" {
   node_version       = data.google_container_engine_versions.main.latest_master_version
 
   pod_security_policy_config {
-    enabled = false # Helm does not currently work with pod security policies enabled, the acceptance tests fail with this enabled. Re-enable after fixing.
+    enabled = true
   }
 
   resource_labels = var.labels