changelog: finalize changelog for v3.6.0

Signed-off-by: Hamzah Qudsi <hqudsi@datawire.io>
envoy: upgrade to 1.25.4
2023-04-11 11:59:55 -04:00 · 2023-04-07 15:20:46 -04:00 · 2023-04-04 16:10:24 -04:00
6 changed files with 10 additions and 10 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -85,12 +85,12 @@ it will be removed; but as it won't be user-visible this isn't considered a brea

 ## RELEASE NOTES

-## [3.6.0] TBD
+## [3.6.0] April 17, 2023
 [3.6.0]: https://github.com/emissary-ingress/emissary/compare/v3.5.0...v3.6.0

 ### Emissary-ingress and Ambassador Edge Stack

- Feature: This upgrades Emissary-ingress to be built on Envoy v1.25.3. This provides
+- Feature: This upgrades Emissary-ingress to be built on Envoy v1.25.4. This provides
  Emissary-ingress with the latest security patches, performances enhancments, and features offered
  by the envoy proxy.

--- a/DEPENDENCIES.md
+++ b/DEPENDENCIES.md
@ -3,7 +3,7 @@ following Free and Open Source software:

    Name                                                                                       Version                                      License(s)
    ----                                                                                       -------                                      ----------
-    the Go language standard library ("std")                                                   v1.20.1                                      3-clause BSD license
+    the Go language standard library ("std")                                                   v1.20.3                                      3-clause BSD license
    cloud.google.com/go/compute                                                                v1.2.0                                       Apache License 2.0
    github.com/Azure/go-ansiterm                                                               v0.0.0-20210617225240-d185dfc1b5a1           MIT license
    github.com/Azure/go-autorest                                                               v14.2.0+incompatible                         Apache License 2.0
--- a/_cxx/envoy.mk
+++ b/_cxx/envoy.mk
@ -13,8 +13,8 @@ RSYNC_EXTRAS ?=

 # IF YOU MESS WITH ANY OF THESE VALUES, YOU MUST RUN `make update-base`.
  ENVOY_REPO ?= $(if $(IS_PRIVATE),git@github.com:datawire/envoy-private.git,https://github.com/datawire/envoy.git)
-  # rebase/release/v1.25.3
-  ENVOY_COMMIT ?= b8eb98c4a04bd1e0d21230e7a7c99f37a04f255b
+  # rebase/release/v1.25.4
+  ENVOY_COMMIT ?= 31a08a530c269e679d85a9006971bcec31deb018
  ENVOY_COMPILATION_MODE ?= opt
  # Increment BASE_ENVOY_RELVER on changes to `docker/base-envoy/Dockerfile`, or Envoy recipes.
  # You may reset BASE_ENVOY_RELVER when adjusting ENVOY_COMMIT.
--- a/charts/emissary-ingress/CHANGELOG.md
+++ b/charts/emissary-ingress/CHANGELOG.md
@ -3,7 +3,7 @@
 This file documents all notable changes to Ambassador Helm Chart. The release
 numbering uses [semantic versioning](http://semver.org).

-## v8.6.0 - TBD
+## v8.6.0 - 2023-04-17

 - Upgrade Emissary to v3.6.0 [CHANGELOG](https://github.com/emissary-ingress/emissary/blob/master/CHANGELOG.md)
 - Use autoscaling/v2 HorizontalPodAutoscaler if the cluster version is >v1.26 as autoscaling/v2beta2 is deprecated starting v1.23 and removed in v1.26. Thanks to [Elvind Valderhaug](https://github.com/eevdev)
--- a/docker/base-python/Dockerfile
+++ b/docker/base-python/Dockerfile
@ -78,7 +78,7 @@ RUN apk --no-cache add \
 # Pinning build version due to missing license info from pip show in newer versions
 RUN pip3 install pip-tools==6.12.1 build==0.9.0

-RUN curl --fail -L https://dl.google.com/go/go1.20.1.linux-amd64.tar.gz | tar -C /usr/local -xzf -
+RUN curl --fail -L https://dl.google.com/go/go1.20.3.linux-amd64.tar.gz | tar -C /usr/local -xzf -

 # The YAML parser is... special. To get the C version, we need to install Cython and libyaml, then
 # build it locally -- just using pip won't work.
--- a/docs/releaseNotes.yml
+++ b/docs/releaseNotes.yml
@ -34,12 +34,12 @@ changelog: https://github.com/emissary-ingress/emissary/blob/$branch$/CHANGELOG.
 items:
  - version: 3.6.0
    prevVersion: 3.5.0
-    date: 'TBD'
+    date: '2023-04-17'
    notes:
-      - title: Upgrade to Envoy 1.25.3
+      - title: Upgrade to Envoy 1.25.4
        type: feature
        body: >-
-          This upgrades $productName$ to be built on Envoy v1.25.3. This provides $productName$ with the latest
+          This upgrades $productName$ to be built on Envoy v1.25.4. This provides $productName$ with the latest
          security patches, performances enhancments, and features offered by the envoy proxy.

  - version: 3.5.0