Skip to content
This repository was archived by the owner on Jan 29, 2025. It is now read-only.

Commit 261b26b

Browse files
jgoelenjgoelen
authored
Merge branch 'main' into main
2 parents 67f4c98 + 9c7266f commit 261b26b

File tree

83 files changed

+839
-267
lines changed

Some content is hidden

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

83 files changed

+839
-267
lines changed

Diff for: ‎.github/workflows/chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Set up Python
26-
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
26+
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
2727
with:
2828
python-version: 3.x
2929

@@ -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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
48+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4949
with:
5050
fetch-depth: 0
5151

Diff for: ‎.github/workflows/ci.yaml

+15-15
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
steps:
4848

4949
- name: Checkout
50-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
50+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
84+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8585

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

100100
- name: Get go version
101101
run: echo "GOLANG_VERSION=$(cat GOLANG_VERSION)" >> $GITHUB_ENV
102102

103103
- name: Set up Go
104104
id: go
105-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
105+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
106106
with:
107107
go-version: ${{ env.GOLANG_VERSION }}
108108
check-latest: true
@@ -119,12 +119,12 @@ 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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
122+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
123123
- name: Get go version
124124
run: echo "GOLANG_VERSION=$(cat GOLANG_VERSION)" >> $GITHUB_ENV
125125
- name: Set up Go
126126
id: go
127-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
127+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
128128
with:
129129
go-version: ${{ env.GOLANG_VERSION }}
130130
check-latest: true
@@ -144,7 +144,7 @@ jobs:
144144
PLATFORMS: linux/amd64
145145
steps:
146146
- name: Checkout
147-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
147+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
148148

149149
- name: Get go version
150150
id: golangversion
@@ -153,7 +153,7 @@ jobs:
153153
154154
- name: Set up Go
155155
id: go
156-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
156+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
157157
with:
158158
go-version: ${{ steps.golangversion.outputs.version }}
159159
check-latest: true
@@ -218,7 +218,7 @@ jobs:
218218

219219
steps:
220220
- name: Set up Python
221-
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
221+
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
222222
with:
223223
python-version: 3.x
224224

@@ -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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
244+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
245245
with:
246246
fetch-depth: 0
247247

@@ -256,7 +256,7 @@ jobs:
256256
git diff --exit-code charts/ingress-nginx/README.md
257257
258258
- name: Run tests
259-
run: helm unittest charts/ingress-nginx
259+
run: helm unittest charts/ingress-nginx --file "tests/**/*_test.yaml"
260260

261261
chart-test:
262262
name: Chart / Test
@@ -270,11 +270,11 @@ jobs:
270270

271271
strategy:
272272
matrix:
273-
k8s: [v1.28.13, v1.29.8, v1.30.4, v1.31.0]
273+
k8s: [v1.28.15, v1.29.10, v1.30.6, v1.31.2]
274274

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

279279
- name: Download cache
280280
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
@@ -301,7 +301,7 @@ jobs:
301301
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
302302
strategy:
303303
matrix:
304-
k8s: [v1.28.13, v1.29.8, v1.30.4, v1.31.0]
304+
k8s: [v1.28.15, v1.29.10, v1.30.6, v1.31.2]
305305
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
306306
with:
307307
k8s-version: ${{ matrix.k8s }}
@@ -315,7 +315,7 @@ jobs:
315315
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
316316
strategy:
317317
matrix:
318-
k8s: [v1.28.13, v1.29.8, v1.30.4, v1.31.0]
318+
k8s: [v1.28.15, v1.29.10, v1.30.6, v1.31.2]
319319
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
320320
with:
321321
k8s-version: ${{ matrix.k8s }}

Diff for: ‎.github/workflows/depreview.yaml

+2-2
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
12+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1313
- name: 'Dependency Review'
14-
uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
14+
uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # v4.4.0

Diff for: ‎.github/workflows/docs.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
26+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
50+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5151

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

Diff for: ‎.github/workflows/golangci-lint.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
18+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1919

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

2323
- name: Set up Go
2424
id: go
25-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
25+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
2626
with:
2727
go-version: ${{ env.GOLANG_VERSION }}
2828
check-latest: true
2929

3030
- name: golangci-lint
3131
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
3232
with:
33-
version: v1.56
33+
version: v1.62
34+
only-new-issues: true

Diff for: ‎.github/workflows/images.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
steps:
4141
- name: Checkout
42-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
42+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4343
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
4444
id: filter
4545
with:
@@ -135,17 +135,17 @@ jobs:
135135
(needs.changes.outputs.kube-webhook-certgen == 'true')
136136
strategy:
137137
matrix:
138-
k8s: [v1.28.13, v1.29.8, v1.30.4, v1.31.0]
138+
k8s: [v1.28.15, v1.29.10, v1.30.6, v1.31.2]
139139
steps:
140140
- name: Checkout
141-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
141+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
142142

143143
- name: Get go version
144144
run: echo "GOLANG_VERSION=$(cat GOLANG_VERSION)" >> $GITHUB_ENV
145145

146146
- name: Set up Go
147147
id: go
148-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
148+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
149149
with:
150150
go-version: ${{ env.GOLANG_VERSION }}
151151
check-latest: true
@@ -172,7 +172,7 @@ jobs:
172172
PLATFORMS: linux/amd64,linux/arm,linux/arm64
173173
steps:
174174
- name: Checkout
175-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
175+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
176176
- name: Set up QEMU
177177
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
178178
- name: Set up Docker Buildx

Diff for: ‎.github/workflows/perftest.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

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

2424
- name: Install K6
2525
run: |

Diff for: ‎.github/workflows/plugin.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
15+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616
with:
1717
fetch-depth: 0
1818

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

2222
- name: Set up Go
23-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
23+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
2424
with:
2525
go-version: ${{ env.GOLANG_VERSION }}
2626
check-latest: true
2727

2828
- name: Run GoReleaser Snapshot
2929
if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
30-
uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
30+
uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
3131
with:
3232
version: latest
3333
args: release --snapshot --clean
@@ -36,7 +36,7 @@ jobs:
3636

3737
- name: Run GoReleaser
3838
if: ${{ startsWith(github.ref, 'refs/tags/') }}
39-
uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
39+
uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
4040
with:
4141
version: latest
4242
args: release --clean
@@ -45,6 +45,6 @@ jobs:
4545

4646
- name: Update new version in krew-index
4747
if: ${{ startsWith(github.ref, 'refs/tags/') }}
48-
uses: rajatjindal/krew-release-bot@df3eb197549e3568be8b4767eec31c5e8e8e6ad8 # v0.0.46
48+
uses: rajatjindal/krew-release-bot@3d9faef30a82761d610544f62afddca00993eef9 # v0.0.47
4949
with:
5050
krew_template_file: cmd/plugin/krew.yaml

Diff for: ‎.github/workflows/scorecards.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

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

@@ -59,6 +59,6 @@ jobs:
5959

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

Diff for: ‎.github/workflows/vulnerability-scans.yaml

+3-3
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
25+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626
with:
2727
fetch-depth: 0
2828

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

5757
- shell: bash
5858
id: test
@@ -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@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
78+
uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
7979
with:
8080
token: ${{ github.token }}
8181
# Path to SARIF file relative to the root of the repository

Diff for: ‎.github/workflows/zz-tmpl-images.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: Checkout
34-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
34+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3535
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
3636
id: filter
3737
with:
@@ -48,7 +48,7 @@ jobs:
4848

4949
steps:
5050
- name: Checkout
51-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
51+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5252

5353
- name: Build
5454
run: |
@@ -67,7 +67,7 @@ jobs:
6767
PLATFORMS: ${{ inputs.platforms-publish }}
6868
steps:
6969
- name: Checkout
70-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
70+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7171

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

Diff for: ‎.github/workflows/zz-tmpl-k8s-e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
23+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424

2525
- name: cache
2626
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8

Diff for: ‎.golangci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ linters:
2222
- errcheck
2323
- errchkjson
2424
- errname
25-
- execinquery
2625
- ginkgolinter
2726
- gocheckcompilerdirectives
2827
- goconst

Diff for: ‎GOLANG_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.8
1+
1.23.3

Diff for: ‎build/run-in-docker.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function cleanup {
4444
}
4545
trap cleanup EXIT
4646

47-
E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v20241004-114a6abb@sha256:1389ec0589abbf5c431c9290c4c307437c8396995c63dda5eac26abd70963dc8}
47+
E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v20241104-02a3933e@sha256:baf30e414c5657cc71f5bd1db502f0e0ee4ab721b6560340eff214935e96bef0}
4848

4949
if [[ "$RUNTIME" == podman ]]; then
5050
# Podman does not support both tag and digest
@@ -82,7 +82,7 @@ if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then
8282
echo "..reached DIND check TRUE block, inside run-in-docker.sh"
8383
echo "FLAGS=$FLAGS"
8484
#go env
85-
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.20.2
85+
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo@v2.21.0
8686
find / -type f -name ginkgo 2>/dev/null
8787
which ginkgo
8888
/bin/bash -c "${FLAGS}"

0 commit comments

Comments
 (0)