fix: e2e teardown. (#1165)

This will allow the tests to be re-run. Signed-off-by: Julian Dolce <jdolce@qnx.com>
open-policy-agent · Mar 5, 2021 · 84f64c4 · 84f64c4
1 parent 70fdfe9
commit 84f64c4
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 2 deletions.
diff --git a/test/bats/test.bats b/test/bats/test.bats
@@ -13,9 +13,11 @@ teardown() {
 }
 
 teardown_file() {
+  kubectl label ns ${GATEKEEPER_NAMESPACE} admission.gatekeeper.sh/ignore=no-self-managing --overwrite || true
   kubectl delete ns gatekeeper-test-playground gatekeeper-excluded-namespace || true
-  kubectl delete constrainttemplates k8scontainerlimits k8srequiredlabels k8suniquelabel || true
-  kubectl delete configs.config.gatekeeper.sh config -n ${GATEKEEPER_NAMESPACE} || true
+  kubectl delete "$(kubectl api-resources --api-group=constraints.gatekeeper.sh -o name | tr "\n" "," | sed -e 's/,$//')" -l gatekeeper.sh/tests=yes || true
+  kubectl delete ConstraintTemplates -l gatekeeper.sh/tests=yes || true
+  kubectl delete configs.config.gatekeeper.sh -n ${GATEKEEPER_NAMESPACE} -l gatekeeper.sh/tests=yes || true
 }
 
 @test "gatekeeper-controller-manager is running" {

diff --git a/test/bats/tests/constraints/all_cm_gatekeeper_label_unique.yaml b/test/bats/tests/constraints/all_cm_gatekeeper_label_unique.yaml
@@ -2,6 +2,8 @@ apiVersion: constraints.gatekeeper.sh/v1beta1
 kind: K8sUniqueLabel
 metadata:
   name: cm-gk-label-unique
+  labels:
+    gatekeeper.sh/tests: "yes"
 spec:
   match:
     namespaces: ["gatekeeper-test-playground"]

diff --git a/test/bats/tests/constraints/all_cm_must_have_gatekeeper-dryrun.yaml b/test/bats/tests/constraints/all_cm_must_have_gatekeeper-dryrun.yaml
@@ -2,6 +2,8 @@ apiVersion: constraints.gatekeeper.sh/v1beta1
 kind: K8sRequiredLabels
 metadata:
   name: cm-must-have-gk
+  labels:
+    gatekeeper.sh/tests: "yes"
 spec:
   enforcementAction: dryrun
   match:

diff --git a/test/bats/tests/constraints/all_cm_must_have_gatekeeper.yaml b/test/bats/tests/constraints/all_cm_must_have_gatekeeper.yaml
@@ -2,6 +2,8 @@ apiVersion: constraints.gatekeeper.sh/v1beta1
 kind: K8sRequiredLabels
 metadata:
   name: cm-must-have-gk
+  labels:
+    gatekeeper.sh/tests: "yes"
 spec:
   match:
     namespaces: ["gatekeeper-test-playground", "gatekeeper-excluded-namespace"]

diff --git a/test/bats/tests/constraints/all_cm_must_have_gatekeeper_audit.yaml b/test/bats/tests/constraints/all_cm_must_have_gatekeeper_audit.yaml
@@ -2,6 +2,8 @@ apiVersion: constraints.gatekeeper.sh/v1beta1
 kind: K8sRequiredLabels
 metadata:
   name: cm-must-have-gk-audit
+  labels:
+    gatekeeper.sh/tests: "yes"
 spec:
   match:
     namespaces: ["gatekeeper-test-playground"]

diff --git a/test/bats/tests/constraints/containers_must_be_limited.yaml b/test/bats/tests/constraints/containers_must_be_limited.yaml
@@ -2,6 +2,8 @@ apiVersion: constraints.gatekeeper.sh/v1beta1
 kind: K8sContainerLimits
 metadata:
   name: container-must-have-limits
+  labels:
+    gatekeeper.sh/tests: "yes"
 spec:
   match:
     kinds:

diff --git a/test/bats/tests/sync.yaml b/test/bats/tests/sync.yaml
@@ -2,6 +2,8 @@ apiVersion: config.gatekeeper.sh/v1alpha1
 kind: Config
 metadata:
   name: config
+  labels:
+    gatekeeper.sh/tests: "yes"
 spec:
   sync:
     syncOnly:

diff --git a/test/bats/tests/sync_with_exclusion.yaml b/test/bats/tests/sync_with_exclusion.yaml
@@ -2,6 +2,8 @@ apiVersion: config.gatekeeper.sh/v1alpha1
 kind: Config
 metadata:
   name: config
+  labels:
+    gatekeeper.sh/tests: "yes"
 spec:
   match:
     - excludedNamespaces: ["gatekeeper-excluded-namespace"]

diff --git a/test/bats/tests/templates/k8scontainterlimits_template.yaml b/test/bats/tests/templates/k8scontainterlimits_template.yaml
@@ -2,6 +2,8 @@ apiVersion: templates.gatekeeper.sh/v1beta1
 kind: ConstraintTemplate
 metadata:
   name: k8scontainerlimits
+  labels:
+    gatekeeper.sh/tests: "yes"
 spec:
   crd:
     spec:

diff --git a/test/bats/tests/templates/k8srequiredlabels_template.yaml b/test/bats/tests/templates/k8srequiredlabels_template.yaml
@@ -2,6 +2,8 @@ apiVersion: templates.gatekeeper.sh/v1beta1
 kind: ConstraintTemplate
 metadata:
   name: k8srequiredlabels
+  labels:
+    gatekeeper.sh/tests: "yes"
 spec:
   crd:
     spec:

diff --git a/test/bats/tests/templates/k8suniquelabel_template.yaml b/test/bats/tests/templates/k8suniquelabel_template.yaml
@@ -2,6 +2,8 @@ apiVersion: templates.gatekeeper.sh/v1beta1
 kind: ConstraintTemplate
 metadata:
   name: k8suniquelabel
+  labels:
+    gatekeeper.sh/tests: "yes"
 spec:
   crd:
     spec: