Skip to content

Commit 95bb3e2

Browse files
AlexFenlonAlexFenlon
authored
Dependancies update for 5.1.1 (#8148)
1 parent f04aa2e commit 95bb3e2

File tree

8 files changed

+52
-52
lines changed

8 files changed

+52
-52
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
key: nginx-ingress-${{ steps.vars.outputs.go_code_md5 }}
101101

102102
- name: Build binaries
103-
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
103+
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
104104
with:
105105
version: latest
106106
args: build --snapshot --clean

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ jobs:
256256
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
257257

258258
- name: Build binaries
259-
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
259+
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
260260
with:
261261
version: latest
262262
args: build --snapshot --clean

‎.github/workflows/image-promotion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
166166

167167
- name: Build binaries
168-
uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
168+
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
169169
with:
170170
version: latest
171171
args: build --snapshot --clean

‎.github/workflows/release.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ permissions:
4848
jobs:
4949
variables:
5050
name: Set Variables
51-
runs-on: ubuntu-22.04
51+
runs-on: ubuntu-24.04
5252
permissions:
5353
contents: read
5454
outputs:
@@ -60,7 +60,7 @@ jobs:
6060
k8s_version: ${{ steps.vars.outputs.k8s_version }}
6161
steps:
6262
- name: Checkout Repository
63-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
63+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6464
with:
6565
fetch-depth: 0
6666
ref: ${{ inputs.release_branch }}
@@ -84,20 +84,20 @@ jobs:
8484
8585
- name: Fetch Cached Signed Binary Artifacts
8686
id: binary-cache-sign
87-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
87+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
8888
with:
8989
path: ${{ github.workspace }}/tarballs
9090
key: nginx-ingress-release-${{ steps.vars.outputs.go_code_md5 }}
9191
lookup-only: true
9292

9393
tag:
9494
name: Create Tag on release branch in NIC repo
95-
runs-on: ubuntu-22.04
95+
runs-on: ubuntu-24.04
9696
permissions:
9797
contents: write
9898
steps:
9999
- name: Checkout NIC repo
100-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
100+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
101101
with:
102102
ref: ${{ inputs.release_branch }}
103103
fetch-depth: 0
@@ -289,11 +289,11 @@ jobs:
289289
certify-openshift-images:
290290
if: ${{ ! cancelled() && ! failure() && ! inputs.dry_run && ! contains(inputs.skip_step, 'certify-openshift-images') }}
291291
name: Certify OpenShift UBI images
292-
runs-on: ubuntu-22.04
292+
runs-on: ubuntu-24.04
293293
needs: [release-oss]
294294
steps:
295295
- name: Checkout Repository
296-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
296+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
297297
with:
298298
ref: ${{ inputs.release_branch }}
299299

@@ -310,7 +310,7 @@ jobs:
310310
# operator:
311311
# if: ${{ ! cancelled() && ! failure() && ! inputs.dry_run && ! contains(inputs.skip_step, 'operator') && !contains(inputs.skip_step, 'publish-helm-chart') }}
312312
# name: Trigger PR for Operator
313-
# runs-on: ubuntu-22.04
313+
# runs-on: ubuntu-24.04
314314
# needs: [variables,publish-helm-chart]
315315
# steps:
316316
# - name:
@@ -335,7 +335,7 @@ jobs:
335335
# gcp-marketplace:
336336
# if: ${{ ! cancelled() && ! failure() && ! inputs.dry_run && ! contains(inputs.skip_step, 'gcp-marketplace') }}
337337
# name: Trigger PR for GCP Marketplace
338-
# runs-on: ubuntu-22.04
338+
# runs-on: ubuntu-24.04
339339
# needs: [publish-helm-chart,release-plus-gcr-mktpl]
340340
# steps:
341341
# - name:
@@ -357,7 +357,7 @@ jobs:
357357
# azure-marketplace:
358358
# if: ${{ ! cancelled() && ! failure() && ! inputs.dry_run && ! contains(inputs.skip_step, 'azure-marketplace') }}
359359
# name: Trigger CNAB Build for Azure Marketplace
360-
# runs-on: ubuntu-22.04
360+
# runs-on: ubuntu-24.04
361361
# needs: [publish-helm-chart,release-plus-azure-mktpl]
362362
# steps:
363363
# - name:
@@ -381,7 +381,7 @@ jobs:
381381
# aws-marketplace:
382382
# if: ${{ ! cancelled() && ! failure() && ! inputs.dry_run && ! contains(inputs.skip_step, 'aws-marketplace') }}
383383
# name: Publish to AWS Marketplace
384-
# runs-on: ubuntu-22.04
384+
# runs-on: ubuntu-24.04
385385
# needs: [release-plus-aws-mktpl]
386386
# permissions:
387387
# contents: read
@@ -400,7 +400,7 @@ jobs:
400400
# product_id: AWS_NAP_WAF_DOS_PRODUCT_ID
401401
# steps:
402402
# - name: Checkout Repository
403-
# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
403+
# uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
404404
# with:
405405
# ref: ${{ inputs.release_branch }}
406406

@@ -428,31 +428,31 @@ jobs:
428428

429429
binaries:
430430
name: Process Binaries
431-
runs-on: ubuntu-22.04
431+
runs-on: ubuntu-24.04
432432
needs: [variables]
433433
permissions:
434434
contents: read
435435
id-token: write # for cosign to sign artifacts
436436
steps:
437437
- name: Checkout Repository
438-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
438+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
439439
with:
440440
ref: ${{ inputs.release_branch }}
441441

442442
- name: Fetch Binary Artifacts from Cache
443-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
443+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
444444
with:
445445
path: ${{ github.workspace }}/dist
446446
key: nginx-ingress-${{ needs.variables.outputs.go_code_md5 }}
447447
if: ${{ needs.variables.outputs.binary_cache_sign_hit != 'true' }}
448448

449449
- name: Download Syft
450450
id: syft
451-
uses: anchore/sbom-action/download-syft@9246b90769f852b3a8921f330c59e0b3f439d6e9 # v0.20.1
451+
uses: anchore/sbom-action/download-syft@da167eac915b4e86f08b264dbdbc867b61be6f0c # v0.20.5
452452
if: ${{ needs.variables.outputs.binary_cache_sign_hit != 'true' }}
453453

454454
- name: Install Cosign
455-
uses: sigstore/cosign-installer@fb28c2b6339dcd94da6e4cbcbc5e888961f6f8c3 # v3.9.0
455+
uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
456456
if: ${{ needs.variables.outputs.binary_cache_sign_hit != 'true' }}
457457

458458
- name: Create Tarballs
@@ -463,7 +463,7 @@ jobs:
463463
if: ${{ needs.variables.outputs.binary_cache_sign_hit != 'true' }}
464464

465465
- name: Store Tarball Artifacts in Cache
466-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
466+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
467467
with:
468468
path: ${{ github.workspace }}/tarballs
469469
key: nginx-ingress-release-${{ needs.variables.outputs.go_code_md5 }}
@@ -473,20 +473,20 @@ jobs:
473473
azure-upload:
474474
if: ${{ ! cancelled() && ! failure() && ! contains(inputs.skip_step, 'azure-upload') }}
475475
name: Upload packages to Azure
476-
runs-on: ubuntu-22.04
476+
runs-on: ubuntu-24.04
477477
needs: [variables, binaries]
478478
permissions:
479479
id-token: write
480480
contents: read
481481
environment: release
482482
steps:
483483
- name: Checkout Repository
484-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
484+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
485485
with:
486486
ref: ${{ inputs.release_branch }}
487487

488488
- name: Fetch Cached Tarball Artifacts
489-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
489+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
490490
with:
491491
key: nginx-ingress-release-${{ needs.variables.outputs.go_code_md5 }}
492492
path: ${{ github.workspace }}/tarballs
@@ -517,20 +517,20 @@ jobs:
517517
github-release:
518518
if: ${{ ! cancelled() && ! failure() && ! contains(inputs.skip_step, 'github-release') }}
519519
name: Publish release to GitHub
520-
runs-on: ubuntu-22.04
520+
runs-on: ubuntu-24.04
521521
needs: [variables, binaries, release-oss, release-plus-gcr-nginx]
522522
permissions:
523523
contents: write # to modify the release
524524
issues: write # to close milestone
525525
actions: read # for slack notification
526526
steps:
527527
- name: Checkout Repository
528-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
528+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
529529
with:
530530
ref: ${{ inputs.release_branch }}
531531

532532
- name: Fetch Cached Tarball Artifacts
533-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
533+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
534534
with:
535535
key: nginx-ingress-release-${{ needs.variables.outputs.go_code_md5 }}
536536
path: ${{ github.workspace }}/tarballs
@@ -602,7 +602,7 @@ jobs:
602602
release-image-notification:
603603
if: ${{ ! cancelled() && ! failure() && ! inputs.dry_run && ! contains(inputs.skip_step, 'release-image-notification') }}
604604
name: Notify Slack channels about image release
605-
runs-on: ubuntu-22.04
605+
runs-on: ubuntu-24.04
606606
needs: [variables, binaries, release-oss, release-plus-gcr-nginx]
607607
permissions:
608608
contents: read
@@ -613,7 +613,7 @@ jobs:
613613
image: ["nginx/nginx-ingress:${{ inputs.nic_version }}", "nginx/nginx-ingress:${{ inputs.nic_version }}-ubi", "nginx/nginx-ingress:${{ inputs.nic_version }}-alpine"]
614614
steps:
615615
- name: Checkout Repository
616-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
616+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
617617
with:
618618
ref: ${{ inputs.release_branch }}
619619

‎build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ USER 101
8282

8383

8484
############################################# Base image for Alpine #############################################
85-
FROM nginx:1.29.1-alpine3.22@sha256:599f75c32c9bfe5859e022f75d26e4d939f5b1097c7abc1add287d48ec100f1e AS alpine
85+
FROM nginx:1.29.1-alpine3.22@sha256:c3d2ee1eed702c6f29f2e2f727e93b5cafdc7dec7feef3ad2e6d7c39670853ec AS alpine
8686
ARG PACKAGE_REPO
8787
ARG NGINX_OSS_VERSION
8888

‎go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ require (
2121
github.com/stretchr/testify v1.10.0
2222
go.opentelemetry.io/otel v1.37.0
2323
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.37.0
24-
k8s.io/api v0.33.3
25-
k8s.io/apimachinery v0.33.3
26-
k8s.io/client-go v0.33.3
27-
k8s.io/code-generator v0.33.3
24+
k8s.io/api v0.33.4
25+
k8s.io/apimachinery v0.33.4
26+
k8s.io/client-go v0.33.4
27+
k8s.io/code-generator v0.33.4
2828
k8s.io/utils v0.0.0-20241210054802-24370beab758
2929
sigs.k8s.io/controller-tools v0.18.0
3030
)
@@ -194,9 +194,9 @@ require (
194194
gopkg.in/inf.v0 v0.9.1 // indirect
195195
gopkg.in/yaml.v2 v2.4.0 // indirect
196196
gopkg.in/yaml.v3 v3.0.1 // indirect
197-
k8s.io/apiextensions-apiserver v0.33.3 // indirect
198-
k8s.io/apiserver v0.33.3 // indirect
199-
k8s.io/component-base v0.33.3 // indirect
197+
k8s.io/apiextensions-apiserver v0.33.4 // indirect
198+
k8s.io/apiserver v0.33.4 // indirect
199+
k8s.io/component-base v0.33.4 // indirect
200200
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
201201
k8s.io/klog/v2 v2.130.1 // indirect
202202
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect

‎go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -573,20 +573,20 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
573573
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
574574
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
575575
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
576-
k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
577-
k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
578-
k8s.io/apiextensions-apiserver v0.33.3 h1:qmOcAHN6DjfD0v9kxL5udB27SRP6SG/MTopmge3MwEs=
579-
k8s.io/apiextensions-apiserver v0.33.3/go.mod h1:oROuctgo27mUsyp9+Obahos6CWcMISSAPzQ77CAQGz8=
580-
k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
581-
k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
582-
k8s.io/apiserver v0.33.3 h1:Wv0hGc+QFdMJB4ZSiHrCgN3zL3QRatu56+rpccKC3J4=
583-
k8s.io/apiserver v0.33.3/go.mod h1:05632ifFEe6TxwjdAIrwINHWE2hLwyADFk5mBsQa15E=
584-
k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
585-
k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
586-
k8s.io/code-generator v0.33.3 h1:6+34LhYkIuQ/yn/E3qlpVqjQaP8smzCu4NE1A8b0LWs=
587-
k8s.io/code-generator v0.33.3/go.mod h1:6Y02+HQJYgNphv9z3wJB5w+sjYDIEBQW7sh62PkufvA=
588-
k8s.io/component-base v0.33.3 h1:mlAuyJqyPlKZM7FyaoM/LcunZaaY353RXiOd2+B5tGA=
589-
k8s.io/component-base v0.33.3/go.mod h1:ktBVsBzkI3imDuxYXmVxZ2zxJnYTZ4HAsVj9iF09qp4=
576+
k8s.io/api v0.33.4 h1:oTzrFVNPXBjMu0IlpA2eDDIU49jsuEorGHB4cvKupkk=
577+
k8s.io/api v0.33.4/go.mod h1:VHQZ4cuxQ9sCUMESJV5+Fe8bGnqAARZ08tSTdHWfeAc=
578+
k8s.io/apiextensions-apiserver v0.33.4 h1:rtq5SeXiDbXmSwxsF0MLe2Mtv3SwprA6wp+5qh/CrOU=
579+
k8s.io/apiextensions-apiserver v0.33.4/go.mod h1:mWXcZQkQV1GQyxeIjYApuqsn/081hhXPZwZ2URuJeSs=
580+
k8s.io/apimachinery v0.33.4 h1:SOf/JW33TP0eppJMkIgQ+L6atlDiP/090oaX0y9pd9s=
581+
k8s.io/apimachinery v0.33.4/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
582+
k8s.io/apiserver v0.33.4 h1:6N0TEVA6kASUS3owYDIFJjUH6lgN8ogQmzZvaFFj1/Y=
583+
k8s.io/apiserver v0.33.4/go.mod h1:8ODgXMnOoSPLMUg1aAzMFx+7wTJM+URil+INjbTZCok=
584+
k8s.io/client-go v0.33.4 h1:TNH+CSu8EmXfitntjUPwaKVPN0AYMbc9F1bBS8/ABpw=
585+
k8s.io/client-go v0.33.4/go.mod h1:LsA0+hBG2DPwovjd931L/AoaezMPX9CmBgyVyBZmbCY=
586+
k8s.io/code-generator v0.33.4 h1:DiA801QxqApRIBh3OWULasVAUA237XnYvFNMh+E34Y8=
587+
k8s.io/code-generator v0.33.4/go.mod h1:ifWxKWhEl/Z1K7WmWAyOBEf3ex/i546ingCzLC8YVIY=
588+
k8s.io/component-base v0.33.4 h1:Jvb/aw/tl3pfgnJ0E0qPuYLT0NwdYs1VXXYQmSuxJGY=
589+
k8s.io/component-base v0.33.4/go.mod h1:567TeSdixWW2Xb1yYUQ7qk5Docp2kNznKL87eygY8Rc=
590590
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 h1:2OX19X59HxDprNCVrWi6jb7LW1PoqTlYqEq5H2oetog=
591591
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
592592
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

‎tests/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM kindest/node:v1.33.1@sha256:050072256b9a903bd914c0b2866828150cb229cea0efe58
55
# this is here so we can grab the latest version of skopeo and have dependabot keep it up to date
66
FROM quay.io/skopeo/stable:v1.19.0
77

8-
FROM python:3.13-bookworm@sha256:1bfefad1a8bb66c1573378716c3bf18a59f438fe8a032d7fab43124f6f7ce9c6
8+
FROM python:3.13-bookworm@sha256:4841ea834ffb3418563b01d3f1a322b057182522ddc7e976775564ea38461023
99

1010
RUN apt-get update \
1111
&& apt-get install -y curl git apache2-utils \

0 commit comments

Comments
 (0)