Skip to content

Commit

Permalink
fix conflicts from merging master -> ci/repatriate/from-v2.4-to-v3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Hamzah Qudsi committed Sep 21, 2022
1 parent 41bb5fd commit 1e04cef
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 85 deletions.
91 changes: 45 additions & 46 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,6 @@ Please see the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest

## RELEASE NOTES

<<<<<<< HEAD
## [2.4.0] 2022-09-19
[2.4.0]: https://github.com/datawire/edge-stack/releases/v2.4.0

## Ambassador Edge Stack

- Feature: Previously the `Host` resource could only use secrets that are in the namespace as the Host. The
`tlsSecret` field in the Host has a new subfield `namespace` that will allow the use of secrets
from different namespaces.
=======
## [3.2.0] TBD
[3.2.0]: https://github.com/datawire/edge-stack/releases/v3.2.0

Expand All @@ -95,29 +85,23 @@ Please see the [Envoy documentation](https://www.envoyproxy.io/docs/envoy/latest
- Change: The envoy version included in Ambassador Edge Stack has been upgraded from 1.22 to the latest
patch release of 1.23. This provides Ambassador Edge Stack with the latest security patches,
performances enhancments, and features offered by the envoy proxy.
>>>>>>> master

- Change: Set `AMBASSADOR_EDS_BYPASS` to `true` to bypass EDS handling of endpoints and have endpoints be
inserted to clusters manually. This can help resolve with `503 UH` caused by certification
rotation relating to a delay between EDS + CDS. The default is `false`.

<<<<<<< HEAD
=======
- Feature: By default, when Envoy is unable to communicate with the configured RateLimitService then it will
allow traffic through. The `RateLimitService` resource now exposes the <a
href="https://www.envoyproxy.io/docs/envoy/v1.23.0/configuration/http/http_filters/rate_limit_filter">failure_mode_deny</a>
option. Set `failure_mode_deny: true`, then Envoy will deny traffic when it is unable to
communicate to the RateLimitService returning a 500.

>>>>>>> master
- Bugfix: Previously, Ambassador Edge Stack would incorrectly include empty fields when converting a
FilterPolicy or ExternalFilter between versions. This would cause undesired state to be persisted
in k8s which would lead to validation issues when trying to kubectl apply the custom resource.
This fixes these issues to ensure the correct data is being persisted and roundtripped properly
between CRD versions.

<<<<<<< HEAD
=======
## [3.1.0] 2022-08-01
[3.1.0]: https://github.com/datawire/edge-stack/releases/v3.1.0

Expand Down Expand Up @@ -201,7 +185,51 @@ To

- Security: Upgrade jwt-go to latest commit to resolve CVE-2020-26160.

>>>>>>> master
## [3.0.0] 2022-06-29
[3.0.0]: https://github.com/datawire/edge-stack/releases/v3.0.0

## Ambassador Edge Stack

- Change: Ambassador Edge Stack is now built on top of Emissary-ingress 3.0.0 which updates Envoy Proxy from
v1.17 to v1.22. This provides Ambassador Edge Stack with the latest security patches, performances
enhancments, and features offered by Envoy Proxy. One notable change that will effect users is the
removal of support for the V2 xDS tranport protocol. See the Emissary-ingress changelog for more
details.

- Change: In Envoy Proxy 1.18, two behavior changes were made in the way headers are attached to request.
First, the `:scheme` header is now attached to upstream requests over HTTP/1.1 to align with
http/2 and is used by HTTP Filters. The second behavior change is that the `content-length: 0`
will no longer be added to upstream request that have no body.

- Change: Ambassador Edge Stack no longer supports the xDS V2 transport protocol. `ExternalFilter`s
targeting `grpc` must not explicitly set the `protocol_version` to `v3`. If not set or if using an
unsupported protocol_version then an error will be returned. Before upgrading to 3.0.0 you should
ugrade to Ambassador Edge Stack v2.3 and test that your `ExternalFilter` works with the xDS v3
transport protocol.

- Change: Since Ambassador Edge Stack no longer supports the xDS V2 transport protocol, the default Helm
Charts and Manifest explicilty set `protocol_version` to `v3` for the `RateLimitService` and
`AuthService` provided by Ambassador Edge Stack.

## [2.4.0] 2022-09-19
[2.4.0]: https://github.com/datawire/edge-stack/releases/v2.4.0

## Ambassador Edge Stack

- Feature: Previously the `Host` resource could only use secrets that are in the namespace as the Host. The
`tlsSecret` field in the Host has a new subfield `namespace` that will allow the use of secrets
from different namespaces.

- Change: Set `AMBASSADOR_EDS_BYPASS` to `true` to bypass EDS handling of endpoints and have endpoints be
inserted to clusters manually. This can help resolve with `503 UH` caused by certification
rotation relating to a delay between EDS + CDS. The default is `false`.

- Bugfix: Previously, Ambassador Edge Stack would incorrectly include empty fields when converting a
FilterPolicy or ExternalFilter between versions. This would cause undesired state to be persisted
in k8s which would lead to validation issues when trying to kubectl apply the custom resource.
This fixes these issues to ensure the correct data is being persisted and roundtripped properly
between CRD versions.

## [2.3.2] 2022-08-01
[2.3.2]: https://github.com/datawire/edge-stack/releases/v2.3.2

Expand Down Expand Up @@ -238,35 +266,6 @@ To

- Security: Upgrade jwt-go to latest commit to resolve CVE-2020-26160.

<<<<<<< HEAD
=======
## [3.0.0] 2022-06-29
[3.0.0]: https://github.com/datawire/edge-stack/releases/v3.0.0

## Ambassador Edge Stack

- Change: Ambassador Edge Stack is now built on top of Emissary-ingress 3.0.0 which updates Envoy Proxy from
v1.17 to v1.22. This provides Ambassador Edge Stack with the latest security patches,
performances enhancments, and features offered by Envoy Proxy. One notable change that will
effect users is the removal of support for the V2 xDS tranport protocol. See the Emissary-ingress
changelog for more details.

- Change: In Envoy Proxy 1.18, two behavior changes were made in the way headers are attached to request.
First, the `:scheme` header is now attached to upstream requests over HTTP/1.1 to align with
http/2 and is used by HTTP Filters. The second behavior change is that the `content-length: 0`
will no longer be added to upstream request that have no body.

- Change: Ambassador Edge Stack no longer supports the xDS V2 transport protocol. `ExternalFilter`s
targeting `grpc` must not explicitly set the `protocol_version` to `v3`. If not set or if using an
unsupported protocol_version then an error will be returned. Before upgrading to 3.0.0 you should
ugrade to Ambassador Edge Stack v2.3 and test that your `ExternalFilter` works with the xDS v3
transport protocol.

- Change: Since Ambassador Edge Stack no longer supports the xDS V2 transport protocol, the default Helm
Charts and Manifest explicilty set `protocol_version` to `v3` for the `RateLimitService` and
`AuthService` provided by Ambassador Edge Stack.

>>>>>>> master
## [2.3.1] 2022-06-09
[2.3.1]: https://github.com/datawire/edge-stack/releases/v2.3.1

Expand Down
74 changes: 35 additions & 39 deletions docs/releaseNotes.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,41 @@ items:
type: security
body: >-
Upgrade jwt-go to latest commit to resolve CVE-2020-26160.
- version: 3.0.0
date: '2022-06-29'
notes:
- title: upgrade to Emissary-ingress 3.0.0
type: change
body: >-
$productName$ is now built on top of Emissary-ingress 3.0.0 which updates
Envoy Proxy from v1.17 to v1.22. This provides $productName$ with the latest
security patches, performances enhancments, and features offered by Envoy Proxy.
One notable change that will effect users is the removal of support for
the V2 xDS tranport protocol. See the Emissary-ingress changelog for more details.
docs: https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md
- title: Envoy http header behavior change
type: change
body: >-
In Envoy Proxy 1.18, two behavior changes were made in the way headers are attached
to request. First, the `:scheme` header is now attached to upstream requests over
HTTP/1.1 to align with http/2 and is used by HTTP Filters. The second behavior change
is that the `content-length: 0` will no longer be added to upstream request that
have no body.
docs: https://www.envoyproxy.io/docs/envoy/latest/version_history/v1.18/v1.18.0.html
- title: Remove xDS V2 support in ExternalFilter
type: change
body: >-
$productName$ no longer supports the xDS V2 transport protocol. `ExternalFilter`s
targeting <code>grpc</code> must not explicitly set the <code>protocol_version</code>
to <code>v3</code>. If not set or if using an unsupported protocol_version then an
error will be returned. Before upgrading to 3.0.0 you should ugrade to $productName$ v2.3
and test that your <code>ExternalFilter</code> works with the xDS v3 transport protocol.
- title: Helm chart and manifest set protocol_version to v3
type: change
body: >-
Since $productName$ no longer supports the xDS V2 transport protocol, the default Helm
Charts and Manifest explicilty set <code>protocol_version</code> to <code>v3</code> for
the <code>RateLimitService</code> and <code>AuthService</code> provided by $productName$.
- version: 2.4.0
date: '2022-09-19'
notes:
Expand Down Expand Up @@ -256,45 +291,6 @@ items:
type: security
body: >-
Upgrade jwt-go to latest commit to resolve CVE-2020-26160.
<<<<<<< HEAD
=======

- version: 3.0.0
date: '2022-06-29'
notes:
- title: upgrade to Emissary-ingress 3.0.0
type: change
body: >-
$productName$ is now built on top of Emissary-ingress 3.0.0 which updates
Envoy Proxy from v1.17 to v1.22. This provides $productName$ with the latest
security patches, performances enhancments, and features offered by Envoy Proxy.
One notable change that will effect users is the removal of support for
the V2 xDS tranport protocol. See the Emissary-ingress changelog for more details.
docs: https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md
- title: Envoy http header behavior change
type: change
body: >-
In Envoy Proxy 1.18, two behavior changes were made in the way headers are attached
to request. First, the `:scheme` header is now attached to upstream requests over
HTTP/1.1 to align with http/2 and is used by HTTP Filters. The second behavior change
is that the `content-length: 0` will no longer be added to upstream request that
have no body.
docs: https://www.envoyproxy.io/docs/envoy/latest/version_history/v1.18/v1.18.0.html
- title: Remove xDS V2 support in ExternalFilter
type: change
body: >-
$productName$ no longer supports the xDS V2 transport protocol. `ExternalFilter`s
targeting <code>grpc</code> must not explicitly set the <code>protocol_version</code>
to <code>v3</code>. If not set or if using an unsupported protocol_version then an
error will be returned. Before upgrading to 3.0.0 you should ugrade to $productName$ v2.3
and test that your <code>ExternalFilter</code> works with the xDS v3 transport protocol.
- title: Helm chart and manifest set protocol_version to v3
type: change
body: >-
Since $productName$ no longer supports the xDS V2 transport protocol, the default Helm
Charts and Manifest explicilty set <code>protocol_version</code> to <code>v3</code> for
the <code>RateLimitService</code> and <code>AuthService</code> provided by $productName$.
>>>>>>> master
- version: 2.3.1
date: '2022-06-09'
notes:
Expand Down

0 comments on commit 1e04cef

Please sign in to comment.