Skip to content

Commit 67292f2

Browse files
authored
Merge branch 'main' into docs/authentication-filter-proposal-functional-tests
2 parents 137b22d + 1481231 commit 67292f2

File tree

40 files changed

+248
-210
lines changed

40 files changed

+248
-210
lines changed

.github/CHANGELOG_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,4 @@ CONTAINER IMAGES:
4141
- Control plane: `ghcr.io/nginx/nginx-gateway-fabric:%%VERSION%%`
4242
- Data plane: `ghcr.io/nginx/nginx-gateway-fabric/nginx:%%VERSION%%`
4343
- Data plane with NGINX Plus: `private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:%%VERSION%%`
44+
- Operator: `ghcr.io/nginx/nginx-gateway-fabric/operator:%%VERSION%%`

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ jobs:
185185
- name: Scan SBOM
186186
id: scan
187187
if: ${{ !inputs.dry_run }}
188-
uses: anchore/scan-action@40a61b52209e9d50e87917c5b901783d546b12d0 # v7.2.1
188+
uses: anchore/scan-action@3c9a191a0fbab285ca6b8530b5de5a642cba332f # v7.2.2
189189
with:
190190
sbom: "sbom-${{ inputs.image }}.json"
191191
only-fixed: true

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ jobs:
194194
run: make unit-test
195195

196196
- name: Upload coverage reports to Codecov
197-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
197+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
198198
with:
199199
token: ${{ secrets.CODECOV_TOKEN }}
200200

@@ -222,7 +222,7 @@ jobs:
222222
run: npm --prefix ${{ github.workspace }}/internal/controller/nginx/modules install-ci-test
223223

224224
- name: Upload coverage reports to Codecov
225-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
225+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
226226
with:
227227
token: ${{ secrets.CODECOV_TOKEN }}
228228

@@ -285,7 +285,7 @@ jobs:
285285

286286
- name: Download Syft
287287
if: ${{ inputs.is_production_release }}
288-
uses: anchore/sbom-action/download-syft@fbfd9c6c189226748411491745178e0c2017392d # v0.20.10
288+
uses: anchore/sbom-action/download-syft@43a17d6e7add2b5535efe4dcae9952337c479a93 # v0.20.11
289289

290290
- name: Install Cosign
291291
if: ${{ inputs.is_production_release }}

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
5151
with:
5252
working-directory: ${{ matrix.directory }}
53-
version: v2.6.2 # renovate: datasource=github-tags depName=golangci/golangci-lint
53+
version: v2.7.2 # renovate: datasource=github-tags depName=golangci/golangci-lint
5454

5555
njs-lint:
5656
name: NJS Lint

.github/workflows/nfr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ jobs:
191191
merge-multiple: true
192192

193193
- name: Open a PR with the results
194-
uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7.0.11
194+
uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
195195
with:
196196
token: ${{ secrets.GITHUB_TOKEN }}
197197
commit-message: NFR Test Results for NGF version ${{ needs.vars.outputs.version }}

.github/workflows/release-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
make generate-all
8383
8484
- name: Create Pull Request
85-
uses: peter-evans/create-pull-request@22a9089034f40e5a961c8808d113e2c98fb63676 # v7.0.11
85+
uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725 # v8.0.0
8686
with:
8787
token: ${{ secrets.GITHUB_TOKEN }}
8888
commit-message: Release ${{ inputs.version }}

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ repos:
3838
- javascript
3939

4040
- repo: https://github.com/golangci/golangci-lint
41-
rev: v2.6.2
41+
rev: v2.7.2
4242
hooks:
4343
- id: golangci-lint-full
4444
name: golangci-lint-root

CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,35 @@ This document includes a curated changelog for each release. We also publish a c
44
a [GitHub release](https://github.com/nginx/nginx-gateway-fabric/releases), which, by contrast, is auto-generated
55
and includes links to all PRs that went into the release.
66

7+
## Release 2.2.2
8+
9+
_December 10, 2025_
10+
11+
BUG FIXES:
12+
13+
- Complete processing in flight requests and ensure only main NGINX process is reloaded. [1319](https://github.com/nginx/agent/pull/1391)
14+
- Fix permission issue with nginx-gateway container for UBI. [4404](https://github.com/nginx/nginx-gateway-fabric/pull/4404)
15+
16+
HELM CHART:
17+
18+
- The version of the Helm chart is now 2.2.2
19+
20+
COMPATIBILITY:
21+
22+
- Gateway API version: `1.3.0`
23+
- Gateway API Inference Extension version: `1.0.1`
24+
- NGINX version: `1.29.2`
25+
- NGINX Plus version: `R35`
26+
- NGINX Agent version: `v3.6.0`
27+
- Kubernetes version: `1.25+`
28+
29+
CONTAINER IMAGES:
30+
31+
- Control plane: `ghcr.io/nginx/nginx-gateway-fabric:2.2.2`
32+
- Data plane: `ghcr.io/nginx/nginx-gateway-fabric/nginx:2.2.2`
33+
- Data plane with NGINX Plus: `private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:2.2.2`
34+
- Operator: `ghcr.io/nginx/nginx-gateway-fabric/operator:1.0.2`
35+
736
## Release 2.2.1
837

938
_November 13, 2025_

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ GO_LINKER_FLAGS = $(GO_LINKER_FLAGS_OPTIMIZATIONS) $(GO_LINKER_FlAGS_VARS)
2424

2525
# tools versions
2626
# renovate: datasource=github-tags depName=golangci/golangci-lint
27-
GOLANGCI_LINT_VERSION = v2.6.2
27+
GOLANGCI_LINT_VERSION = v2.7.2
2828
# renovate: datasource=docker depName=kindest/node
2929
KIND_K8S_VERSION = v1.34.0
3030
# renovate: datasource=github-tags depName=norwoodj/helm-docs

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ You can find the comprehensive NGINX Gateway Fabric user documentation on the [N
3636
We publish NGINX Gateway Fabric releases on GitHub. See
3737
our [releases page](https://github.com/nginx/nginx-gateway-fabric/releases).
3838

39-
The latest release is [2.2.1](https://github.com/nginx/nginx-gateway-fabric/releases/tag/v2.2.1).
39+
The latest release is [2.2.2](https://github.com/nginx/nginx-gateway-fabric/releases/tag/v2.2.2).
4040

4141
The edge version is useful for experimenting with new features that are not yet published in a release. To use, choose
4242
the _edge_ version built from the [latest commit](https://github.com/nginx/nginx-gateway-fabric/commits/main)
@@ -47,7 +47,7 @@ to the correct versions:
4747

4848
| Version | Description | Installation Manifests | Documentation and Examples |
4949
| ------- | ----------- | ---------------------- | -------------------------- |
50-
| Latest release | For production use | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/v2.2.1/deploy). | [Documentation](https://docs.nginx.com/nginx-gateway-fabric). [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/v2.2.1/examples). |
50+
| Latest release | For production use | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/v2.2.2/deploy). | [Documentation](https://docs.nginx.com/nginx-gateway-fabric). [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/v2.2.2/examples). |
5151
| Edge | For experimental use and latest features | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/main/deploy). | [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/main/examples). |
5252

5353
### Versioning
@@ -69,6 +69,7 @@ The following table lists the software versions NGINX Gateway Fabric supports.
6969
| NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus | NGINX Agent |
7070
|----------------------|-------------|------------|-----------|------------|-------------|
7171
| Edge | 1.4.1 | 1.25+ | 1.29.3 | R36 | v3.6.0 |
72+
| 2.2.2 | 1.3.0 | 1.25+ | 1.29.2 | R35 | v3.6.0 |
7273
| 2.2.1 | 1.3.0 | 1.25+ | 1.29.2 | R35 | v3.5.0 |
7374
| 2.2.0 | 1.3.0 | 1.25+ | 1.29.2 | R35 | v3.3.2 |
7475
| 2.1.4 | 1.3.0 | 1.25+ | 1.29.1 | R35 | v3.3.1 |

0 commit comments

Comments
 (0)