Skip to content

Commit 130fcd3

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #435 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents 6cb9ab5 + f78beb3 commit 130fcd3

File tree

6 files changed

+40
-40
lines changed

6 files changed

+40
-40
lines changed

‎.github/workflows/govulncheck.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: |
3131
make print-go-version >> "$GITHUB_OUTPUT"
3232
33-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
33+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
3434
with:
3535
go-version: ${{ steps.go-version.outputs.result }}
3636

‎.github/workflows/make-self-upgrade.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
run: |
5151
make print-go-version >> "$GITHUB_OUTPUT"
5252
53-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
53+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
5454
with:
5555
go-version: ${{ steps.go-version.outputs.result }}
5656

‎klone.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,70 +10,70 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
13+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
1414
repo_path: modules/boilerplate
1515
- folder_name: cert-manager
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
18+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
1919
repo_path: modules/cert-manager
2020
- folder_name: controller-gen
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
23+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
2424
repo_path: modules/controller-gen
2525
- folder_name: generate-verify
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
28+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
2929
repo_path: modules/generate-verify
3030
- folder_name: go
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
33+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
3434
repo_path: modules/go
3535
- folder_name: helm
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
38+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
3939
repo_path: modules/helm
4040
- folder_name: help
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
43+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
4444
repo_path: modules/help
4545
- folder_name: kind
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
48+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
4949
repo_path: modules/kind
5050
- folder_name: klone
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
53+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
5454
repo_path: modules/klone
5555
- folder_name: licenses
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
58+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
5959
repo_path: modules/licenses
6060
- folder_name: oci-build
6161
repo_url: https://github.com/cert-manager/makefile-modules.git
6262
repo_ref: main
63-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
63+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
6464
repo_path: modules/oci-build
6565
- folder_name: oci-publish
6666
repo_url: https://github.com/cert-manager/makefile-modules.git
6767
repo_ref: main
68-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
68+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
6969
repo_path: modules/oci-publish
7070
- folder_name: repository-base
7171
repo_url: https://github.com/cert-manager/makefile-modules.git
7272
repo_ref: main
73-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
73+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
7474
repo_path: modules/repository-base
7575
- folder_name: tools
7676
repo_url: https://github.com/cert-manager/makefile-modules.git
7777
repo_ref: main
78-
repo_hash: 1b7da35113e4dc892db9ab7e190a8cda1158b1d5
78+
repo_hash: 172770e538335a25b03ac29aa572660535bd8ad3
7979
repo_path: modules/tools

‎make/_shared/go/base/.github/workflows/govulncheck.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: |
3131
make print-go-version >> "$GITHUB_OUTPUT"
3232
33-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
33+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
3434
with:
3535
go-version: ${{ steps.go-version.outputs.result }}
3636

‎make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
run: |
5151
make print-go-version >> "$GITHUB_OUTPUT"
5252
53-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
53+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
5454
with:
5555
go-version: ${{ steps.go-version.outputs.result }}
5656

‎make/_shared/tools/00_mod.mk‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ NEEDS_CTR = __require-ctr
6666
tools :=
6767
# https://github.com/helm/helm/releases
6868
# renovate: datasource=github-releases packageName=helm/helm
69-
tools += helm=v4.0.4
69+
tools += helm=v4.0.5
7070
# https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
7171
# renovate: datasource=github-releases packageName=kubernetes/kubernetes
7272
tools += kubectl=v1.35.0
@@ -90,7 +90,7 @@ tools += yq=v4.50.1
9090
tools += ko=0.18.1
9191
# https://github.com/protocolbuffers/protobuf/releases
9292
# renovate: datasource=github-releases packageName=protocolbuffers/protobuf
93-
tools += protoc=v33.3
93+
tools += protoc=v33.4
9494
# https://github.com/aquasecurity/trivy/releases
9595
# renovate: datasource=github-releases packageName=aquasecurity/trivy
9696
tools += trivy=v0.68.2
@@ -110,7 +110,7 @@ tools += istioctl=1.28.2
110110
tools += controller-gen=v0.20.0
111111
# https://pkg.go.dev/golang.org/x/tools/cmd/goimports?tab=versions
112112
# renovate: datasource=go packageName=golang.org/x/tools
113-
tools += goimports=v0.40.0
113+
tools += goimports=v0.41.0
114114
# https://pkg.go.dev/github.com/google/go-licenses/v2?tab=versions
115115
# renovate: datasource=go packageName=github.com/inteon/go-licenses/v2
116116
tools += go-licenses=v2.0.0-20250821024731-e4be79958780
@@ -180,10 +180,10 @@ tools += govulncheck=v1.1.4
180180
tools += operator-sdk=v1.42.0
181181
# https://pkg.go.dev/github.com/cli/cli/v2?tab=versions
182182
# renovate: datasource=go packageName=github.com/cli/cli/v2
183-
tools += gh=v2.83.2
183+
tools += gh=v2.85.0
184184
# https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases
185185
# renovate: datasource=github-releases packageName=redhat-openshift-ecosystem/openshift-preflight
186-
tools += preflight=1.15.2
186+
tools += preflight=1.16.0
187187
# https://github.com/daixiang0/gci/releases
188188
# renovate: datasource=github-releases packageName=daixiang0/gci
189189
tools += gci=v0.13.7
@@ -221,7 +221,7 @@ tools += $(ADDITIONAL_TOOLS)
221221

222222
# https://go.dev/dl/
223223
# renovate: datasource=golang-version packageName=go
224-
VENDORED_GO_VERSION := 1.25.5
224+
VENDORED_GO_VERSION := 1.25.6
225225

226226
# Print the go version which can be used in GH actions
227227
.PHONY: print-go-version
@@ -468,21 +468,21 @@ $(call for_each_kv,go_dependency,$(go_dependencies))
468468
# File downloads #
469469
##################
470470

471-
go_linux_amd64_SHA256SUM=9e9b755d63b36acf30c12a9a3fc379243714c1c6d3dd72861da637f336ebb35b
472-
go_linux_arm64_SHA256SUM=b00b694903d126c588c378e72d3545549935d3982635ba3f7a964c9fa23fe3b9
473-
go_darwin_amd64_SHA256SUM=b69d51bce599e5381a94ce15263ae644ec84667a5ce23d58dc2e63e2c12a9f56
474-
go_darwin_arm64_SHA256SUM=bed8ebe824e3d3b27e8471d1307f803fc6ab8e1d0eb7a4ae196979bd9b801dd3
471+
go_linux_amd64_SHA256SUM=f022b6aad78e362bcba9b0b94d09ad58c5a70c6ba3b7582905fababf5fe0181a
472+
go_linux_arm64_SHA256SUM=738ef87d79c34272424ccdf83302b7b0300b8b096ed443896089306117943dd5
473+
go_darwin_amd64_SHA256SUM=e2b5b237f5c262931b8e280ac4b8363f156e19bfad5270c099998932819670b7
474+
go_darwin_arm64_SHA256SUM=984521ae978a5377c7d782fd2dd953291840d7d3d0bd95781a1f32f16d94a006
475475

476476
.PRECIOUS: $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz
477477
$(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools
478478
@source $(lock_script) $@; \
479479
$(CURL) https://go.dev/dl/go$(VENDORED_GO_VERSION).$(HOST_OS)-$(HOST_ARCH).tar.gz -o $(outfile); \
480480
$(checkhash_script) $(outfile) $(go_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM)
481481

482-
helm_linux_amd64_SHA256SUM=29454bc351f4433e66c00f5d37841627cbbcc02e4c70a6d796529d355237671c
483-
helm_linux_arm64_SHA256SUM=16b88acc6503d646b7537a298e7389bef469c5cc9ebadf727547abe9f6a35903
484-
helm_darwin_amd64_SHA256SUM=73bcfd6ab000fdc95acf9fe1c59e8e47179426a653e45ae485889869d4a00523
485-
helm_darwin_arm64_SHA256SUM=a7ea99937a9679b3935fa0a2b70e577aa1ea84e5856e7c0821ca6ffa064ea976
482+
helm_linux_amd64_SHA256SUM=730e4e9fbff94168249ddd0b9b1b8c357b7f64815462dd88c6b39f09bf18b814
483+
helm_linux_arm64_SHA256SUM=206a7747702d13994a93629eaed4259bd9d0aec6e23ca52d640f47f7edfdc863
484+
helm_darwin_amd64_SHA256SUM=270d906140eadbe95584d2cebae1fa0e46950027d82de0c4db937dc936b564a6
485+
helm_darwin_arm64_SHA256SUM=b4d04ccf68004604e13878fce4a893711490914512f8759879f848136a9f5fca
486486

487487
.PRECIOUS: $(DOWNLOAD_DIR)/tools/helm@$(HELM_VERSION)_$(HOST_OS)_$(HOST_ARCH)
488488
$(DOWNLOAD_DIR)/tools/helm@$(HELM_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools
@@ -612,10 +612,10 @@ $(DOWNLOAD_DIR)/tools/ko@$(KO_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR
612612
chmod +x $(outfile); \
613613
rm -f $(outfile).tar.gz
614614

615-
protoc_linux_amd64_SHA256SUM=2dbe6e2165f7721a58c2dc9e40fb47c5e3c2d63fb420c1f497db4ad3eb310ff8
616-
protoc_linux_arm64_SHA256SUM=56652fe893d8588b80754d94132d0575abe6666a9fe52cde4154f47ee1482a46
617-
protoc_darwin_amd64_SHA256SUM=0bb4e36daf61facb76abd1d6e075b59c3dcfaf47bfbde254b13fb10beb734fdd
618-
protoc_darwin_arm64_SHA256SUM=8e5a38ecdc94b92e98a0e29c8ad4451d035e8226d466c3b2ebc60813629bb3bc
615+
protoc_linux_amd64_SHA256SUM=c0040ea9aef08fdeb2c74ca609b18d5fdbfc44ea0042fcfbfb38860d35f7dd66
616+
protoc_linux_arm64_SHA256SUM=15aa988f4a6090636525ec236a8e4b3aab41eef402751bd5bb2df6afd9b7b5a5
617+
protoc_darwin_amd64_SHA256SUM=a49bec10d039e902d3b43e49938c42526f90011467609864fa6386ac4014da58
618+
protoc_darwin_arm64_SHA256SUM=726297dcfed58592fd35620a5a6246ae020c39e88f3fd4cb1827df7bcf3dfcf1
619619

620620
.PRECIOUS: $(DOWNLOAD_DIR)/tools/protoc@$(PROTOC_VERSION)_$(HOST_OS)_$(HOST_ARCH)
621621
$(DOWNLOAD_DIR)/tools/protoc@$(PROTOC_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools
@@ -694,10 +694,10 @@ $(DOWNLOAD_DIR)/tools/istioctl@$(ISTIOCTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(
694694
chmod +x $(outfile); \
695695
rm $(outfile).tar.gz
696696

697-
preflight_linux_amd64_SHA256SUM=803684554991d64f8a06ccc7bfdd1f7c7f702921322297adab01da3e9886e5a8
698-
preflight_linux_arm64_SHA256SUM=d9bf232aa0ad44847e1f5d58143b4699aaa3d136f00a8418aef1404235a2e15a
699-
preflight_darwin_amd64_SHA256SUM=9b948767e70a973d1e8aa6c8c3f8529582c7cebc8d47b07605626b9552a50633
700-
preflight_darwin_arm64_SHA256SUM=4d397b6a70c3dc7358bfe669c29efcec334debfa589d6ae68296552094f77dc2
697+
preflight_linux_amd64_SHA256SUM=09269abbd18746c07efdc5b3d34967ed28e697649fab614bad7746bc3cf06963
698+
preflight_linux_arm64_SHA256SUM=e615bb2d45b81844d71b3901fd89d41ede16fe1080712dd431d1e7d98dcda7bf
699+
preflight_darwin_amd64_SHA256SUM=e26589c1770482e017dfa73d9080a74aaeb0ecf65da7360ae87917e51bb42cf7
700+
preflight_darwin_arm64_SHA256SUM=3c71d0e10cc09f3f53d664de78b5e671cbfd4a2088376f6e77234552d6f8acc8
701701

702702
.PRECIOUS: $(DOWNLOAD_DIR)/tools/preflight@$(PREFLIGHT_VERSION)_$(HOST_OS)_$(HOST_ARCH)
703703
$(DOWNLOAD_DIR)/tools/preflight@$(PREFLIGHT_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools

0 commit comments

Comments
 (0)