Skip to content

Commit 67f4c98

Browse files
jgoelenjgoelen
authored
Merge branch 'main' into main
2 parents c259b47 + c9d33b7 commit 67f4c98

Some content is hidden

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

52 files changed

+891
-404
lines changed

‎.github/workflows/chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"
4646
4747
- name: Checkout code
48-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
48+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
4949
with:
5050
fetch-depth: 0
5151

‎.github/workflows/ci.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848

4949
- name: Checkout
50-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
50+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
5151

5252
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
5353
id: filter
@@ -81,7 +81,7 @@ jobs:
8181
(needs.changes.outputs.lua == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
8282
steps:
8383
- name: Checkout
84-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
84+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
8585

8686
- name: Lint Lua
8787
uses: lunarmodules/luacheck@v1
@@ -95,7 +95,7 @@ jobs:
9595
(needs.changes.outputs.go == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
9696
steps:
9797
- name: Checkout
98-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
98+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
9999

100100
- name: Get go version
101101
run: echo "GOLANG_VERSION=$(cat GOLANG_VERSION)" >> $GITHUB_ENV
@@ -119,7 +119,7 @@ jobs:
119119
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.docs == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
120120
steps:
121121
- name: Checkout
122-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
122+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
123123
- name: Get go version
124124
run: echo "GOLANG_VERSION=$(cat GOLANG_VERSION)" >> $GITHUB_ENV
125125
- name: Set up Go
@@ -144,7 +144,7 @@ jobs:
144144
PLATFORMS: linux/amd64
145145
steps:
146146
- name: Checkout
147-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
147+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
148148

149149
- name: Get go version
150150
id: golangversion
@@ -202,7 +202,7 @@ jobs:
202202
| gzip > docker.tar.gz
203203
204204
- name: cache
205-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
205+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
206206
with:
207207
name: docker.tar.gz
208208
path: docker.tar.gz
@@ -241,7 +241,7 @@ jobs:
241241
run: helm plugin install https://github.com/helm-unittest/helm-unittest
242242

243243
- name: Checkout code
244-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
244+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
245245
with:
246246
fetch-depth: 0
247247

@@ -274,7 +274,7 @@ jobs:
274274

275275
steps:
276276
- name: Checkout code
277-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
277+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
278278

279279
- name: Download cache
280280
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8

‎.github/workflows/depreview.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: 'Checkout Repository'
12-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
12+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
1313
- name: 'Dependency Review'
1414
uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4

‎.github/workflows/docs.yaml

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

2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
26+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
2727

2828
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
2929
id: filter
@@ -47,7 +47,7 @@ jobs:
4747

4848
steps:
4949
- name: Checkout master
50-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
50+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
5151

5252
- name: Deploy
5353
uses: ./.github/actions/mkdocs

‎.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
18+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
1919

2020
- name: Get go version
2121
run: echo "GOLANG_VERSION=$(cat GOLANG_VERSION)" >> $GITHUB_ENV

‎.github/workflows/images.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
steps:
4141
- name: Checkout
42-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
42+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
4343
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
4444
id: filter
4545
with:
@@ -138,7 +138,7 @@ jobs:
138138
k8s: [v1.28.13, v1.29.8, v1.30.4, v1.31.0]
139139
steps:
140140
- name: Checkout
141-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
141+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
142142

143143
- name: Get go version
144144
run: echo "GOLANG_VERSION=$(cat GOLANG_VERSION)" >> $GITHUB_ENV
@@ -169,10 +169,10 @@ jobs:
169169
if: |
170170
(github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.changes.outputs.nginx == 'true')
171171
env:
172-
PLATFORMS: linux/amd64,linux/arm,linux/arm64,linux/s390x
172+
PLATFORMS: linux/amd64,linux/arm,linux/arm64
173173
steps:
174174
- name: Checkout
175-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
175+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
176176
- name: Set up QEMU
177177
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
178178
- name: Set up Docker Buildx

‎.github/workflows/perftest.yaml

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

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
22+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
2323

2424
- name: Install K6
2525
run: |

‎.github/workflows/plugin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
15+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
1616
with:
1717
fetch-depth: 0
1818

‎.github/workflows/scorecards.yml

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

2828
steps:
2929
- name: "Checkout code"
30-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
30+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
3131
with:
3232
persist-credentials: false
3333

@@ -51,14 +51,14 @@ jobs:
5151
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5252
# format to the repository Actions tab.
5353
- name: "Upload artifact"
54-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
54+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
5555
with:
5656
name: SARIF file
5757
path: results.sarif
5858
retention-days: 5
5959

6060
# Upload the results to GitHub's code scanning dashboard.
6161
- name: "Upload to code-scanning"
62-
uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
62+
uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
6363
with:
6464
sarif_file: results.sarif

‎.github/workflows/vulnerability-scans.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
versions: ${{ steps.version.outputs.TAGS }}
2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
25+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
2626
with:
2727
fetch-depth: 0
2828

@@ -52,15 +52,15 @@ jobs:
5252
versions: ${{ fromJSON(needs.version.outputs.versions) }}
5353
steps:
5454
- name: Checkout code
55-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
55+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
5656

5757
- shell: bash
5858
id: test
5959
run: echo "Scanning registry.k8s.io/ingress-nginx/controller@${{ matrix.versions }}"
6060

6161
- name: Scan image with AquaSec/Trivy
6262
id: scan
63-
uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.24.0
63+
uses: aquasecurity/trivy-action@915b19bbe73b92a6cf82a1bc12b087c9a19a5fe2 # v0.28.0
6464
with:
6565
image-ref: registry.k8s.io/ingress-nginx/controller:${{ matrix.versions }}
6666
format: 'sarif'
@@ -75,7 +75,7 @@ jobs:
7575

7676
# This step checks out a copy of your repository.
7777
- name: Upload SARIF file
78-
uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
78+
uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
7979
with:
8080
token: ${{ github.token }}
8181
# Path to SARIF file relative to the root of the repository

0 commit comments

Comments
 (0)