Skip to content

Commit 77eb226

Browse files
shaun-nxshaun-nx
authored
Merge branch 'main' into proposal/auth-filter
2 parents 601f362 + c0902dc commit 77eb226

File tree

9 files changed

+69
-16
lines changed

9 files changed

+69
-16
lines changed

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Checkout Repository
5151
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5252
with:
53-
ref: ${{ (inputs.tag != '' && !inputs.dry_run ) && format('refs/tags/{0}', inputs.tag) || github.ref }}
53+
ref: ${{ (inputs.tag != '' && !inputs.dry_run && inputs.image != 'operator') && format('refs/tags/{0}', inputs.tag) || github.ref }}
5454

5555
- name: Download Artifacts
5656
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
@@ -68,6 +68,13 @@ jobs:
6868
with:
6969
platforms: arm64
7070

71+
- name: Login to Docker Hub
72+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
73+
with:
74+
username: ${{ secrets.DOCKER_USERNAME }}
75+
password: ${{ secrets.DOCKER_PASSWORD }}
76+
if: ${{ inputs.runner == 'ubuntu-24.04-amd64' }}
77+
7178
- name: Login to GitHub Container Registry
7279
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
7380
if: ${{ github.event_name != 'pull_request' && ! contains(inputs.image, 'plus') }}
@@ -123,7 +130,7 @@ jobs:
123130
name=ghcr.io/${{ github.repository_owner }}/nginx-gateway-fabric/operator,enable=${{ inputs.image == 'operator' && github.event_name != 'pull_request' }}
124131
name=localhost:5000/nginx-gateway-fabric/${{ inputs.image }}
125132
flavor: |
126-
latest=${{ (inputs.tag != '' && 'true') || 'auto' }}
133+
latest=${{ inputs.build-os != '' && 'false' || (inputs.tag != '' && 'true') || 'auto' }}
127134
tags: |
128135
type=semver,pattern={{version}},value=${{ inputs.tag }},enable=${{ inputs.tag != '' }},suffix=${{ inputs.build-os != '' && format('-{0}', inputs.build-os) || '' }}
129136
type=edge,suffix=${{ inputs.build-os != '' && format('-{0}', inputs.build-os) || '' }}

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ jobs:
294294
- name: Build binary
295295
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
296296
with:
297-
version: v2.12.5 # renovate: datasource=github-tags depName=goreleaser/goreleaser
297+
version: v2.12.6 # renovate: datasource=github-tags depName=goreleaser/goreleaser
298298
args: ${{ (inputs.is_production_release && (inputs.dry_run == false || inputs.dry_run == null)) && 'release' || 'build --snapshot' }} --clean
299299
env:
300300
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -531,16 +531,19 @@ jobs:
531531

532532
publish-helm:
533533
name: Package and Publish Helm Chart
534-
runs-on: ${{ github.repository_owner == 'nginx' && (inputs.is_production_release || ((github.event_name == 'push' || github.event_name == 'schedule') && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-')))) && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
534+
runs-on: ${{ github.repository_owner == 'nginx' && 'ubuntu-24.04-amd64' || 'ubuntu-24.04' }}
535535
needs: [vars, helm-tests]
536-
if: ${{ (inputs.is_production_release && (inputs.dry_run == false || inputs.dry_run == null)) || (github.event_name == 'push' && ! startsWith(github.ref, 'refs/heads/release-')) }}
536+
if: ${{ inputs.is_production_release || github.ref == 'refs/heads/main' }}
537537
permissions:
538538
contents: read
539539
packages: write # for helm to push to GHCR
540540
steps:
541541
- name: Checkout Repository
542542
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
543543

544+
- name: Setup Helm
545+
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
546+
544547
- name: Login to GitHub Container Registry
545548
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
546549
with:

‎.github/workflows/conformance.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
type=schedule,suffix=${{ inputs.build-os != '' && format('-{0}', inputs.build-os) || '' }}
8989
type=ref,event=pr,suffix=${{ inputs.build-os != '' && format('-{0}', inputs.build-os) || '' }}
9090
type=ref,event=branch,suffix=-rc${{ inputs.build-os != '' && format('-{0}', inputs.build-os) || '' }},enable=${{ startsWith(github.ref, 'refs/heads/release') && !inputs.production-release }}
91-
type=raw,value={{ inputs.release_version }},enable=${{ inputs.production-release && inputs.release_version != '' }},suffix=${{ inputs.build-os != '' && format('-{0}', inputs.build-os) || '' }}
91+
type=raw,value=${{ inputs.release_version }},enable=${{ inputs.production-release && inputs.release_version != '' }},suffix=${{ inputs.build-os != '' && format('-{0}', inputs.build-os) || '' }}
9292
9393
- name: NGINX Docker meta
9494
id: nginx-meta
@@ -102,12 +102,12 @@ jobs:
102102
type=schedule,suffix=${{ inputs.build-os != '' && format('-{0}', inputs.build-os) || '' }}
103103
type=ref,event=pr,suffix=${{ inputs.build-os != '' && format('-{0}', inputs.build-os) || '' }}
104104
type=ref,event=branch,suffix=-rc${{ inputs.build-os != '' && format('-{0}', inputs.build-os) || '' }},enable=${{ startsWith(github.ref, 'refs/heads/release') && !inputs.production-release }}
105-
type=raw,value={{ inputs.release_version }},enable=${{ inputs.production-release && inputs.release_version != '' }},suffix=${{ inputs.build-os != '' && format('-{0}', inputs.build-os) || '' }}
105+
type=raw,value=${{ inputs.release_version }},enable=${{ inputs.production-release && inputs.release_version != '' }},suffix=${{ inputs.build-os != '' && format('-{0}', inputs.build-os) || '' }}
106106
107107
- name: Build binary
108108
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
109109
with:
110-
version: v2.12.5 # renovate: datasource=github-tags depName=goreleaser/goreleaser
110+
version: v2.12.6 # renovate: datasource=github-tags depName=goreleaser/goreleaser
111111
args: build --single-target --snapshot --clean
112112
env:
113113
TELEMETRY_ENDPOINT: "" # disables sending telemetry

‎.github/workflows/functional.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
- name: Build binary
8888
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
8989
with:
90-
version: v2.12.5 # renovate: datasource=github-tags depName=goreleaser/goreleaser
90+
version: v2.12.6 # renovate: datasource=github-tags depName=goreleaser/goreleaser
9191
args: build --single-target --snapshot --clean
9292
env:
9393
TELEMETRY_ENDPOINT: otel-collector-opentelemetry-collector.collector.svc.cluster.local:4317

‎.goreleaser.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ builds:
2727
changelog:
2828
disable: true
2929

30+
release:
31+
mode: keep-existing
32+
draft: false
33+
prerelease: auto
34+
3035
archives:
3136
- id: gateway
3237

@@ -39,11 +44,10 @@ signs:
3944
- cmd: cosign
4045
artifacts: checksum
4146
output: true
42-
certificate: "${artifact}.pem"
47+
signature: "${artifact}.sig.bundle"
4348
args:
4449
- sign-blob
45-
- "--output-signature=${signature}"
46-
- "--output-certificate=${certificate}"
50+
- "--bundle=${signature}"
4751
- "${artifact}"
4852
- "--yes"
4953

‎CHANGELOG.md‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,44 @@ 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.0
8+
9+
_October 22, 2025_
10+
11+
FEATURES:
12+
13+
- Add first class OpenShift support, including UBI based images and an Operator. [4001](https://github.com/nginx/nginx-gateway-fabric/pull/4001)
14+
- Add regex for path matching. [3874](https://github.com/nginx/nginx-gateway-fabric/pull/3874). Thanks to [fabian4](https://github.com/fabian4)
15+
- Add support for Inference Extension. [4091](https://github.com/nginx/nginx-gateway-fabric/pull/4091)
16+
- Support ExternalName Services. [3759](https://github.com/nginx/nginx-gateway-fabric/pull/3759)
17+
- Add support for Gateway addresses field. [3896](https://github.com/nginx/nginx-gateway-fabric/pull/3896)
18+
- Add support for Port in ParentReference. [3778](https://github.com/nginx/nginx-gateway-fabric/pull/3778)
19+
20+
BUG FIXES:
21+
22+
- Handle duplicate kinds in listener allowed kinds. [3810](https://github.com/nginx/nginx-gateway-fabric/pull/3810)
23+
- Align with BackendTLSPolicy validation. [3871](https://github.com/nginx/nginx-gateway-fabric/pull/3871)
24+
25+
HELM CHART:
26+
27+
- The version of the Helm chart is now 2.2.0
28+
- Set NGINX Plus default image. [3919](https://github.com/nginx/nginx-gateway-fabric/pull/3919)
29+
30+
COMPATIBILITY:
31+
32+
- Gateway API version: `1.3.0`
33+
- NGINX version: `1.29.2`
34+
- NGINX Plus version: `R35`
35+
- NGINX Agent version: `v3.3.2`
36+
- Kubernetes version: `1.25+`
37+
38+
CONTAINER IMAGES:
39+
40+
- Control plane: `ghcr.io/nginx/nginx-gateway-fabric:2.2.0`
41+
- Data plane: `ghcr.io/nginx/nginx-gateway-fabric/nginx:2.2.0`
42+
- Data plane with NGINX Plus: `private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:2.2.0`
43+
- Operator: `ghcr.io/nginx/nginx-gateway-fabric/operator:1.0.0`
44+
745
## Release 2.1.4
846

947
_October 1, 2025_

‎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.1.4](https://github.com/nginx/nginx-gateway-fabric/releases/tag/v2.1.4).
39+
The latest release is [2.2.0](https://github.com/nginx/nginx-gateway-fabric/releases/tag/v2.2.0).
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.1.4/deploy). | [Documentation](https://docs.nginx.com/nginx-gateway-fabric). [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/v2.1.4/examples). |
50+
| Latest release | For production use | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/v2.2.0/deploy). | [Documentation](https://docs.nginx.com/nginx-gateway-fabric). [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/v2.2.0/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.3.0 | 1.25+ | 1.29.2 | R35 | v3.3.2 |
72+
| 2.2.0 | 1.3.0 | 1.25+ | 1.29.2 | R35 | v3.3.2 |
7273
| 2.1.4 | 1.3.0 | 1.25+ | 1.29.1 | R35 | v3.3.1 |
7374
| 2.1.3 | 1.3.0 | 1.25+ | 1.29.1 | R35 | v3.3.1 |
7475
| 2.1.2 | 1.3.0 | 1.25+ | 1.29.1 | R35 | v3.3.1 |

‎charts/nginx-gateway-fabric/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: nginx-gateway-fabric
33
description: NGINX Gateway Fabric
44
type: application
5-
version: 2.1.4
5+
version: 2.2.0
66
appVersion: "edge"
77
kubeVersion: ">= 1.25.0-0"
88
home: https://github.com/nginx/nginx-gateway-fabric

‎charts/nginx-gateway-fabric/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# NGINX Gateway Fabric Helm Chart
33

4-
![Version: 2.1.4](https://img.shields.io/badge/Version-2.1.4-informational?style=flat-square) ![AppVersion: edge](https://img.shields.io/badge/AppVersion-edge-informational?style=flat-square)
4+
![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![AppVersion: edge](https://img.shields.io/badge/AppVersion-edge-informational?style=flat-square)
55

66
- [NGINX Gateway Fabric Helm Chart](#nginx-gateway-fabric-helm-chart)
77
- [Introduction](#introduction)

0 commit comments

Comments
 (0)