Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .changesets/fix_bryn_connection_cancellation_race.md

This file was deleted.

12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

This project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html).

# [2.6.2] - 2025-09-08

## 🐛 Fixes

### Connection shutdown sometimes fails during hot-reload ([PR #8169](https://github.com/apollographql/router/pull/8169))

A race condition in connection shutdown during a hot reload event occasionally left some connections in an active state instead of entering terminating state. This could cause out-of-memory errors over time as multiple pipelines remained active.

Connections that open during shutdown now immediately terminate.

By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/8169

# [2.6.1] - 2025-09-08

## 🐛 Fixes
Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ dependencies = [

[[package]]
name = "apollo-federation"
version = "2.6.2-rc.1"
version = "2.6.2"
dependencies = [
"apollo-compiler",
"apollo-federation",
Expand Down Expand Up @@ -265,7 +265,7 @@ dependencies = [

[[package]]
name = "apollo-router"
version = "2.6.2-rc.1"
version = "2.6.2"
dependencies = [
"ahash",
"anyhow",
Expand Down Expand Up @@ -442,7 +442,7 @@ dependencies = [

[[package]]
name = "apollo-router-benchmarks"
version = "2.6.2-rc.1"
version = "2.6.2"
dependencies = [
"apollo-parser",
"apollo-router",
Expand Down
2 changes: 1 addition & 1 deletion apollo-federation/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "apollo-federation"
version = "2.6.2-rc.1"
version = "2.6.2"
authors = ["The Apollo GraphQL Contributors"]
edition = "2024"
description = "Apollo Federation"
Expand Down
2 changes: 1 addition & 1 deletion apollo-router-benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "apollo-router-benchmarks"
version = "2.6.2-rc.1"
version = "2.6.2"
authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
edition = "2021"
license = "Elastic-2.0"
Expand Down
4 changes: 2 additions & 2 deletions apollo-router/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "apollo-router"
version = "2.6.2-rc.1"
version = "2.6.2"
authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
repository = "https://github.com/apollographql/router/"
documentation = "https://docs.rs/apollo-router"
Expand Down Expand Up @@ -58,7 +58,7 @@ snapshot = ["axum-server"]
[dependencies]
anyhow = "1.0.86"
apollo-compiler.workspace = true
apollo-federation = { path = "../apollo-federation", version = "=2.6.2-rc.1" }
apollo-federation = { path = "../apollo-federation", version = "=2.6.2" }
async-compression = { version = "0.4.6", features = [
"tokio",
"brotli",
Expand Down
30 changes: 15 additions & 15 deletions docs/shared/k8s-manual-config.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ kind: ServiceAccount
metadata:
name: release-name-router
labels:
helm.sh/chart: router-2.6.2-rc.1
helm.sh/chart: router-2.6.2
app.kubernetes.io/name: router
app.kubernetes.io/instance: release-name
app.kubernetes.io/version: "v2.6.2-rc.1"
app.kubernetes.io/version: "v2.6.2"
app.kubernetes.io/managed-by: Helm
---
# Source: router/templates/secret.yaml
Expand All @@ -18,10 +18,10 @@ kind: Secret
metadata:
name: "release-name-router"
labels:
helm.sh/chart: router-2.6.2-rc.1
helm.sh/chart: router-2.6.2
app.kubernetes.io/name: router
app.kubernetes.io/instance: release-name
app.kubernetes.io/version: "v2.6.2-rc.1"
app.kubernetes.io/version: "v2.6.2"
app.kubernetes.io/managed-by: Helm
data:
managedFederationApiKey: "UkVEQUNURUQ="
Expand All @@ -32,10 +32,10 @@ kind: ConfigMap
metadata:
name: release-name-router
labels:
helm.sh/chart: router-2.6.2-rc.1
helm.sh/chart: router-2.6.2
app.kubernetes.io/name: router
app.kubernetes.io/instance: release-name
app.kubernetes.io/version: "v2.6.2-rc.1"
app.kubernetes.io/version: "v2.6.2"
app.kubernetes.io/managed-by: Helm
data:
configuration.yaml: |
Expand All @@ -55,10 +55,10 @@ kind: Service
metadata:
name: release-name-router
labels:
helm.sh/chart: router-2.6.2-rc.1
helm.sh/chart: router-2.6.2
app.kubernetes.io/name: router
app.kubernetes.io/instance: release-name
app.kubernetes.io/version: "v2.6.2-rc.1"
app.kubernetes.io/version: "v2.6.2"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -81,10 +81,10 @@ kind: Deployment
metadata:
name: release-name-router
labels:
helm.sh/chart: router-2.6.2-rc.1
helm.sh/chart: router-2.6.2
app.kubernetes.io/name: router
app.kubernetes.io/instance: release-name
app.kubernetes.io/version: "v2.6.2-rc.1"
app.kubernetes.io/version: "v2.6.2"
app.kubernetes.io/managed-by: Helm
annotations:

Expand All @@ -103,10 +103,10 @@ spec:
annotations:
kubectl.kubernetes.io/default-container: router
labels:
helm.sh/chart: router-2.6.2-rc.1
helm.sh/chart: router-2.6.2
app.kubernetes.io/name: router
app.kubernetes.io/instance: release-name
app.kubernetes.io/version: "v2.6.2-rc.1"
app.kubernetes.io/version: "v2.6.2"
app.kubernetes.io/managed-by: Helm
spec:
serviceAccountName: release-name-router
Expand All @@ -117,7 +117,7 @@ spec:
- name: router
securityContext:
{}
image: "ghcr.io/apollographql/router:v2.6.2-rc.1"
image: "ghcr.io/apollographql/router:v2.6.2"
imagePullPolicy: IfNotPresent
args:
- --hot-reload
Expand Down Expand Up @@ -171,10 +171,10 @@ kind: Pod
metadata:
name: "release-name-router-test-connection"
labels:
helm.sh/chart: router-2.6.2-rc.1
helm.sh/chart: router-2.6.2
app.kubernetes.io/name: router
app.kubernetes.io/instance: release-name
app.kubernetes.io/version: "v2.6.2-rc.1"
app.kubernetes.io/version: "v2.6.2"
app.kubernetes.io/managed-by: Helm
annotations:
"helm.sh/hook": test
Expand Down
4 changes: 2 additions & 2 deletions helm/chart/router/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ type: application
# so it matches the shape of our release process and release automation.
# By proxy of that decision, this version uses SemVer 2.0.0, though the prefix
# of "v" is not included.
version: 2.6.2-rc.1
version: 2.6.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "v2.6.2-rc.1"
appVersion: "v2.6.2"
6 changes: 3 additions & 3 deletions helm/chart/router/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[router](https://github.com/apollographql/router) Rust Graph Routing runtime for Apollo Federation

![Version: 2.6.2-rc.1](https://img.shields.io/badge/Version-2.6.2--rc.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.6.2-rc.1](https://img.shields.io/badge/AppVersion-v2.6.2--rc.1-informational?style=flat-square)
![Version: 2.6.2](https://img.shields.io/badge/Version-2.6.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.6.2](https://img.shields.io/badge/AppVersion-v2.6.2-informational?style=flat-square)

## Prerequisites

Expand All @@ -11,15 +11,15 @@
## Get Repo Info

```console
helm pull oci://ghcr.io/apollographql/helm-charts/router --version 2.6.2-rc.1
helm pull oci://ghcr.io/apollographql/helm-charts/router --version 2.6.2
```

## Install Chart

**Important:** only helm3 is supported

```console
helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 2.6.2-rc.1 --values my-values.yaml
helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 2.6.2 --values my-values.yaml
```

_See [configuration](#configuration) below._
Expand Down
Loading