Skip to content

Commit 4f5a41e

Browse files
shaun-nxshaun-nx
authored
Merge branch 'main' into proposal/external-auth-filter
2 parents 7e1e2a0 + 5c78a60 commit 4f5a41e

32 files changed

+243
-161
lines changed

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
ref: ${{ (inputs.tag != '' && !inputs.dry_run && inputs.image != 'operator') && format('refs/tags/{0}', inputs.tag) || github.ref }}
5454

5555
- name: Download Artifacts
56-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
56+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
5757
with:
5858
name: dist-${{ github.run_id }}
5959
path: ${{ github.workspace }}/dist
@@ -185,15 +185,15 @@ jobs:
185185
- name: Scan SBOM
186186
id: scan
187187
if: ${{ !inputs.dry_run }}
188-
uses: anchore/scan-action@a5605eb0943e46279cb4fbd9d44297355d3520ab # v7.0.2
188+
uses: anchore/scan-action@568b89d27fc18c60e56937bff480c91c772cd993 # v7.1.0
189189
with:
190190
sbom: "sbom-${{ inputs.image }}.json"
191191
only-fixed: true
192192
add-cpes-if-none: true
193193
fail-build: false
194194

195195
- name: Upload scan result to GitHub Security tab
196-
uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
196+
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
197197
if: ${{ !inputs.dry_run }}
198198
continue-on-error: true
199199
with:

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ jobs:
199199
token: ${{ secrets.CODECOV_TOKEN }}
200200

201201
- name: Upload Coverage Report
202-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
202+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
203203
with:
204204
name: cover-${{ github.run_id }}.html
205205
path: ${{ github.workspace }}/cover.html
@@ -294,7 +294,7 @@ jobs:
294294
- name: Build binary
295295
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
296296
with:
297-
version: v2.12.6 # renovate: datasource=github-tags depName=goreleaser/goreleaser
297+
version: v2.12.7 # 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 }}
@@ -324,7 +324,7 @@ jobs:
324324
echo "json=$json" >> $GITHUB_OUTPUT
325325
326326
- name: Upload Artifacts
327-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
327+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
328328
with:
329329
name: dist-${{ github.run_id }}
330330
path: ${{ github.workspace }}/dist
@@ -359,7 +359,7 @@ jobs:
359359
go-version: stable
360360

361361
- name: Download Artifacts
362-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
362+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
363363
with:
364364
name: dist-${{ github.run_id }}
365365
path: ${{ github.workspace }}/dist

‎.github/workflows/conformance.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
- name: Build binary
108108
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
109109
with:
110-
version: v2.12.6 # renovate: datasource=github-tags depName=goreleaser/goreleaser
110+
version: v2.12.7 # renovate: datasource=github-tags depName=goreleaser/goreleaser
111111
args: build --single-target --snapshot --clean
112112
env:
113113
TELEMETRY_ENDPOINT: "" # disables sending telemetry
@@ -187,7 +187,7 @@ jobs:
187187

188188
- name: Upload profile to GitHub
189189
if: ${{ inputs.enable-experimental }}
190-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
190+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
191191
with:
192192
name: conformance-profile-${{ inputs.image }}-${{ inputs.k8s-version }}-${{ steps.ngf-meta.outputs.version }}
193193
path: ./tests/conformance-profile.yaml
@@ -208,7 +208,7 @@ jobs:
208208

209209
- name: Upload profile to GitHub
210210
if: ${{ inputs.enable-experimental }} # add experimental flag to filter result upload
211-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
211+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
212212
with:
213213
name: conformance-profile-inference-${{ inputs.image }}-${{ inputs.k8s-version }}-${{ steps.ngf-meta.outputs.version }}-${{ github.run_id }}
214214
path: ./tests/conformance-profile-inference.yaml

‎.github/workflows/functional.yml‎

Lines changed: 2 additions & 2 deletions
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.6 # renovate: datasource=github-tags depName=goreleaser/goreleaser
90+
version: v2.12.7 # 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
@@ -129,7 +129,7 @@ jobs:
129129

130130
- name: Install cloud-provider-kind
131131
run: |
132-
CLOUD_PROVIDER_KIND_VERSION=v0.8.0 # renovate: datasource=github-tags depName=kubernetes-sigs/cloud-provider-kind
132+
CLOUD_PROVIDER_KIND_VERSION=v0.9.0 # renovate: datasource=github-tags depName=kubernetes-sigs/cloud-provider-kind
133133
go install sigs.k8s.io/cloud-provider-kind@${CLOUD_PROVIDER_KIND_VERSION}
134134
135135
- name: Run cloud-provider-kind

‎.github/workflows/helm.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fetch-depth: 0
3030

3131
- name: Download Artifacts
32-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
32+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
3333
with:
3434
name: dist-${{ github.run_id }}
3535
path: ${{ github.workspace }}/dist
@@ -90,7 +90,7 @@ jobs:
9090
9191
- name: Install cloud-provider-kind
9292
run: |
93-
CLOUD_PROVIDER_KIND_VERSION=v0.8.0 # renovate: datasource=github-tags depName=kubernetes-sigs/cloud-provider-kind
93+
CLOUD_PROVIDER_KIND_VERSION=v0.9.0 # renovate: datasource=github-tags depName=kubernetes-sigs/cloud-provider-kind
9494
go install sigs.k8s.io/cloud-provider-kind@${CLOUD_PROVIDER_KIND_VERSION}
9595
9696
- name: Run cloud-provider-kind
@@ -143,7 +143,7 @@ jobs:
143143

144144
- name: Install cloud-provider-kind
145145
run: |
146-
CLOUD_PROVIDER_KIND_VERSION=v0.8.0 # renovate: datasource=github-tags depName=kubernetes-sigs/cloud-provider-kind
146+
CLOUD_PROVIDER_KIND_VERSION=v0.9.0 # renovate: datasource=github-tags depName=kubernetes-sigs/cloud-provider-kind
147147
go install sigs.k8s.io/cloud-provider-kind@${CLOUD_PROVIDER_KIND_VERSION}
148148
149149
- name: Run cloud-provider-kind

‎.github/workflows/nfr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
fi
160160
161161
- name: Upload Artifacts
162-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
162+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
163163
with:
164164
name: results-${{ matrix.type }}
165165
path: tests/results/**/*-${{ matrix.type }}.*
@@ -185,7 +185,7 @@ jobs:
185185
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
186186

187187
- name: Download Artifacts
188-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
188+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
189189
with:
190190
path: tests/results/
191191
merge-multiple: true

‎.github/workflows/scorecards.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ jobs:
5252
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5353
# format to the repository Actions tab.
5454
- name: "Upload artifact"
55-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
55+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
5656
with:
5757
name: SARIF file
5858
path: results.sarif
5959
retention-days: 5
6060

6161
# Upload the results to GitHub's code scanning dashboard.
6262
- name: "Upload to code-scanning"
63-
uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
63+
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
6464
with:
6565
sarif_file: results.sarif

‎.yamllint.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ rules:
4141
.goreleaser.yml
4242
charts/nginx-gateway-fabric/
4343
operators/config/crd/bases/gateway.nginx.org_nginxgatewayfabrics.yaml
44+
operators/bundle/manifests/nginx-gateway-fabric.clusterserviceversion.yaml
4445
new-line-at-end-of-file: enable
4546
new-lines: enable
4647
octal-values: disable

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ helm-install-local: install-gateway-crds ## Helm install NGF on configured kind
241241
@if [ "$(ENABLE_INFERENCE_EXTENSION)" = "true" ]; then \
242242
$(MAKE) install-inference-crds; \
243243
fi
244-
helm install nginx-gateway $(CHART_DIR) --set nginx.image.repository=$(NGINX_PREFIX) --create-namespace --wait --set nginxGateway.image.pullPolicy=Never --set nginx.service.type=NodePort --set nginxGateway.image.repository=$(PREFIX) --set nginxGateway.image.tag=$(TAG) --set nginx.image.tag=$(TAG) --set nginx.image.pullPolicy=Never --set nginxGateway.gwAPIExperimentalFeatures.enable=$(ENABLE_EXPERIMENTAL) -n nginx-gateway $(HELM_PARAMETERS)
244+
helm install nginx-gateway $(CHART_DIR) --set nginx.image.repository=$(NGINX_PREFIX) --create-namespace --wait --set nginxGateway.image.pullPolicy=$(PULL_POLICY) --set nginx.service.type=$(NGINX_SERVICE_TYPE) --set nginxGateway.image.repository=$(PREFIX) --set nginxGateway.image.tag=$(TAG) --set nginx.image.tag=$(TAG) --set nginx.image.pullPolicy=$(PULL_POLICY) --set nginxGateway.gwAPIExperimentalFeatures.enable=$(ENABLE_EXPERIMENTAL) -n nginx-gateway $(HELM_PARAMETERS)
245245

246246
.PHONY: helm-install-local-with-plus
247247
helm-install-local-with-plus: check-for-plus-usage-endpoint install-gateway-crds ## Helm install NGF with NGINX Plus on configured kind cluster with local images. To build, load, and install with helm run make install-ngf-local-build-with-plus.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The following table lists the software versions NGINX Gateway Fabric supports.
6868

6969
| NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus | NGINX Agent |
7070
|----------------------|-------------|------------|-----------|------------|-------------|
71-
| Edge | 1.3.0 | 1.25+ | 1.29.2 | R35 | v3.3.2 |
71+
| Edge | 1.3.0 | 1.25+ | 1.29.2 | R35 | v3.4.2 |
7272
| 2.2.0 | 1.3.0 | 1.25+ | 1.29.2 | R35 | v3.3.2 |
7373
| 2.1.4 | 1.3.0 | 1.25+ | 1.29.1 | R35 | v3.3.1 |
7474
| 2.1.3 | 1.3.0 | 1.25+ | 1.29.1 | R35 | v3.3.1 |

0 commit comments

Comments
 (0)