Skip to content

Commit 76e6205

Browse files
Merge pull request #451 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents 3d7c029 + 25e2826 commit 76e6205

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

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: d9219ba1aadab8e42148ea50fc8a191577d823f4
13+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
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: d9219ba1aadab8e42148ea50fc8a191577d823f4
18+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
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: d9219ba1aadab8e42148ea50fc8a191577d823f4
23+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
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: d9219ba1aadab8e42148ea50fc8a191577d823f4
28+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
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: d9219ba1aadab8e42148ea50fc8a191577d823f4
33+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
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: d9219ba1aadab8e42148ea50fc8a191577d823f4
38+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
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: d9219ba1aadab8e42148ea50fc8a191577d823f4
43+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
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: d9219ba1aadab8e42148ea50fc8a191577d823f4
48+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
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: d9219ba1aadab8e42148ea50fc8a191577d823f4
53+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
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: d9219ba1aadab8e42148ea50fc8a191577d823f4
58+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
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: d9219ba1aadab8e42148ea50fc8a191577d823f4
63+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
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: d9219ba1aadab8e42148ea50fc8a191577d823f4
68+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
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: d9219ba1aadab8e42148ea50fc8a191577d823f4
73+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
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: d9219ba1aadab8e42148ea50fc8a191577d823f4
78+
repo_hash: fb840168823fe3945b6df2cf10c47223e1b8ad6a
7979
repo_path: modules/tools

make/_shared/tools/00_mod.mk

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ tools :=
6969
tools += helm=v4.1.1
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
72-
tools += kubectl=v1.35.0
72+
tools += kubectl=v1.35.1
7373
# https://github.com/kubernetes-sigs/kind/releases
7474
# renovate: datasource=github-releases packageName=kubernetes-sigs/kind
7575
tools += kind=v0.31.0
@@ -156,7 +156,7 @@ tools += klone=v0.2.0
156156
tools += goreleaser=v2.13.3
157157
# https://pkg.go.dev/github.com/anchore/syft/cmd/syft?tab=versions
158158
# renovate: datasource=go packageName=github.com/anchore/syft
159-
tools += syft=v1.41.2
159+
tools += syft=v1.42.0
160160
# https://github.com/cert-manager/helm-tool/releases
161161
# renovate: datasource=github-releases packageName=cert-manager/helm-tool
162162
tools += helm-tool=v0.5.3
@@ -171,7 +171,7 @@ tools += cmctl=v2.4.0
171171
tools += cmrel=v1.12.15-0.20241121151736-e3cbe5171488
172172
# https://pkg.go.dev/github.com/golangci/golangci-lint/v2/cmd/golangci-lint?tab=versions
173173
# renovate: datasource=go packageName=github.com/golangci/golangci-lint/v2
174-
tools += golangci-lint=v2.8.0
174+
tools += golangci-lint=v2.9.0
175175
# https://pkg.go.dev/golang.org/x/vuln?tab=versions
176176
# renovate: datasource=go packageName=golang.org/x/vuln
177177
tools += govulncheck=v1.1.4
@@ -197,7 +197,7 @@ tools += kubeconform=v0.7.0
197197
# FIXME(erikgb): cert-manager needs the ability to override the version set here
198198
# https://pkg.go.dev/k8s.io/code-generator/cmd?tab=versions
199199
# renovate: datasource=go packageName=k8s.io/code-generator
200-
K8S_CODEGEN_VERSION ?= v0.35.0
200+
K8S_CODEGEN_VERSION ?= v0.35.1
201201
tools += client-gen=$(K8S_CODEGEN_VERSION)
202202
tools += deepcopy-gen=$(K8S_CODEGEN_VERSION)
203203
tools += informer-gen=$(K8S_CODEGEN_VERSION)
@@ -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.7
224+
VENDORED_GO_VERSION := 1.26.0
225225

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

471-
go_linux_amd64_SHA256SUM=12e6d6a191091ae27dc31f6efc630e3a3b8ba409baf3573d955b196fdf086005
472-
go_linux_arm64_SHA256SUM=ba611a53534135a81067240eff9508cd7e256c560edd5d8c2fef54f083c07129
473-
go_darwin_amd64_SHA256SUM=bf5050a2152f4053837b886e8d9640c829dbacbc3370f913351eb0904cb706f5
474-
go_darwin_arm64_SHA256SUM=ff18369ffad05c57d5bed888b660b31385f3c913670a83ef557cdfd98ea9ae1b
471+
go_linux_amd64_SHA256SUM=aac1b08a0fb0c4e0a7c1555beb7b59180b05dfc5a3d62e40e9de90cd42f88235
472+
go_linux_arm64_SHA256SUM=bd03b743eb6eb4193ea3c3fd3956546bf0e3ca5b7076c8226334afe6b75704cd
473+
go_darwin_amd64_SHA256SUM=1ca28b7703cbea05a65b2a1d92d6b308610ef92f8824578a0874f2e60c9d5a22
474+
go_darwin_arm64_SHA256SUM=b1640525dfe68f066d56f200bef7bf4dce955a1a893bd061de6754c211431023
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
@@ -493,10 +493,10 @@ $(DOWNLOAD_DIR)/tools/helm@$(HELM_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD
493493
chmod +x $(outfile); \
494494
rm -f $(outfile).tar.gz
495495

496-
kubectl_linux_amd64_SHA256SUM=a2e984a18a0c063279d692533031c1eff93a262afcc0afdc517375432d060989
497-
kubectl_linux_arm64_SHA256SUM=58f82f9fe796c375c5c4b8439850b0f3f4d401a52434052f2df46035a8789e25
498-
kubectl_darwin_amd64_SHA256SUM=2447cb78911b10a667202b078eeb30541ec78d1280c3682921dc81607e148d96
499-
kubectl_darwin_arm64_SHA256SUM=cf699c56340dc775230fde4ef84237d27563ea6ef52164c7d078072b586c3918
496+
kubectl_linux_amd64_SHA256SUM=36e2f4ac66259232341dd7866952d64a958846470f6a9a6a813b9117bd965207
497+
kubectl_linux_arm64_SHA256SUM=706256e21a4e9192ee62d1a007ac0bfcff2b0b26e92cc7baad487a6a5d08ff82
498+
kubectl_darwin_amd64_SHA256SUM=07a04d82bc2de2f5d53dfd81f2109ca864f634a82b225257daa2f9c2db15ccef
499+
kubectl_darwin_arm64_SHA256SUM=2b000dded317319b1ebca19c2bc70f772c7aaa0e8962fae2d987ba04dd1a1b50
500500

501501
.PRECIOUS: $(DOWNLOAD_DIR)/tools/kubectl@$(KUBECTL_VERSION)_$(HOST_OS)_$(HOST_ARCH)
502502
$(DOWNLOAD_DIR)/tools/kubectl@$(KUBECTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools

0 commit comments

Comments
 (0)