From 132d9f806a27b83bc2b1655e02d1d421f3babd7d Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 3 Aug 2022 18:09:39 -0500 Subject: [PATCH 1/2] CHANGELOG: re-order changelog and remove extraneous trailing FEATURES --- CHANGELOG.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90a4c480b7..293fe23f34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,8 @@ ## UNRELEASED + FEATURES: * Transparent Proxy Egress * Add support for Destinations on the Service Defaults CRD. [[GH-1352](https://github.com/hashicorp/consul-k8s/pull/1352)] - -IMPROVEMENTS: -* Helm - * Bump default Envoy version to 1.23.0. [[GH-1377](https://github.com/hashicorp/consul-k8s/pull/1377)] -FEATURES: * [Experimental] Cluster Peering: * Add support for ACLs and TLS. [[GH-1343](https://github.com/hashicorp/consul-k8s/pull/1343)] [[GH-1366](https://github.com/hashicorp/consul-k8s/pull/1366)] * Add support for Load Balancers or external addresses in front of Consul servers for peering stream. @@ -14,6 +10,12 @@ FEATURES: * Support non-default partitions by using `externalServers.hosts` as the server addresses in the peering token. [[GH-1384](https://github.com/hashicorp/consul-k8s/pull/1384)] * Support arbitrary addresses as the server addresses in the peering token via `global.peering.tokenGeneration.source="static"` and `global.peering.tokenGeneration.static=["sample-server-address:8502"]`. [[GH-1392](https://github.com/hashicorp/consul-k8s/pull/1392)] +IMPROVEMENTS: +* Helm + * Bump default Envoy version to 1.23.0. [[GH-1377](https://github.com/hashicorp/consul-k8s/pull/1377)] + +FEATURES: + ## 0.46.1 (July 26, 2022) IMPROVEMENTS: From ac63dc66cc2f18732f08bc68fe48de81b7ceb314 Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 3 Aug 2022 18:22:03 -0500 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 293fe23f34..e65bab291c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,8 +14,6 @@ IMPROVEMENTS: * Helm * Bump default Envoy version to 1.23.0. [[GH-1377](https://github.com/hashicorp/consul-k8s/pull/1377)] -FEATURES: - ## 0.46.1 (July 26, 2022) IMPROVEMENTS: