From 3d7a8bd117d18922f98898a816d9d482be80bfec Mon Sep 17 00:00:00 2001 From: AliceProxy Date: Fri, 11 Feb 2022 14:49:59 -0800 Subject: [PATCH 1/3] add protocol version crd Signed-off-by: AliceProxy --- CHANGELOG.md | 11 +++++++++++ docs/releaseNotes.yml | 11 +++++++++++ manifests/edge-stack/aes-crds.yaml | 15 +++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0422ea6..e993bbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -77,6 +77,17 @@ 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: Ambassador Edge Stack now supports the use of transport protocol V3 in External Filters while + reatining compatability for V2. To start using transport protocol V3, set the new + `protocol_version` field in an External Filter to `v3`. If the protocol version is not specified + then it will be assumed to be V2 which is the standard in Ambassador Edge Stack versions prior to + 2.3. // TODO, link to a docs page that has not yet been created + ## [2.2.0] 2022-02-10 [2.2.0]: https://github.com/datawire/edge-stack/releases/v2.2.0 diff --git a/docs/releaseNotes.yml b/docs/releaseNotes.yml index ae796a7..06421ef 100644 --- a/docs/releaseNotes.yml +++ b/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: Support for Envoy Transport Protocol V2 and V3 + type: feature + body: >- + $productName$ now supports the use of transport protocol V3 in External Filters while reatining compatability for V2. + To start using transport protocol V3, set the new `protocol_version` field in an External Filter to `v3`. If the protocol version + is not specified then it will be assumed to be V2 which is the standard in $productName$ versions prior to 2.3. + // TODO, link to a docs page that has not yet been created + - version: 2.2.0 date: '2022-02-10' notes: diff --git a/manifests/edge-stack/aes-crds.yaml b/manifests/edge-stack/aes-crds.yaml index a3cac0e..4d48db1 100644 --- a/manifests/edge-stack/aes-crds.yaml +++ b/manifests/edge-stack/aes-crds.yaml @@ -315,6 +315,11 @@ spec: - http - grpc type: string + protocol_version: + enum: + - v2 + - v3 + type: string status_on_error: properties: code: @@ -618,6 +623,11 @@ spec: - http - grpc type: string + protocol_version: + enum: + - v2 + - v3 + type: string status_on_error: properties: code: @@ -921,6 +931,11 @@ spec: - http - grpc type: string + protocol_version: + enum: + - v2 + - v3 + type: string status_on_error: description: 'TODO(lukeshu): In v3alpha2, consider getting rid of this struct type in favor of just using an int (i.e. `statusOnError: From 1529ad7907f6a6d8831db45ce611ccd7c9d26291 Mon Sep 17 00:00:00 2001 From: AliceProxy Date: Tue, 15 Feb 2022 17:52:43 -0800 Subject: [PATCH 2/3] drop v1beta field and update v3 field Signed-off-by: AliceProxy --- manifests/edge-stack/aes-crds.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/manifests/edge-stack/aes-crds.yaml b/manifests/edge-stack/aes-crds.yaml index 4d48db1..7c72051 100644 --- a/manifests/edge-stack/aes-crds.yaml +++ b/manifests/edge-stack/aes-crds.yaml @@ -315,11 +315,6 @@ spec: - http - grpc type: string - protocol_version: - enum: - - v2 - - v3 - type: string status_on_error: properties: code: @@ -623,7 +618,7 @@ spec: - http - grpc type: string - protocol_version: + v3ProtocolVersion: enum: - v2 - v3 From 5f9d86406b7c7cfdc3919610349af54ad123247b Mon Sep 17 00:00:00 2001 From: Flynn Date: Wed, 16 Feb 2022 12:03:17 -0500 Subject: [PATCH 3/3] make generate Signed-off-by: Flynn --- charts/edge-stack/Chart.lock | 8 ++++---- charts/edge-stack/Chart.yaml | 4 ++-- manifests/edge-stack/aes-crds.yaml | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/charts/edge-stack/Chart.lock b/charts/edge-stack/Chart.lock index 899198b..6f46dea 100644 --- a/charts/edge-stack/Chart.lock +++ b/charts/edge-stack/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: emissary-ingress - repository: https://s3.amazonaws.com/datawire-static-files/charts - version: 7.3.0 -digest: sha256:c4685611ce82ad107714de6910d8bb206d770c8dd6962f501603b2d96e80d2f6 -generated: "2022-02-10T12:45:44.975886331-08:00" + repository: https://s3.amazonaws.com/datawire-static-files/charts-dev + version: 7.3.1-0.20220216011017-59cab53eeea6 +digest: sha256:e238059eff240e04fde02e2cc3e6419916cbf3bade2b203bdb79244dd2ad8854 +generated: "2022-02-16T11:54:38.629585-05:00" diff --git a/charts/edge-stack/Chart.yaml b/charts/edge-stack/Chart.yaml index f4faa61..7b727d2 100644 --- a/charts/edge-stack/Chart.yaml +++ b/charts/edge-stack/Chart.yaml @@ -27,5 +27,5 @@ maintainers: engine: gotpl dependencies: - name: emissary-ingress - version: 7.3.0 - repository: https://s3.amazonaws.com/datawire-static-files/charts + version: 7.3.1-0.20220216011017-59cab53eeea6 + repository: https://s3.amazonaws.com/datawire-static-files/charts-dev diff --git a/manifests/edge-stack/aes-crds.yaml b/manifests/edge-stack/aes-crds.yaml index 7c72051..add208c 100644 --- a/manifests/edge-stack/aes-crds.yaml +++ b/manifests/edge-stack/aes-crds.yaml @@ -618,11 +618,6 @@ spec: - http - grpc type: string - v3ProtocolVersion: - enum: - - v2 - - v3 - type: string status_on_error: properties: code: @@ -638,6 +633,11 @@ spec: that; in External Filters "tls" is a boolean indicating whether to originate TLS. type: boolean + v3ProtocolVersion: + enum: + - v2 + - v3 + type: string required: - auth_service type: object