Reconcile dev after merge to main for v1.15.1 (#2972)

Follow-up to the v1.15.1 being officially released, bringing version
bumps and changelog updates into the `dev` branch.

Author: abernix

.changesets/config_extra_containers_fix.md

@@ -4,6 +4,50 @@ All notable changes to Router will be documented in this file.
 
 This project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html).
 
+# [1.15.1] - 2023-04-18
+
+## 🐛 Fixes
+
+### Resolve Docker `unrecognized subcommand` error ([Issue #2966](https://github.com/apollographql/router/issues/2966))
+
+We've repaired the Docker build of the v1.15.0 release which broke due to the introduction of syntax in the Dockerfile which can only be used by the the `docker buildx` tooling [which leverages Moby BuildKit](https://www.docker.com/blog/introduction-to-heredocs-in-dockerfiles/).
+
+Furthermore, the change didn't apply to the `diy` ("do-it-yourself") image, and we'd like to prevent the two Dockerfiles from deviating more than necessary.
+
+Overall, this reverts [apollographql/router#2925](https://github.com/apollographql/router/pull/2925).
+
+By [@abernix](https://github.com/abernix) in https://github.com/apollographql/router/pull/2968
+
+### Helm Chart `extraContainers`
+
+This is another iteration on the functionality for supporting side-cars within Helm charts, which is quite useful for [coprocessor](https://www.apollographql.com/docs/router/customizations/coprocessor/) configurations.
+
+By [@pcarrier](https://github.com/pcarrier) in https://github.com/apollographql/router/pull/2967
+
+## 📃 Configuration
+
+### Treat Helm `extraLabels` as templates
+
+It is now possible to use data from Helm's `Values` or `Chart` objects to add additional labels to Kubernetes Deployments of Pods.
+
+As of this release, the following example:
+
+```yaml
+extraLabels:
+  env: {{ .Chart.AppVersion }}
+```
+
+... will now result in:
+
+```yaml
+labels:
+  env: "v1.2.3"
+```
+
+Previously, this would have resulted in merely emitting the untemplatized `{{ .Chart.AppVersion }}` value, resulting in an invalid label.
+
+By [@gscheibel](https://github.com/gscheibel) in https://github.com/apollographql/router/pull/2962
+
 # [1.15.0] - 2023-04-17
 
 ## 🚀 Features

.changesets/config_extra_labels_tpl.md

@@ -272,7 +272,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
  "access-json",
  "ansi_term",
@@ -405,7 +405,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-benchmarks"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
  "apollo-parser 0.4.1",
  "apollo-router",
@@ -421,7 +421,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-scaffold"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
  "anyhow",
  "cargo-scaffold",

.changesets/fix_muscle_peach_thunderstorm_musical.md

@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-benchmarks"
-version = "1.15.0"
+version = "1.15.1"
 authors = ["Apollo Graph, Inc. <[email protected]>"]
 edition = "2021"
 license = "Elastic-2.0"

CHANGELOG.md

@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-scaffold"
-version = "1.15.0"
+version = "1.15.1"
 authors = ["Apollo Graph, Inc. <[email protected]>"]
 edition = "2021"
 license = "Elastic-2.0"

Cargo.lock

@@ -22,7 +22,7 @@ apollo-router = { path ="{{integration_test}}apollo-router" }
 apollo-router = { git="https://github.com/apollographql/router.git", branch="{{branch}}" }
 {{else}}
 # Note if you update these dependencies then also update xtask/Cargo.toml
-apollo-router = "1.15.0"
+apollo-router = "1.15.1"
 {{/if}}
 {{/if}}
 async-trait = "0.1.52"

apollo-router-benchmarks/Cargo.toml

@@ -13,7 +13,7 @@ apollo-router-scaffold = { path ="{{integration_test}}apollo-router-scaffold" }
 {{#if branch}}
 apollo-router-scaffold = { git="https://github.com/apollographql/router.git", branch="{{branch}}" }
 {{else}}
-apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.15.0" }
+apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.15.1" }
 {{/if}}
 {{/if}}
 anyhow = "1.0.58"

apollo-router-scaffold/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router"
-version = "1.15.0"
+version = "1.15.1"
 authors = ["Apollo Graph, Inc. <[email protected]>"]
 repository = "https://github.com/apollographql/router/"
 documentation = "https://docs.rs/apollo-router"