Update topologySpreadConstraint.yaml (#971)

* Update topologySpreadConstraint.yaml * Update topologySpreadConstraint.yaml * fix test * add passing test --------- Co-authored-by: Andrew Suderman <andy@fairwinds.com>
FairwindsOps · Aug 28, 2023 · c856874 · c856874
1 parent 09525d0
commit c856874
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/checks/topologySpreadConstraint.yaml b/checks/topologySpreadConstraint.yaml
@@ -2,6 +2,10 @@ successMessage: Pod has a valid topology spread constraint
 failureMessage: Pod should be configured with a valid topology spread constraint
 category: Reliability
 target: PodSpec
+controllers:
+  exclude:
+  - Job
+  - CronJob
 schema:
   '$schema': http://json-schema.org/draft-07/schema
   type: object
@@ -10,12 +14,4 @@ schema:
   properties:
     topologySpreadConstraints:
       type: array
-      items:
-        type: object
-        properties:
-          topologyKey:
-            anyOf:
-              - type: string
-                const: "kubernetes.io/hostname"
-              - type: string
-                const: "topology.kubernetes.io/zone"
+      minItems: 1
diff --git a/...onstraint/failure.invalidtopologykey.yaml → ...pologySpreadConstraint/failure.empty.yaml b/...onstraint/failure.invalidtopologykey.yaml → ...pologySpreadConstraint/failure.empty.yaml
@@ -19,10 +19,7 @@ spec:
         app.kubernetes.io/name: basic-demo
         app.kubernetes.io/instance: demo
     spec:
-      topologySpreadConstraints:
-        - maxSkew: 1
-          topologyKey: farglebargle
-          whenUnsatisfiable: ScheduleAnyway
+      topologySpreadConstraints: []
       containers:
         - name: basic-demo
           image: "quay.io/fairwinds/docker-demo:latest"

diff --git a/test/checks/topologySpreadConstraint/success.yaml b/test/checks/topologySpreadConstraint/success.yaml
@@ -21,8 +21,13 @@ spec:
     spec:
       topologySpreadConstraints:
         - maxSkew: 1
-          topologyKey: "topology.kubernetes.io/zone"
-          whenUnsatisfiable: ScheduleAnyway
+          topologyKey: kubernetes.io/hostname
+          whenUnsatisfiable: DoNotSchedule
+          labelSelector:
+            matchLabels:
+              app: foo
+          matchLabelKeys:
+            - pod-template-hash
       containers:
         - name: basic-demo
           image: "quay.io/fairwinds/docker-demo:latest"