10BC0 Merge branch 'main' into main · nginx/kubernetes-ingress@4bb9882 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4bb9882

Browse files
FalltradesFalltrades
authored
Merge branch 'main' into main
2 parents ce807fe + 11ef323 commit 4bb9882

File tree

74 files changed

+3896
-322
lines changed

Some content is hidden

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

74 files changed

+3896
-322
lines changed

‎.github/labeler.yml‎

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,43 @@ bug:
88
- head-branch: ['^fix/', '^bug/']
99

1010
chore:
11-
- head-branch: ['^chore/']
11+
- all:
12+
- changed-files:
13+
- any-glob-to-any-file: ['.github/**/*', 'hack/**/*', '*']
14+
- all-globs-to-all-files: ['!*.md', '!go.mod', '!go.sum', '!*.go']
15+
16+
github_actions:
17+
- changed-files:
18+
- any-glob-to-any-file: ['.github/**/*.yml', '.github/**/*.yaml', '.github/**/*.md']
19+
20+
go:
21+
- changed-files:
22+
- any-glob-to-any-file: ['**/*.go', 'go.mod', 'go.sum']
23+
24+
python:
25+
- changed-files:
26+
- any-glob-to-any-file: ['tests/**/*.py', 'tests/**/requirements.txt', 'tests/**/*.yaml', 'perf-tests/**/*.py', 'perf-tests/**/*.yaml']
1227

1328
tests:
14-
- any:
15-
- head-branch: ['^tests/', '^test/']
16-
- changed-files: ['tests/**/*', 'perf-tests/**/*']
1729
- all:
18-
- changed-files: ['!tests/requirements.txt', '!perf-tests/requirements.txt']
30+
- changed-files:
31+
- any-glob-to-any-file: ['tests/**/*', 'perf-tests/**/*']
32+
- all-globs-to-all-files: ['!tests/requirements.txt', '!perf-tests/requirements.txt']
1933

2034
documentation:
2135
- head-branch: ['^docs/', '^doc/']
22-
- changed-files: '**/*.md'
36+
- changed-files:
37+
- any-glob-to-any-file: '**/*.md'
2338

2439
dependencies:
2540
3476 - head-branch: ['^deps/', '^dep/', '^dependabot/', 'pre-commit-ci-update-config']
26-
- changed-files: ['go.mod', 'go.sum']
41+
- changed-files:
42+
- any-glob-to-any-file: ['go.mod', 'go.sum']
2743

2844
helm_chart:
29-
- changed-files: ['charts/nginx-ingress/**/*']
45+
- changed-files:
46+
- any-glob-to-any-file: 'charts/nginx-ingress/**/*'
47+
48+
docker:
49+
- changed-files:
50+
- any-glob-to-any-file: '**/Dockerfile'

‎.github/workflows/build-base-images.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
5656

5757
- name: Docker Buildx
58-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
58+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
5959

6060
- name: Setup QEMU
6161
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
@@ -121,7 +121,7 @@ jobs:
121121
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
122122

123123
- name: Docker Buildx
124-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
124+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
125125

126126
- name: Setup QEMU
127127
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
@@ -201,7 +201,7 @@ jobs:
201201
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
202202

203203
- name: Docker Buildx
204-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
204+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
205205

206206
- name: Authenticate to Google Cloud
207207
id: auth

‎.github/workflows/build-oss.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
if: ${{ inputs.publish-image }}
6464

6565
- name: Docker Buildx
66-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
66+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
6767

6868
- name: DockerHub Login
6969
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0

‎.github/workflows/build-plus.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
if: ${{ inputs.publish-image }}
7171

7272
- name: Docker Buildx
73-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
73+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
7474

7575
- name: Authenticate to Google Cloud
7676
id: auth

‎.github/workflows/build-test-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
3030

3131
- name: Docker Buildx
32-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
32+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
3333

3434
- name: Authenticate to Google Cloud
3535
id: auth

‎.github/workflows/ci.yml‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
name: Checks and variables
3838
runs-on: ubuntu-22.04
3939
outputs:
40+
docs_only: ${{ github.event.pull_request && steps.docs.outputs.docs_only == 'true' }}
4041
k8s_latest: ${{ steps.vars.outputs.k8s_latest }}
4142
latest_kindest_node_versions: ${{ steps.vars.outputs.latest_kindest_node_versions }}
4243
go_path: ${{ steps.vars.outputs.go_path }}
@@ -52,6 +53,21 @@ jobs:
5253
steps:
5354
- name: Checkout Repository
5455
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
56+
with:
57+
fetch-depth: 0
58+
59+
- name: Filter only docs changes
60+
id: docs
61+
run: |
62+
files=$(git diff --name-only HEAD^ | egrep -v "^docs/")
63+
if [ -z "$files" ]; then
64+
echo "docs_only=true" >> $GITHUB_OUTPUT
65+
else
66+
echo "docs_only=false" >> $GITHUB_OUTPUT
67+
fi
68+
echo $files
69+
cat $GITHUB_OUTPUT
70+
shell: bash --noprofile --norc -o pipefail {0}
5571

5672
- name: Setup Golang Environment
5773
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
@@ -139,7 +155,7 @@ jobs:
139155
run: make cover
140156
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
141157
- name: Upload coverage to Codecov
142-
uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
158+
uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
143159
with:
144160
files: ./coverage.txt
145161
token: ${{ secrets.CODECOV_TOKEN }} # required
@@ -207,7 +223,7 @@ jobs:
207223
if: github.ref_type == 'tag'
208224

209225
- name: Install Cosign
210-
uses: sigstore/cosign-installer@e1523de7571e31dbe865fd2e80c5c7c23ae71eb4 # v3.4.0
226+
uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3.5.0
211227
if: github.ref_type == 'tag'
212228

213229
- name: Build binaries
@@ -241,6 +257,7 @@ jobs:
241257
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
242258

243259
helm-tests:
260+
if: ${{ needs.checks.outputs.docs_only != 'true' }}
244261
name: Helm Tests ${{ matrix.base-os }}
245262
runs-on: ubuntu-22.04
246263
needs: [checks, binaries]
@@ -271,7 +288,7 @@ jobs:
271288
key: nginx-ingress-${{ needs.checks.outputs.go_code_md5 }}
272289

273290
- name: Docker Buildx
274-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
291+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
275292

276293
- name: Setup QEMU
277294
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
@@ -390,6 +407,7 @@ jobs:
390407
done
391408
392409
setup-matrix:
410+
if: ${{ needs.checks.outputs.docs_only != 'true' }}
393411
name: Setup Matrix for Smoke Tests
394412
runs-on: ubuntu-22.04
395413
needs: [binaries, checks]
@@ -411,7 +429,7 @@ jobs:
411429
fi
412430
413431
- name: Docker Buildx
414-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
432+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
415433

416434
- name: Authenticate to Google Cloud
417435
id: auth
@@ -451,6 +469,7 @@ jobs:
451469
if: ${{ steps.check-image.outcome == 'failure' }}
452470

453471
smoke-tests:
472+
if: ${{ needs.checks.outputs.docs_only != 'true' }}
454473
name: ${{ matrix.images.label }} ${{ matrix.images.image }} ${{ matrix.k8s }} smoke tests
455474
runs-on: ubuntu-22.04
456475
needs: [checks, setup-matrix]
@@ -508,7 +527,7 @@ jobs:
508527
if: ${{ needs.checks.outputs.forked_workflow == 'false' }}
509528

510529
- name: Docker Buildx
511-
uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20 # v3.2.0
530+
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
512531

513532
- name: Setup QEMU
514533
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
@@ -619,6 +638,7 @@ jobs:
619638
fi
620639
621640
build-docker:
641+
if: ${{ needs.checks.outputs.docs_only != 'true' }}
622642
name: Build Docker OSS
623643
needs: [checks, smoke-results]
624644
strategy:
@@ -647,6 +667,7 @@ jobs:
647667
secrets: inherit
648668

649669
build-docker-plus:
670+
if: ${{ needs.checks.outputs.docs_only != 'true' }}
650671
name: Build Docker Plus
651672
needs: [checks, smoke-results, release-notes]
652673
strategy:
@@ -678,6 +699,7 @@ jobs:
678699
secrets: inherit
679700

680701
build-docker-nap:
702+
if: ${{ needs.checks.outputs.docs_only != 'true' }}
681703
name: Build Docker NAP
682704
needs: [checks, smoke-results, release-notes]
683705
strategy:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,33 @@ permissions:
2121
contents: read
2222

2323
jobs:
24+
checks:
25+
name: Checks and variables
26+
runs-on: ubuntu-22.04
27+
outputs:
28+
docs_only: ${{ github.event.pull_request && steps.docs.outputs.docs_only == 'true' }}
29+
steps:
30+
- name: Checkout Repository
31+
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
32+
with:
33+
fetch-depth: 0
34+
35+
- name: Filter only docs changes
36+
id: docs
37+
run: |
38+
files=$(git diff --name-only HEAD^ | egrep -v "^docs/")
39+
if [ -z "$files" ]; then
40+
echo "docs_only=true" >> $GITHUB_OUTPUT
41+
else
42+
echo "docs_only=false" >> $GITHUB_OUTPUT
43+
fi
44+
echo $files
45+
cat $GITHUB_OUTPUT
46+
shell: bash --noprofile --norc -o pipefail {0}
47+
2448
analyze:
49+
if: ${{ needs.checks.outputs.docs_only != 'true' }}
50+
needs: [checks]
2551
permissions:
2652
actions: read # for github/codeql-action/init to get workflow details
2753
contents: read # for actions/checkout to fetch code

‎.github/workflows/dependabot-hugo.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ jobs:
4646
- name: Commit changes
4747
if: ${{ steps.dependabot-metadata.outputs.package-ecosystem == 'go_modules' && contains(steps.dependabot-metadata.outputs.dependency-names, 'hugo') }}
4848
id: commit
49-
uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d # v5.0.0
49+
uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
5050
with:
5151
commit_message: "Update docs go.mod"

‎.github/workflows/labeler.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ jobs:
1212
pull-requests: write # for actions/labeler to add labels
1313
runs-on: ubuntu-22.04
1414
steps:
15-
- uses: actions/labeler@4f052778de9a9b80cb16cfb9079b02287285a4cb # v5.0.0-alpha.1
15+
- name: Checkout Repository
16+
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
17+
18+
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
1619
with:
1720
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1821
sync-labels: true

‎.github/workflows/lint-format.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
- name: Checkout Repository
8585
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
8686

87-
- uses: DavidAnson/markdownlint-cli2-action@510b996878fc0d1a46c8a04ec86b06dbfba09de7 # v15.0.0
87+
- uses: DavidAnson/markdownlint-cli2-action@b4c9feab76d8025d1e83c653fa3990936df0e6c8 # v16.0.0
8888
with:
8989
config: .markdownlint-cli2.yaml
9090
globs: "**/*.md"

0 commit comments

Comments
 (0)
0