Skip to content

Commit a987d89

Browse files
sjbermansjberman
authored
Merge branch 'main' into bug/ip-dupe
2 parents 60bcd03 + c94688c commit a987d89

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1695
-402
lines changed

‎.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
platforms: arm64
5757

5858
- name: Login to GitHub Container Registry
59-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
59+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
6060
if: ${{ github.event_name != 'pull_request' && ! contains(inputs.image, 'plus') }}
6161
with:
6262
registry: ghcr.io
@@ -73,7 +73,7 @@ jobs:
7373
if: ${{ github.event_name != 'pull_request' && contains(inputs.image, 'plus')}}
7474

7575
- name: Login to NGINX Registry
76-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
76+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
7777
with:
7878
registry: docker-mgmt.nginx.com
7979
username: ${{ steps.idtoken.outputs.id_token }}
@@ -82,15 +82,15 @@ jobs:
8282

8383
- name: Authenticate to Google Cloud
8484
id: auth
85-
uses: google-github-actions/auth@140bb5113ffb6b65a7e9b937a81fa96cf5064462 # v2.1.11
85+
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
8686
with:
8787
token_format: access_token
8888
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}
8989
service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
9090
if: ${{ github.event_name != 'pull_request' && contains(inputs.image, 'plus') }}
9191

9292
- name: Login to GAR
93-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
93+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
9494
with:
9595
registry: us-docker.pkg.dev
9696
username: oauth2accesstoken
@@ -99,7 +99,7 @@ jobs:
9999

100100
- name: Docker meta
101101
id: meta
102-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
102+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
103103
with:
104104
context: ${{ inputs.tag != '' && 'git' || 'workflow' }}
105105
images: |
@@ -163,15 +163,15 @@ jobs:
163163
164164
- name: Scan SBOM
165165
id: scan
166-
uses: anchore/scan-action@df395807f4554463d4455b8047cf58e37b6acaae # v6.5.0
166+
uses: anchore/scan-action@1638637db639e0ade3258b51db49a9a137574c3e # v6.5.1
167167
with:
168168
sbom: "sbom-${{ inputs.image }}.json"
169169
only-fixed: true
170170
add-cpes-if-none: true
171171
fail-build: false
172172

173173
- name: Upload scan result to GitHub Security tab
174-
uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
174+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
175175
continue-on-error: true
176176
with:
177177
sarif_file: ${{ steps.scan.outputs.sarif }}

‎.github/workflows/ci.yml

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
- name: Build binary
172172
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
173173
with:
174-
version: v2.11.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
174+
version: v2.11.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
175175
args: ${{ github.ref_type == 'tag' && 'release' || 'build --snapshot' }} --clean
176176
env:
177177
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -296,7 +296,7 @@ jobs:
296296
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
297297

298298
- name: Login to GitHub Container Registry
299-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
299+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
300300
with:
301301
registry: ghcr.io
302302
username: ${{ github.repository_owner }}
@@ -311,3 +311,32 @@ jobs:
311311
- name: Push to GitHub Container Registry
312312
run: |
313313
helm push ${{ steps.package.outputs.path }} oci://ghcr.io/nginx/charts
314+
315+
cel-tests:
316+
name: CEL Tests
317+
runs-on: ubuntu-24.04
318+
needs: vars
319+
steps:
320+
- name: Checkout Repository
321+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
322+
323+
- name: Setup Golang Environment
324+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
325+
with:
326+
go-version: stable
327+
cache-dependency-path: |
328+
go.sum
329+
.github/.cache/buster-for-unit-tests
330+
331+
- name: Deploy Kubernetes
332+
id: k8s
333+
run: |
334+
kind create cluster --name ${{ github.run_id }} --image=kindest/node:${{ needs.vars.outputs.k8s_latest }}
335+
336+
- name: Apply CustomResourceDefinition
337+
run: |
338+
kubectl kustomize config/crd | kubectl apply --server-side -f -
339+
340+
- name: Run Tests
341+
run: make test-cel-validation
342+
working-directory: ./tests

‎.github/workflows/conformance.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
- name: NGF Docker meta
5454
id: ngf-meta
55-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
55+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
5656
with:
5757
images: |
5858
name=ghcr.io/nginx/nginx-gateway-fabric
@@ -65,7 +65,7 @@ jobs:
6565
6666
- name: NGINX Docker meta
6767
id: nginx-meta
68-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
68+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
6969
with:
7070
images: |
7171
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
@@ -79,7 +79,7 @@ jobs:
7979
- name: Build binary
8080
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
8181
with:
82-
version: v2.11.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
82+
version: v2.11.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
8383
args: build --single-target --snapshot --clean
8484
env:
8585
TELEMETRY_ENDPOINT: "" # disables sending telemetry

‎.github/workflows/functional.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: NGF Docker meta
4848
id: ngf-meta
49-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
49+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
5050
with:
5151
images: |
5252
name=ghcr.io/nginx/nginx-gateway-fabric
@@ -59,7 +59,7 @@ jobs:
5959
6060
- name: NGINX Docker meta
6161
id: nginx-meta
62-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
62+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
6363
with:
6464
images: |
6565
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}
@@ -73,7 +73,7 @@ jobs:
7373
- name: Build binary
7474
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
7575
with:
76-
version: v2.11.1 # renovate: datasource=github-tags depName=goreleaser/goreleaser
76+
version: v2.11.2 # renovate: datasource=github-tags depName=goreleaser/goreleaser
7777
args: build --single-target --snapshot --clean
7878
env:
7979
TELEMETRY_ENDPOINT: otel-collector-opentelemetry-collector.collector.svc.cluster.local:4317

‎.github/workflows/helm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: NGF Docker meta
3737
id: ngf-meta
38-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
38+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
3939
with:
4040
images: |
4141
name=ghcr.io/nginx/nginx-gateway-fabric
@@ -48,7 +48,7 @@ jobs:
4848
4949
- name: NGINX Docker meta
5050
id: nginx-meta
51-
uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
51+
uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
5252
with:
5353
images: |
5454
name=ghcr.io/nginx/nginx-gateway-fabric/${{ inputs.image == 'plus' && 'nginx-plus' || inputs.image }}

‎.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
4141
with:
4242
working-directory: ${{ matrix.directory }}
43-
version: v2.3.0 # renovate: datasource=github-tags depName=golangci/golangci-lint
43+
version: v2.3.1 # renovate: datasource=github-tags depName=golangci/golangci-lint
4444

4545
njs-lint:
4646
name: NJS Lint
@@ -78,7 +78,7 @@ jobs:
7878
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7979

8080
- name: Lint Actions
81-
uses: reviewdog/action-actionlint@a5524e1c19e62881d79c1f1b9b6f09f16356e281 # v1.65.2
81+
uses: reviewdog/action-actionlint@50b75b9513baa71e6a1899a1ebaa9ac9851cf16c # v1.66.0
8282
with:
8383
actionlint_flags: -shellcheck ""
8484

‎.github/workflows/nfr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ jobs:
8686

8787
- name: Authenticate to Google Cloud
8888
id: auth
89-
uses: google-github-actions/auth@140bb5113ffb6b65a7e9b937a81fa96cf5064462 # v2.1.11
89+
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
9090
with:
9191
token_format: access_token
9292
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_IDENTITY }}
9393
service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
9494

9595
- name: Login to GAR
96-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
96+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
9797
with:
9898
registry: us-docker.pkg.dev
9999
username: oauth2accesstoken
@@ -184,7 +184,7 @@ jobs:
184184
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
185185

186186
- name: Download Artifacts
187-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
187+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
188188
with:
189189
path: tests/results/
190190
merge-multiple: true

‎.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ jobs:
6060

6161
# Upload the results to GitHub's code scanning dashboard.
6262
- name: "Upload to code-scanning"
63-
uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
63+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
6464
with:
6565
sarif_file: results.sarif

‎.github/workflows/update-docker-images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
needs-updating: ${{ steps.update.outputs.needs-updating }}
6060
steps:
6161
- name: Login to GitHub Container Registry
62-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
62+
uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
6363
with:
6464
registry: ghcr.io
6565
username: ${{ github.repository_owner }}

‎.pre-commit-config.yaml

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

4141
- repo: https://github.com/golangci/golangci-lint
42-
rev: v2.3.0
42+
rev: v2.3.1
4343
hooks:
4444
- id: golangci-lint-full
4545
name: golangci-lint-root

0 commit comments

Comments
 (0)