From 19bf91e13b8340ed77a9a5188afeb44e2d5be461 Mon Sep 17 00:00:00 2001
From: Robert Brennan <accounts@rbren.io>
Date: Tue, 31 Aug 2021 11:40:36 -0400
Subject: [PATCH] change test for PDB disruptions (#620)

---
 checks/pdbDisruptionsIsZero.yaml              | 22 +++++++++++--------
 pkg/validator/arbitrary_test.go               |  2 +-
 .../pdbDisruptionsIsZero/failure.either.yaml  |  9 ++++++++
 .../{failure.yaml => failure.max.yaml}        |  4 ++--
 .../{success.yaml => failure.min.yaml}        |  4 ++--
 .../pdbDisruptionsIsZero/success.both.yaml    |  9 ++++++++
 .../pdbDisruptionsIsZero/success.max.yaml     |  8 +++++++
 .../pdbDisruptionsIsZero/success.min.yaml     |  8 +++++++
 .../pdbDisruptionsIsZero/success.none.yaml    |  7 ++++++
 9 files changed, 59 insertions(+), 14 deletions(-)
 create mode 100644 test/checks/pdbDisruptionsIsZero/failure.either.yaml
 rename test/checks/pdbDisruptionsIsZero/{failure.yaml => failure.max.yaml} (74%)
 rename test/checks/pdbDisruptionsIsZero/{success.yaml => failure.min.yaml} (74%)
 create mode 100644 test/checks/pdbDisruptionsIsZero/success.both.yaml
 create mode 100644 test/checks/pdbDisruptionsIsZero/success.max.yaml
 create mode 100644 test/checks/pdbDisruptionsIsZero/success.min.yaml
 create mode 100644 test/checks/pdbDisruptionsIsZero/success.none.yaml

diff --git a/checks/pdbDisruptionsIsZero.yaml b/checks/pdbDisruptionsIsZero.yaml
index fd15b8a8..8f830b28 100644
--- a/checks/pdbDisruptionsIsZero.yaml
+++ b/checks/pdbDisruptionsIsZero.yaml
@@ -1,18 +1,22 @@
-successMessage: disruptionsAllowed is greater than zero
-failureMessage: disruptionsAllowed is not greater than zero
+successMessage: Voluntary evictions are possible
+failureMessage: Voluntary evictions are not possible
 category: Reliability
 target: policy/PodDisruptionBudget
 schema:
   '$schema': http://json-schema.org/draft-07/schema
   type: object
   required:
-  - status
+  - spec
   properties:
-    status:
+    spec:
       type: object
-      required:
-      - disruptionsAllowed
       properties:
-        disruptionsAllowed:
-          type: integer
-          minimum: 1
+          minAvailable:
+            not:
+              const: '100%'
+          maxUnavailable:
+            allOf:
+            - not:
+                const: 0
+            - not:
+                const: '0%'
diff --git a/pkg/validator/arbitrary_test.go b/pkg/validator/arbitrary_test.go
index 2724fb09..9687d5cf 100644
--- a/pkg/validator/arbitrary_test.go
+++ b/pkg/validator/arbitrary_test.go
@@ -45,7 +45,7 @@ func TestValidatePDB(t *testing.T) {
 	assert.False(t, results.Success)
 	assert.Equal(t, conf.SeverityWarning, results.Severity)
 	assert.Equal(t, "Reliability", results.Category)
-	assert.EqualValues(t, "disruptionsAllowed is not greater than zero", results.Message)
+	assert.EqualValues(t, "Voluntary evictions are not possible", results.Message)
 }
 
 func TestValidateIngress(t *testing.T) {
diff --git a/test/checks/pdbDisruptionsIsZero/failure.either.yaml b/test/checks/pdbDisruptionsIsZero/failure.either.yaml
new file mode 100644
index 00000000..ba56b5c7
--- /dev/null
+++ b/test/checks/pdbDisruptionsIsZero/failure.either.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: PodDisruptionBudget
+metadata:
+  name: nginx
+  labels:
+    env: test
+spec:
+  minAvailable: 100%
+  maxUnavailable: 5
diff --git a/test/checks/pdbDisruptionsIsZero/failure.yaml b/test/checks/pdbDisruptionsIsZero/failure.max.yaml
similarity index 74%
rename from test/checks/pdbDisruptionsIsZero/failure.yaml
rename to test/checks/pdbDisruptionsIsZero/failure.max.yaml
index 6b99fc81..4b02bda9 100644
--- a/test/checks/pdbDisruptionsIsZero/failure.yaml
+++ b/test/checks/pdbDisruptionsIsZero/failure.max.yaml
@@ -4,5 +4,5 @@ metadata:
   name: nginx
   labels:
     env: test
-status:
-  disruptionsAllowed: 0
\ No newline at end of file
+spec:
+  maxUnavailable: 0
diff --git a/test/checks/pdbDisruptionsIsZero/success.yaml b/test/checks/pdbDisruptionsIsZero/failure.min.yaml
similarity index 74%
rename from test/checks/pdbDisruptionsIsZero/success.yaml
rename to test/checks/pdbDisruptionsIsZero/failure.min.yaml
index 6878c8a8..f916fc7b 100644
--- a/test/checks/pdbDisruptionsIsZero/success.yaml
+++ b/test/checks/pdbDisruptionsIsZero/failure.min.yaml
@@ -4,5 +4,5 @@ metadata:
   name: nginx
   labels:
     env: test
-status:
-  disruptionsAllowed: 1
\ No newline at end of file
+spec:
+  minAvailable: 100%
diff --git a/test/checks/pdbDisruptionsIsZero/success.both.yaml b/test/checks/pdbDisruptionsIsZero/success.both.yaml
new file mode 100644
index 00000000..22073fdf
--- /dev/null
+++ b/test/checks/pdbDisruptionsIsZero/success.both.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: PodDisruptionBudget
+metadata:
+  name: nginx
+  labels:
+    env: test
+spec:
+  minAvaiable: 5
+  maxUnavailable: 10%
diff --git a/test/checks/pdbDisruptionsIsZero/success.max.yaml b/test/checks/pdbDisruptionsIsZero/success.max.yaml
new file mode 100644
index 00000000..c10b8c2a
--- /dev/null
+++ b/test/checks/pdbDisruptionsIsZero/success.max.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: PodDisruptionBudget
+metadata:
+  name: nginx
+  labels:
+    env: test
+spec:
+  maxUnavailable: 5%
diff --git a/test/checks/pdbDisruptionsIsZero/success.min.yaml b/test/checks/pdbDisruptionsIsZero/success.min.yaml
new file mode 100644
index 00000000..de67a2ce
--- /dev/null
+++ b/test/checks/pdbDisruptionsIsZero/success.min.yaml
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: PodDisruptionBudget
+metadata:
+  name: nginx
+  labels:
+    env: test
+spec:
+  minAvaiable: 5
diff --git a/test/checks/pdbDisruptionsIsZero/success.none.yaml b/test/checks/pdbDisruptionsIsZero/success.none.yaml
new file mode 100644
index 00000000..c3a9d2e1
--- /dev/null
+++ b/test/checks/pdbDisruptionsIsZero/success.none.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: PodDisruptionBudget
+metadata:
+  name: nginx
+  labels:
+    env: test
+spec: {}