Filter Rule sorting

CHANGELOG.md

@@ -77,6 +77,15 @@ Please see the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest
 
 ## RELEASE NOTES
 
+## [2.3.0] TBD
+[2.3.0]: https://github.com/datawire/edge-stack/releases/v2.3.0
+
+## Ambassador Edge Stack
+
+- Feature: `FilterPolicy` `Rules` now have a `Precedence` field which can be set to control the order of rule
+  evaluation: higher-precedence rules are executed first. If the `Precedence` is not set, the order
+  of the `Rule` within the `FilterPolicy` resource is honored.
+
 ## [2.2.0] 2022-02-10
 [2.2.0]: https://github.com/datawire/edge-stack/releases/v2.2.0
 

charts/edge-stack/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: emissary-ingress
   repository: https://s3.amazonaws.com/datawire-static-files/charts-dev
-  version: 7.3.1-0.20220211211150-a9c031b59932
-digest: sha256:e556c725227daaa52f2a12d3c5e2dcbb72510dc2f9695ba0dbc9396d1e01d139
-generated: "2022-02-11T14:57:09.278406113-07:00"
+  version: 7.3.1-0.20220214230922-f7bdce81c4e5
+digest: sha256:5d8bd5b2c44a673878664c940dfc8c4a9d41c9b86f732d8b6af59cbae91439e9
+generated: "2022-02-15T18:03:25.027417-05:00"

charts/edge-stack/Chart.yaml

@@ -27,5 +27,5 @@ maintainers:
 engine: gotpl
 dependencies:
 - name: emissary-ingress
-  version: 7.3.1-0.20220211211150-a9c031b59932
+  version: 7.3.1-0.20220214230922-f7bdce81c4e5
   repository: https://s3.amazonaws.com/datawire-static-files/charts-dev

docs/releaseNotes.yml

@@ -32,6 +32,17 @@
 
 changelog: https://github.com/datawire/edge-stack/blob/$branch$/CHANGELOG.md
 items:
+  - version: 2.3.0
+    date: 'TBD'
+    notes:
+      - title: The order of FilterPolicy Rules can be controlled
+        type: feature
+        body: >-
+          <code>FilterPolicy</code> <code>Rules</code> now have a <code>Precedence</code> field which
+          can be set to control the order of rule evaluation: higher-precedence rules are executed first.
+          If the <code>Precedence</code> is not set, the order of the <code>Rule</code> within the
+          <code>FilterPolicy</code> resource is honored.
+
   - version: 2.2.0
     date: '2022-02-10'
     notes:

manifests/edge-stack/aes-crds.yaml

@@ -157,6 +157,8 @@ spec:
                       type: string
                     path:
                       type: string
+                    v3Precedence:
+                      type: integer
                   type: object
                 type: array
             type: object
@@ -222,6 +224,8 @@ spec:
                       type: string
                     path:
                       type: string
+                    precedence:
+                      type: integer
                   type: object
                 type: array
             type: object