Skip to content

Commit b9838ef

Browse files
authored
Merge branch 'main' into docs/sf-guide
2 parents 6337d49 + 105a5e3 commit b9838ef

File tree

126 files changed

+1288
-768
lines changed

Some content is hidden

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

126 files changed

+1288
-768
lines changed

.github/.cache/buster-for-generate

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
prepill derangeable afflicting imamship inamorata fibrillae Abelite villar Odelet inamorata predisce

.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535
- 5000:5000
3636
steps:
3737
- name: Checkout Repository
38-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
38+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3939
with:
4040
ref: ${{ inputs.tag != '' && format('refs/tags/v{0}', inputs.tag) || github.ref }}
4141

4242
- name: Fetch Cached Artifacts
43-
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
43+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
4444
with:
4545
path: ${{ github.workspace }}/dist
4646
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
@@ -163,15 +163,15 @@ jobs:
163163
164164
- name: Scan SBOM
165165
id: scan
166-
uses: anchore/scan-action@49e50b215b647c5ec97abb66f69af73c46a4ca08 # v5.0.1
166+
uses: anchore/scan-action@ef0b0b023552a0c077534074723a9915280284bb # v5.1.0
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@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
174+
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
175175
continue-on-error: true
176176
with:
177177
sarif_file: ${{ steps.scan.outputs.sarif }}

.github/workflows/ci.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ jobs:
3535
helm_changes: ${{ steps.filter.outputs.charts }}
3636
steps:
3737
- name: Checkout Repository
38-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
38+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3939
with:
4040
fetch-depth: 0
41+
token: ${{ github.actor == 'renovate[bot]' && secrets.NGINX_PAT || github.token }}
4142

4243
- name: Setup Golang Environment
4344
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
@@ -79,7 +80,7 @@ jobs:
7980
needs: vars
8081
steps:
8182
- name: Checkout Repository
82-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
83+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8384

8485
- name: Setup Golang Environment
8586
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
@@ -110,7 +111,7 @@ jobs:
110111
needs: vars
111112
steps:
112113
- name: Checkout Repository
113-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
114+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
114115

115116
- name: Setup Node.js Environment
116117
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
@@ -135,7 +136,7 @@ jobs:
135136
issues: write # for goreleaser/goreleaser-action to close milestone
136137
steps:
137138
- name: Checkout Repository
138-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
139+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
139140
with:
140141
fetch-depth: 0
141142

@@ -160,7 +161,7 @@ jobs:
160161
if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/main' }}
161162

162163
- name: Download Syft
163-
uses: anchore/sbom-action/download-syft@8d0a6505bf28ced3e85154d13dc6af83299e13f1 # v0.17.4
164+
uses: anchore/sbom-action/download-syft@1ca97d9028b51809cf6d3c934c3e160716e1b605 # v0.17.5
164165
if: github.ref_type == 'tag'
165166

166167
- name: Install Cosign
@@ -183,7 +184,7 @@ jobs:
183184
TELEMETRY_ENDPOINT_INSECURE: "false"
184185

185186
- name: Cache Artifacts
186-
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
187+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
187188
with:
188189
path: ${{ github.workspace }}/dist
189190
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
@@ -290,7 +291,7 @@ jobs:
290291
packages: write # for helm to push to GHCR
291292
steps:
292293
- name: Checkout Repository
293-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
294+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
294295

295296
- name: Login to GitHub Container Registry
296297
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0

.github/workflows/codeql-analysis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ jobs:
4848
# your codebase is analyzed, see https://docs.github.com./en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages.
4949
steps:
5050
- name: Checkout repository
51-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
51+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5252

5353
# Initializes the CodeQL tools for scanning.
5454
- name: Initialize CodeQL
55-
uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
55+
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
5656
with:
5757
languages: ${{ matrix.language }}
5858
build-mode: ${{ matrix.build-mode }}
@@ -64,6 +64,6 @@ jobs:
6464
# queries: security-extended,security-and-quality
6565

6666
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
67+
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
6868
with:
6969
category: "/language:${{matrix.language}}"

.github/workflows/conformance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
DOCKER_BUILD_SUMMARY: false
3131
steps:
3232
- name: Checkout Repository
33-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
33+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434
with:
3535
fetch-depth: 0
3636

.github/workflows/dependency-review.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
pull-requests: write
1313
steps:
1414
- name: "Checkout Repository"
15-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
15+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

1717
- name: "Dependency Review"
18-
uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
18+
uses: actions/dependency-review-action@a6993e2c61fd5dc440b409aa1d6904921c5e1894 # v4.3.5
1919
with:
2020
config-file: "nginxinc/k8s-common/dependency-review-config.yml@main"

.github/workflows/fossa.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
if: ${{ github.event.repository.fork == false }}
2020
steps:
2121
- name: Checkout Repository
22-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
22+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323

2424
- name: Scan
2525
uses: fossas/fossa-action@09bcf127dc0ccb4b5a023f6f906728878e8610ba # v1.4.0

.github/workflows/functional.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
DOCKER_BUILD_SUMMARY: false
2626
steps:
2727
- name: Checkout Repository
28-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
28+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2929
with:
3030
fetch-depth: 0
3131

.github/workflows/helm.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
if: ${{ github.event_name != 'schedule' }}
2121
steps:
2222
- name: Checkout Repository
23-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
23+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424
with:
2525
fetch-depth: 0
2626

2727
- name: Fetch Cached Artifacts
28-
uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
28+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
2929
with:
3030
path: ${{ github.workspace }}/dist
3131
key: nginx-gateway-fabric-${{ github.run_id }}-${{ github.run_number }}
@@ -124,7 +124,7 @@ jobs:
124124
if: ${{ github.event_name == 'schedule' }}
125125
steps:
126126
- name: Checkout Repository
127-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
127+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
128128
with:
129129
fetch-depth: 0
130130

.github/workflows/labeler.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
pull-requests: write
1313
runs-on: ubuntu-24.04
1414
steps:
15-
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616
with:
1717
sparse-checkout: |
1818
labeler.yml

.github/workflows/lint.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
directory: [., tests] # we need to run golangci-lint for every module https://github.com./golangci/golangci-lint/issues/828
3030
steps:
3131
- name: Checkout Repository
32-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
32+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3333

3434
- name: Setup Golang Environment
3535
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
@@ -47,7 +47,7 @@ jobs:
4747
runs-on: ubuntu-24.04
4848
steps:
4949
- name: Checkout Repository
50-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
50+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5151

5252
- name: Setup Node.js Environment
5353
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
@@ -75,7 +75,7 @@ jobs:
7575
runs-on: ubuntu-24.04
7676
steps:
7777
- name: Checkout Repository
78-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
78+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7979

8080
- name: Lint Actions
8181
uses: reviewdog/action-actionlint@7eeec1dd160c2301eb28e1568721837d084558ad # v1.57.0
@@ -87,7 +87,7 @@ jobs:
8787
runs-on: ubuntu-24.04
8888
steps:
8989
- name: Checkout Repository
90-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
90+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9191

9292
- name: Lint Markdown
9393
uses: DavidAnson/markdownlint-cli2-action@db43aef879112c3119a410d69f66701e0d530809 # v17.0.0
@@ -101,7 +101,7 @@ jobs:
101101
runs-on: ubuntu-24.04
102102
steps:
103103
- name: Checkout Repository
104-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
104+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
105105
with:
106106
fetch-depth: 0
107107

@@ -124,7 +124,7 @@ jobs:
124124
runs-on: ubuntu-24.04
125125
steps:
126126
- name: Checkout Repository
127-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
127+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
128128

129129
- name: Lint YAML
130130
uses: reviewdog/action-yamllint@e09f07780388032a624e9eb44a23fd1bbb4052cc # v1.19.0

.github/workflows/mend.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
if: ${{ github.event.repository.fork == false }}
2727
steps:
2828
- name: Checkout Repository
29-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
29+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3030

3131
- name: Download agent
3232
run: curl -LJO https://github.com./whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar

.github/workflows/nfr.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
type: ${{ fromJson(needs.vars.outputs.types) }}
7272
steps:
7373
- name: Checkout Repository
74-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
74+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7575

7676
- name: Authenticate to Google Cloud
7777
id: auth
@@ -151,7 +151,7 @@ jobs:
151151
needs: [vars, setup-and-run-tests]
152152
steps:
153153
- name: Checkout Repository
154-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
154+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
155155

156156
- name: Download Artifacts
157157
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8

.github/workflows/release-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
echo "branch=release-$version" >> $GITHUB_OUTPUT
3030
3131
- name: Checkout Repository
32-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
32+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3333
with:
3434
ref: ${{ steps.branch.outputs.branch }}
3535

.github/workflows/renovate-build.yml

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: Run build for renovate PRs
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize]
6+
7+
permissions:
8+
contents: read
9+
10+
defaults:
11+
run:
12+
shell: bash
13+
14+
concurrency:
15+
group: ${{ github.ref_name }}-renovate
16+
cancel-in-progress: true
17+
18+
jobs:
19+
check:
20+
name: Check for changes
21+
runs-on: ubuntu-24.04
22+
outputs:
23+
generate: ${{ steps.filter.outputs.generate }}
24+
permissions:
25+
pull-requests: read
26+
if: ${{ github.actor == 'renovate[bot]' }}
27+
steps:
28+
- name: Checkout repository
29+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
30+
31+
- name: Check for changes
32+
uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
33+
id: filter
34+
with:
35+
filters: |
36+
generate:
37+
- go.mod
38+
- go.sum
39+
- Makefile
40+
build:
41+
name: Build for renovate PRs
42+
runs-on: ubuntu-24.04
43+
needs: check
44+
permissions:
45+
contents: write
46+
if: ${{ needs.check.outputs.generate == 'true' }}
47+
steps:
48+
- name: Checkout repository
49+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
50+
with:
51+
ref: ${{ github.head_ref }}
52+
token: ${{ secrets.NGINX_PAT }}
53+
54+
- name: Setup Golang Environment
55+
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
56+
with:
57+
go-version: stable
58+
cache-dependency-path: |
59+
go.sum
60+
.github/.cache/buster-for-generate
61+
62+
# go mod tidy can be removed once https://github.com./renovatebot/renovate/issues/12999 is implemented
63+
- name: Update files for renovate
64+
run: |
65+
make generate-all
66+
cd tests && go mod tidy && go mod verify
67+
68+
- name: Commit changes
69+
id: commit
70+
uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
71+
with:
72+
commit_message: "Update files for renovate"
73+
commit_author: "renovate[bot] <29139614+renovate[bot]@users.noreply.github.com.>"

.github/workflows/scorecards.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: "Checkout code"
32-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
32+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3333
with:
3434
persist-credentials: false
3535

@@ -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@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
63+
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
6464
with:
6565
sarif_file: results.sarif

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
nginx_version: ${{ steps.nginx.outputs.nginx_version }}
3131
steps:
3232
- name: Checkout Repository
33-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
33+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434
with:
3535
fetch-depth: 0
3636

@@ -41,7 +41,7 @@ jobs:
4141
echo "tag=${tag//v}" >> $GITHUB_OUTPUT
4242
4343
- name: Checkout Repository at ${{ steps.ngf.outputs.tag }}
44-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
44+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4545
with:
4646
ref: refs/tags/v${{ steps.ngf.outputs.tag }}
4747

0 commit comments

Comments
 (0)