Skip to content

Commit 1419914

Browse files
pdabelf5pdabelf5
committed
Merge branch 'agent-v3' of github.com:nginx/kubernetes-ingress into agent-v3
2 parents ed2d25a + b6d6a5b commit 1419914

File tree

82 files changed

+2081
-1980
lines changed

Some content is hidden

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

82 files changed

+2081
-1980
lines changed

‎.github/data/version.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
IC_VERSION=4.1.0
2-
HELM_CHART_VERSION=2.1.0
1+
IC_VERSION=5.1.0
2+
HELM_CHART_VERSION=2.2.0

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767

6868
- name: Authenticate to Google Cloud
6969
id: auth
70-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
70+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
7171
with:
7272
token_format: access_token
7373
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -92,7 +92,7 @@ jobs:
9292
type=raw,value=${{ needs.checks.outputs.docker_md5 }},enable=${{ needs.checks.outputs.docker_md5 != '' }}
9393
9494
- name: Build Base Container
95-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
95+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
9696
with:
9797
file: build/Dockerfile
9898
context: "."
@@ -132,7 +132,7 @@ jobs:
132132

133133
- name: Authenticate to Google Cloud
134134
id: auth
135-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
135+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
136136
with:
137137
token_format: access_token
138138
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -157,7 +157,7 @@ jobs:
157157
type=raw,value=${{ needs.checks.outputs.docker_md5 }},enable=${{ needs.checks.outputs.docker_md5 != '' }}
158158
159159
- name: Build Base Container
160-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
160+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
161161
with:
162162
file: build/Dockerfile
163163
context: "."
@@ -195,7 +195,7 @@ jobs:
195195

196196
- name: Authenticate to Google Cloud
197197
id: auth
198-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
198+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
199199
with:
200200
token_format: access_token
201201
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -227,7 +227,7 @@ jobs:
227227
type=raw,value=${{ needs.checks.outputs.docker_md5 }},enable=${{ needs.checks.outputs.docker_md5 != '' }}
228228
229229
- name: Build Base Container
230-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
230+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
231231
with:
232232
file: build/Dockerfile
233233
context: "."

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

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

6060
- name: Authenticate to Google Cloud
6161
id: auth
62-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
62+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
6363
with:
6464
token_format: access_token
6565
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -123,7 +123,7 @@ jobs:
123123
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
124124

125125
- name: Build Base Container
126-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
126+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
127127
with:
128128
file: build/Dockerfile
129129
context: "."
@@ -158,7 +158,7 @@ jobs:
158158
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
159159

160160
- name: Build Docker image
161-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
161+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
162162
id: build-push
163163
with:
164164
file: build/Dockerfile
@@ -207,7 +207,7 @@ jobs:
207207

208208
- name: Run Docker Scout vulnerability scanner
209209
id: docker-scout
210-
uses: docker/scout-action@d341d36d6eebbe05c0b25760c63afa19e8f23269 # v1.17.0
210+
uses: docker/scout-action@381b657c498a4d287752e7f2cfb2b41823f566d9 # v1.17.1
211211
with:
212212
command: cves
213213
image: ${{ steps.meta.outputs.tags }}

‎.github/workflows/build-ot-dependency.yml‎

Lines changed: 0 additions & 100 deletions
This file was deleted.

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

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

6262
- name: Authenticate to Google Cloud
6363
id: auth
64-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
64+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
6565
with:
6666
token_format: access_token
6767
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -128,7 +128,7 @@ jobs:
128128
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
129129

130130
- name: Build Base Container
131-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
131+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
132132
with:
133133
file: build/Dockerfile
134134
context: "."
@@ -165,7 +165,7 @@ jobs:
165165
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
166166

167167
- name: Build Docker image
168-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
168+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
169169
id: build-push
170170
with:
171171
file: build/Dockerfile
@@ -217,7 +217,7 @@ jobs:
217217

218218
- name: Run Docker Scout vulnerability scanner
219219
id: docker-scout
220-
uses: docker/scout-action@d341d36d6eebbe05c0b25760c63afa19e8f23269 # v1.17.0
220+
uses: docker/scout-action@381b657c498a4d287752e7f2cfb2b41823f566d9 # v1.17.1
221221
with:
222222
command: cves
223223
image: ${{ steps.meta.outputs.tags }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
6767
- name: Authenticate to Google Cloud
6868
id: auth
69-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
69+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
7070
with:
7171
token_format: access_token
7272
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}

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

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

3636
- name: Authenticate to Google Cloud
3737
id: auth
38-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
38+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
3939
with:
4040
token_format: access_token
4141
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -49,7 +49,7 @@ jobs:
4949
password: ${{ steps.auth.outputs.access_token }}
5050

5151
- name: Build Test-Runner Container
52-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
52+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
5353
with:
5454
file: tests/Dockerfile
5555
context: "."

‎.github/workflows/build-ubi-dependency.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
119119

120120
- name: Build and push
121-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
121+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
122122
with:
123123
file: ./build/dependencies/Dockerfile.ubi
124124
context: "."

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127

128128
- name: Authenticate to Google Cloud
129129
id: auth
130-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
130+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
131131
with:
132132
token_format: access_token
133133
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -233,7 +233,7 @@ jobs:
233233
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
234234

235235
- name: Upload coverage to Codecov
236-
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
236+
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
237237
with:
238238
files: ./coverage.txt
239239
token: ${{ secrets.CODECOV_TOKEN }} # required
@@ -409,7 +409,7 @@ jobs:
409409

410410
- name: Authenticate to Google Cloud
411411
id: auth
412-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
412+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
413413
with:
414414
token_format: access_token
415415
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -449,7 +449,7 @@ jobs:
449449
if: ${{ needs.checks.outputs.forked_workflow == 'true' && needs.checks.outputs.docs_only == 'false' }}
450450

451451
- name: Build Docker Image ${{ matrix.base-os }}
452-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
452+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
453453
with:
454454
file: build/Dockerfile
455455
context: "."
@@ -549,7 +549,7 @@ jobs:
549549

550550
- name: Authenticate to Google Cloud
551551
id: auth
552-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
552+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
553553
with:
554554
token_format: access_token
555555
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -573,7 +573,7 @@ jobs:
573573
if: ${{ needs.checks.outputs.forked_workflow == 'false' && needs.checks.outputs.docs_only == 'false' }}
574574

575575
- name: Build Test-Runner Container
576-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
576+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
577577
with:
578578
file: tests/Dockerfile
579579
context: "."

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

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

7171
# Initializes the CodeQL tools for scanning.
7272
- name: Initialize CodeQL
73-
uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
73+
uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
7474
with:
7575
languages: ${{ matrix.language }}
7676
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -89,7 +89,7 @@ jobs:
8989
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
9090
# If this step fails, then you should remove it and run the build manually (see below)
9191
- name: Autobuild
92-
uses: github/codeql-action/autobuild@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
92+
uses: github/codeql-action/autobuild@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
9393

9494
# ℹ️ Command-line programs to run using the OS shell.
9595
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -102,6 +102,6 @@ jobs:
102102
# ./location_of_script_within_repo/buildscript.sh
103103

104104
- name: Perform CodeQL Analysis
105-
uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
105+
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
106106
with:
107107
category: "/language:${{matrix.language}}"

0 commit comments

Comments
 (0)