Skip to content

Commit e7fcfed

Browse files
avifavif
authored
Merge branch 'kubernetes:main' into partitioned-cookie-support
2 parents 11bbf00 + 689b993 commit e7fcfed

File tree

42 files changed

+2054
-562
lines changed

Some content is hidden

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

42 files changed

+2054
-562
lines changed

‎.github/workflows/ci.yaml

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

4949
- name: Checkout
50-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
50+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
5151

5252
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
5353
id: filter
@@ -77,14 +77,14 @@ jobs:
7777
(needs.changes.outputs.go == 'true')
7878
steps:
7979
- name: Checkout
80-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
80+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
8181

8282
- name: Get go version
8383
run: echo "GOLANG_VERSION=$(cat GOLANG_VERSION)" >> $GITHUB_ENV
8484

8585
- name: Set up Go
8686
id: go
87-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
87+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
8888
with:
8989
go-version: ${{ env.GOLANG_VERSION }}
9090
check-latest: true
@@ -105,7 +105,7 @@ jobs:
105105
PLATFORMS: linux/amd64
106106
steps:
107107
- name: Checkout
108-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
108+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
109109

110110
- name: Get go version
111111
id: golangversion
@@ -114,7 +114,7 @@ jobs:
114114
115115
- name: Set up Go
116116
id: go
117-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
117+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
118118
with:
119119
go-version: ${{ steps.golangversion.outputs.version }}
120120
check-latest: true
@@ -163,7 +163,7 @@ jobs:
163163
| gzip > docker.tar.gz
164164
165165
- name: cache
166-
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
166+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
167167
with:
168168
name: docker.tar.gz
169169
path: docker.tar.gz
@@ -179,12 +179,12 @@ jobs:
179179
180180
steps:
181181
- name: Checkout
182-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
182+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
183183
with:
184184
fetch-depth: 0
185185

186186
- name: Set up Helm
187-
uses: azure/setup-helm@b7246b12e77f7134dc2d460a3d5bad15bbe29390 # v4.1.0
187+
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
188188

189189
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
190190
with:
@@ -239,16 +239,16 @@ jobs:
239239

240240
steps:
241241
- name: Checkout
242-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
242+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
243243

244244
- name: Setup Go
245-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
245+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
246246
with:
247247
go-version: ${{ needs.build.outputs.golangversion }}
248248
check-latest: true
249249

250250
- name: cache
251-
uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
251+
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
252252
with:
253253
name: docker.tar.gz
254254

‎.github/workflows/depreview.yaml

Lines changed: 2 additions & 2 deletions
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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
12+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
1313
- name: 'Dependency Review'
14-
uses: actions/dependency-review-action@5bbc3ba658137598168acb2ab73b21c432dd411b # v4.2.5
14+
uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2

‎.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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
26+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
50+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
5151

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

‎.github/workflows/golangci-lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
18+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
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@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
25+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
2626
with:
2727
go-version: ${{ env.GOLANG_VERSION }}
2828
check-latest: true
2929

3030
- name: golangci-lint
31-
uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0
31+
uses: golangci/golangci-lint-action@38e1018663fa5173f3968ea0777460d3de38f256 # v5.3.0
3232
with:
3333
version: v1.56

‎.github/workflows/helm.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- release-*
78

89
permissions:
910
contents: read
@@ -24,7 +25,7 @@ jobs:
2425

2526
steps:
2627
- name: Checkout
27-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
28+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
2829

2930
- name: Run Artifact Hub lint
3031
run: |
@@ -63,10 +64,11 @@ jobs:
6364

6465
steps:
6566
- name: Checkout master
66-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
67+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
6768
with:
6869
# Fetch entire history. Required for chart-releaser; see https://github.com/helm/chart-releaser-action/issues/13#issuecomment-602063896
6970
fetch-depth: 0
71+
ref: ${{ github.ref_name }}
7072

7173
- name: Setup
7274
shell: bash

‎.github/workflows/images.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141

4242
steps:
4343
- name: Checkout
44-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
44+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
4545
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
4646
id: filter
4747
with:
@@ -144,14 +144,14 @@ jobs:
144144
k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2]
145145
steps:
146146
- name: Checkout
147-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
147+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
148148

149149
- name: Get go version
150150
run: echo "GOLANG_VERSION=$(cat GOLANG_VERSION)" >> $GITHUB_ENV
151151

152152
- name: Set up Go
153153
id: go
154-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
154+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
155155
with:
156156
go-version: ${{ env.GOLANG_VERSION }}
157157
check-latest: true
@@ -178,7 +178,7 @@ jobs:
178178
nginx: ['1.25.3', '1.21.6']
179179
steps:
180180
- name: Checkout
181-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
181+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
182182
- name: image build
183183
run: |
184184
cd images/opentelemetry && make NGINX_VERSION=${{ matrix.nginx }} build
@@ -195,7 +195,7 @@ jobs:
195195
PLATFORMS: linux/amd64,linux/arm,linux/arm64,linux/s390x
196196
steps:
197197
- name: Checkout
198-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
198+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
199199
- name: Set up QEMU
200200
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
201201
- 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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
22+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
2323

2424
- name: Install K6
2525
run: |

‎.github/workflows/plugin.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
15+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
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@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
23+
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
2424
with:
2525
go-version: ${{ env.GOLANG_VERSION }}
2626
check-latest: true

‎.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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
30+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
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@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
54+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.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@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
62+
uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
6363
with:
6464
sarif_file: results.sarif

‎.github/workflows/vulnerability-scans.yaml

Lines changed: 3 additions & 3 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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
25+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
55+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
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@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
78+
uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
7979
with:
8080
token: ${{ github.token }}
8181
# Path to SARIF file relative to the root of the repository

‎.github/workflows/zz-tmpl-images.yaml

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

3232
steps:
3333
- name: Checkout
34-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
34+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
51+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
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@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
70+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
7171

7272
- name: Login to GitHub Container Registry
7373
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0

‎.github/workflows/zz-tmpl-k8s-e2e.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020

2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
23+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
2424

2525
- name: cache
26-
uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
26+
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
2727
with:
2828
name: docker.tar.gz
2929

@@ -50,7 +50,7 @@ jobs:
5050
make kind-e2e-test
5151
5252
- name: Upload e2e junit-reports ${{ inputs.variation }}
53-
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
53+
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
5454
if: success() || failure()
5555
with:
5656
name: e2e-test-reports-${{ inputs.k8s-version }}${{ inputs.variation }}

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ the versions listed. Ingress-Nginx versions **may** work on older versions, but
3838

3939
| Supported | Ingress-NGINX version | k8s supported version | Alpine Version | Nginx Version | Helm Chart Version |
4040
|:--:|-----------------------|------------------------------|----------------|---------------|------------------------------|
41+
| 🔄 | **v1.10.1** | 1.29, 1.28, 1.27, 1.26 | 3.19.1 | 1.25.3 | 4.10.1* |
4142
| 🔄 | **v1.10.0** | 1.29, 1.28, 1.27, 1.26 | 3.19.1 | 1.25.3 | 4.10.0* |
4243
| 🔄 | **v1.9.6** | 1.29, 1.28, 1.27, 1.26, 1.25 | 3.19.0 | 1.21.6 | 4.9.1* |
4344
| 🔄 | **v1.9.5** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.9.0* |

‎build/dev-env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ echo "[dev-env] building image"
6464
make build image
6565
docker tag "${REGISTRY}/controller:${TAG}" "${DEV_IMAGE}"
6666

67-
export K8S_VERSION=${K8S_VERSION:-v1.26.3@sha256:61b92f38dff6ccc29969e7aa154d34e38b89443af1a2c14e6cfbd2df6419c66f}
67+
export K8S_VERSION=${K8S_VERSION:-v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245}
6868

6969
KIND_CLUSTER_NAME="ingress-nginx-dev"
7070

0 commit comments

Comments
 (0)