Skip to content

Commit 1a64369

Browse files
Merge pull request #336 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents 17dc20c + 98e98ed commit 1a64369

File tree

2 files changed

+26
-24
lines changed

2 files changed

+26
-24
lines changed

klone.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,65 +10,65 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
13+
repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
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: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
18+
repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
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: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
23+
repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
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: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
28+
repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
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: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
33+
repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
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: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
38+
repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
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: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
43+
repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
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: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
48+
repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
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: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
53+
repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
5454
repo_path: modules/klone
5555
- folder_name: oci-build
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
58+
repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
5959
repo_path: modules/oci-build
6060
- folder_name: oci-publish
6161
repo_url: https://github.com/cert-manager/makefile-modules.git
6262
repo_ref: main
63-
repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
63+
repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
6464
repo_path: modules/oci-publish
6565
- folder_name: repository-base
6666
repo_url: https://github.com/cert-manager/makefile-modules.git
6767
repo_ref: main
68-
repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
68+
repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
6969
repo_path: modules/repository-base
7070
- folder_name: tools
7171
repo_url: https://github.com/cert-manager/makefile-modules.git
7272
repo_ref: main
73-
repo_hash: 47c10e2ea2ff413fcff219c458df04a3feef2fc3
73+
repo_hash: f8e889062c304340007ecddc9b089ab8ded26633
7474
repo_path: modules/tools

make/_shared/tools/00_mod.mk

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,28 +116,30 @@ tools += ginkgo=$(detected_ginkgo_version)
116116
tools += klone=v0.1.0
117117
# https://pkg.go.dev/github.com/goreleaser/goreleaser?tab=versions
118118
tools += goreleaser=v1.26.2
119-
# https://pkg.go.dev/github.com/anchore/syft/cmd/syft?tab=versions
119+
# https://pkg.go.dev/github.com/anchore/syft/cmd/syft?tab=versions. We are still
120+
# using an old version (0.100.0, Jan 2024) because all of the latest versions
121+
# use a replace statement, and thus cannot be installed using `go build`.
120122
tools += syft=v0.100.0
121123
# https://github.com/cert-manager/helm-tool
122124
tools += helm-tool=v0.5.3
123125
# https://github.com/cert-manager/cmctl
124-
tools += cmctl=v2.1.0
126+
tools += cmctl=v2.1.1
125127
# https://pkg.go.dev/github.com/cert-manager/release/cmd/cmrel?tab=versions
126-
tools += cmrel=e4c3a4dc07df5c7c0379d334c5bb00e172462551
128+
tools += cmrel=e3cbe5171488deda000145003e22567bdce622ea
127129
# https://github.com/golangci/golangci-lint/releases
128-
tools += golangci-lint=v1.61.0
130+
tools += golangci-lint=v1.62.2
129131
# https://pkg.go.dev/golang.org/x/vuln?tab=versions
130132
tools += govulncheck=v1.1.3
131133
# https://pkg.go.dev/github.com/operator-framework/operator-sdk/cmd/operator-sdk?tab=versions
132-
tools += operator-sdk=v1.36.1
134+
tools += operator-sdk=v1.38.0
133135
# https://pkg.go.dev/github.com/cli/cli/v2?tab=versions
134-
tools += gh=v2.54.0
136+
tools += gh=v2.63.1
135137
# https:///github.com/redhat-openshift-ecosystem/openshift-preflight/releases
136-
tools += preflight=1.10.0
138+
tools += preflight=1.10.2
137139
# https://github.com/daixiang0/gci/releases
138-
tools += gci=v0.13.4
140+
tools += gci=v0.13.5
139141
# https://github.com/google/yamlfmt/releases
140-
tools += yamlfmt=v0.13.0
142+
tools += yamlfmt=v0.14.0
141143

142144
# https://pkg.go.dev/k8s.io/code-generator/cmd?tab=versions
143145
K8S_CODEGEN_VERSION := v0.31.0
@@ -598,8 +600,8 @@ $(DOWNLOAD_DIR)/tools/istioctl@$(ISTIOCTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(
598600
chmod +x $(outfile); \
599601
rm $(outfile).tar.gz
600602

601-
preflight_linux_amd64_SHA256SUM=97750df31f31200f073e3b2844628a0a3681a403648c76d12319f83c80666104
602-
preflight_linux_arm64_SHA256SUM=e12b2afe063c07ee75f69f285f8cc56be99b85e2abac99cbef5fb22b91ef0cb7
603+
preflight_linux_amd64_SHA256SUM=776d04669304d3185c40522bed9a6dc1aa9cd80014a203fe01552b98bfa9554b
604+
preflight_linux_arm64_SHA256SUM=dd7b0a144892ce6fc47d1bc44e344130fa9ff997bf2c39de3016873d8bd3fac5
603605

604606
# Currently there are no official releases for darwin, you cannot submit results
605607
# on non-official binaries, but we can still run tests.

0 commit comments

Comments
 (0)