Skip to content

Commit 8568d3e

Browse files
pdabelf5pdabelf5
authored
Merge branch 'main' into cherry-pick-v2
2 parents 5bb595b + df4a15d commit 8568d3e

Some content is hidden

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

46 files changed

+1769
-474
lines changed

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

+6-6
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 }}
@@ -229,7 +229,7 @@ jobs:
229229
type=raw,value=${{ needs.checks.outputs.docker_md5 }},enable=${{ needs.checks.outputs.docker_md5 != '' }}
230230
231231
- name: Build Base Container
232-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
232+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
233233
with:
234234
file: build/Dockerfile
235235
context: "."

‎.github/workflows/build-oss.yml

+4-4
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: "."
@@ -155,7 +155,7 @@ jobs:
155155
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
156156

157157
- name: Build Docker image
158-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
158+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
159159
id: build-push
160160
with:
161161
file: build/Dockerfile
@@ -201,7 +201,7 @@ jobs:
201201

202202
- name: Run Docker Scout vulnerability scanner
203203
id: docker-scout
204-
uses: docker/scout-action@d341d36d6eebbe05c0b25760c63afa19e8f23269 # v1.17.0
204+
uses: docker/scout-action@381b657c498a4d287752e7f2cfb2b41823f566d9 # v1.17.1
205205
with:
206206
command: cves
207207
image: ${{ steps.meta.outputs.tags }}

‎.github/workflows/build-plus.yml

+4-4
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 }}
@@ -130,7 +130,7 @@ jobs:
130130
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
131131

132132
- name: Build Base Container
133-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
133+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
134134
with:
135135
file: build/Dockerfile
136136
context: "."
@@ -168,7 +168,7 @@ jobs:
168168
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
169169

170170
- name: Build Docker image
171-
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
171+
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
172172
id: build-push
173173
with:
174174
file: build/Dockerfile
@@ -222,7 +222,7 @@ jobs:
222222

223223
- name: Run Docker Scout vulnerability scanner
224224
id: docker-scout
225-
uses: docker/scout-action@d341d36d6eebbe05c0b25760c63afa19e8f23269 # v1.17.0
225+
uses: docker/scout-action@381b657c498a4d287752e7f2cfb2b41823f566d9 # v1.17.1
226226
with:
227227
command: cves
228228
image: ${{ steps.meta.outputs.tags }}

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

+1-1
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

+2-2
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

+1-1
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

+5-5
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 }}
@@ -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

+3-3
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@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
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@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
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@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
105+
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
106106
with:
107107
category: "/language:${{matrix.language}}"

‎.github/workflows/dependabot-hugo.yml

+1-1
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@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
49+
uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
5050
with:
5151
commit_message: "Update docs go.mod"

‎.github/workflows/image-promotion.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080

8181
- name: Authenticate to Google Cloud
8282
id: auth
83-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
83+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
8484
with:
8585
token_format: access_token
8686
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -143,7 +143,7 @@ jobs:
143143
fi
144144
145145
- name: Upload SARIF file
146-
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
146+
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
147147
if: steps.check-sarif.outputs.sarif_has_results == 'true'
148148
with:
149149
sarif_file: govulncheck.sarif
@@ -420,7 +420,7 @@ jobs:
420420
421421
- name: Authenticate to Google Cloud
422422
id: auth
423-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
423+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
424424
with:
425425
token_format: access_token
426426
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -450,7 +450,7 @@ jobs:
450450

451451
- name: Run Docker Scout vulnerability scanner
452452
id: docker-scout
453-
uses: docker/scout-action@d341d36d6eebbe05c0b25760c63afa19e8f23269 # v1.17.0
453+
uses: docker/scout-action@381b657c498a4d287752e7f2cfb2b41823f566d9 # v1.17.1
454454
with:
455455
command: cves
456456
image: ${{ steps.meta.outputs.tags }}
@@ -468,7 +468,7 @@ jobs:
468468
overwrite: true
469469

470470
- name: Upload Scan results to GitHub Security tab
471-
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
471+
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
472472
with:
473473
sarif_file: "${{ steps.directory.outputs.directory }}/"
474474

@@ -509,7 +509,7 @@ jobs:
509509
510510
- name: Authenticate to Google Cloud
511511
id: auth
512-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
512+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
513513
with:
514514
token_format: access_token
515515
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -539,7 +539,7 @@ jobs:
539539

540540
- name: Run Docker Scout vulnerability scanner
541541
id: docker-scout
542-
uses: docker/scout-action@d341d36d6eebbe05c0b25760c63afa19e8f23269 # v1.17.0
542+
uses: docker/scout-action@381b657c498a4d287752e7f2cfb2b41823f566d9 # v1.17.1
543543
with:
544544
command: cves
545545
image: ${{ steps.meta.outputs.tags }}
@@ -557,7 +557,7 @@ jobs:
557557
overwrite: true
558558

559559
- name: Upload Scan results to GitHub Security tab
560-
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
560+
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
561561
with:
562562
sarif_file: "${{ steps.directory.outputs.directory }}/"
563563

@@ -605,7 +605,7 @@ jobs:
605605
606606
- name: Authenticate to Google Cloud
607607
id: auth
608-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
608+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
609609
with:
610610
token_format: access_token
611611
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -635,7 +635,7 @@ jobs:
635635

636636
- name: Run Docker Scout vulnerability scanner
637637
id: docker-scout
638-
uses: docker/scout-action@d341d36d6eebbe05c0b25760c63afa19e8f23269 # v1.17.0
638+
uses: docker/scout-action@381b657c498a4d287752e7f2cfb2b41823f566d9 # v1.17.1
639639
with:
640640
command: cves
641641
image: ${{ steps.meta.outputs.tags }}
@@ -653,7 +653,7 @@ jobs:
653653
overwrite: true
654654

655655
- name: Upload Scan results to GitHub Security tab
656-
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
656+
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
657657
with:
658658
sarif_file: "${{ steps.directory.outputs.directory }}/"
659659
continue-on-error: true

‎.github/workflows/oss-release.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585

8686
- name: Authenticate to Google Cloud
8787
id: gcr-auth
88-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
88+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
8989
with:
9090
token_format: access_token
9191
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -123,7 +123,7 @@ jobs:
123123

124124
- name: Authenticate to Google Cloud
125125
id: gcr-auth
126-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
126+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
127127
with:
128128
token_format: access_token
129129
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -172,7 +172,7 @@ jobs:
172172

173173
- name: Authenticate to Google Cloud
174174
id: gcr-auth
175-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
175+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
176176
with:
177177
token_format: access_token
178178
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -216,7 +216,7 @@ jobs:
216216

217217
- name: Authenticate to Google Cloud
218218
id: gcr-auth
219-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
219+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
220220
with:
221221
token_format: access_token
222222
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -262,7 +262,7 @@ jobs:
262262

263263
- name: Authenticate to Google Cloud
264264
id: gcr-auth
265-
uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
265+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
266266
with:
267267
token_format: access_token
268268
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}

0 commit comments

Comments
 (0)