Skip to content

Commit ea6c7d2

Browse files
inteoninteon
committed
Run 'make upgrade-klone' and 'make generate'
Signed-off-by: Tim Ramlot <[email protected]>
1 parent fbd6e31 commit ea6c7d2

File tree

9 files changed

+40
-36
lines changed

9 files changed

+40
-36
lines changed

‎.github/dependabot.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2-
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/dependabot.yaml instead.
2+
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base-dependabot/.github/dependabot.yaml instead.
33

44
# Update Go dependencies and GitHub Actions dependencies daily.
55
version: 2

‎.github/workflows/govulncheck.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
21+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2222

2323
- id: go-version
2424
run: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
echo "This workflow should not be run on a non-branch-head."
3333
exit 1
3434
35-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
35+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3636

3737
- id: go-version
3838
run: |

‎klone.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,70 +10,70 @@ targets:
1010
- folder_name: api-docs
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
13+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
1414
repo_path: modules/api-docs
1515
- folder_name: boilerplate
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
18+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
1919
repo_path: modules/boilerplate
2020
- folder_name: cert-manager
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
23+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
2424
repo_path: modules/cert-manager
2525
- folder_name: controller-gen
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
28+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
2929
repo_path: modules/controller-gen
3030
- folder_name: generate-verify
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
33+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
3434
repo_path: modules/generate-verify
3535
- folder_name: go
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
38+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
3939
repo_path: modules/go
4040
- folder_name: helm
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
43+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
4444
repo_path: modules/helm
4545
- folder_name: help
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
48+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
4949
repo_path: modules/help
5050
- folder_name: kind
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
53+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
5454
repo_path: modules/kind
5555
- folder_name: klone
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
58+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
5959
repo_path: modules/klone
6060
- folder_name: oci-build
6161
repo_url: https://github.com/cert-manager/makefile-modules.git
6262
repo_ref: main
63-
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
63+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
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: 3cf24410bca85e4b3f39f71882c8655b2d34464c
68+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
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: 3cf24410bca85e4b3f39f71882c8655b2d34464c
73+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
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: 3cf24410bca85e4b3f39f71882c8655b2d34464c
78+
repo_hash: 90946d6b57c870ff3d100fc2d7546ee9f453c348
7979
repo_path: modules/tools

‎make/_shared/cert-manager/00_mod.mk‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
images_amd64 ?=
1616
images_arm64 ?=
1717

18-
cert_manager_version := v1.15.3
18+
cert_manager_version := v1.16.0
1919

20-
images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:631ba2b3bf7be0bd0d446b8bfcbeb56f8fe735cd02a267567a8d94682d03165b
21-
images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:6802c6afea2da91f5782880b79008179bb98147a23ce00f3cab5ba799807b5d6
22-
images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:373e3acd7b96c87a574f9234bb4fbfd576e3205c502d6da5dade41165c9dc828
23-
images_amd64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:a896ff5d8029e5a040643935089ef0466fe0c1f6b2fe591f342994c53aada6e2
20+
images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:b45df0d537a7a8ef2d968bd2621547dd43d93230a5b12a89cf496a081db2edd3
21+
images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:13d60b82759fec353c5c35280b902bf3f3c8680b471501792b62a7db2ef706e1
22+
images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:a98cc73669ed5e3220a064732649c541b4d2c272327271f63f9129a6f234ca63
23+
images_amd64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:42b5c24cdf9fb68ccc4de4854e0336ac9e05bfacbd4c6ad9b85787db2e73c646
2424

25-
images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:06fed982efd0c2b59736718ace9f7d482fda550d9398cc90b01a9ceb98c3fbb5
26-
images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:549347a89682abc0ede551b253a617defc398c7b2b1ede4c66cb71f33326c2d1
27-
images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:51fe148d9e5269511f5fdac2db8cb64611acd6b118e5fcade00302442da33a8a
28-
images_arm64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:a15bfed2b625f7c97029ac4ba2777a13897a4492cc995cafda4594d30ab3d721
25+
images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:af089c67364f0ed282cb11b3994bea7bfa485d75a7b019c2c532ea118455f49b
26+
images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:53a5206399898f2f754d45943211a38bdd82a23beb7f3ce33c30950117c95ebc
27+
images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:f8f633a1fe9089375e1c0debd5e7b1672ac740f2294453a37863a3d0b6d0a1cc
28+
images_arm64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:9ab84f036989c71d531882acb3549799265e7f04b5fb719f4fd1bce6f9e2c9b0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
21+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2222

2323
- id: go-version
2424
run: |

‎make/_shared/repository-base/base-dependabot/.github/dependabot.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2-
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/dependabot.yaml instead.
2+
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base-dependabot/.github/dependabot.yaml instead.
33

44
# Update Go dependencies and GitHub Actions dependencies daily.
55
version: 2

‎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
@@ -32,7 +32,7 @@ jobs:
3232
echo "This workflow should not be run on a non-branch-head."
3333
exit 1
3434
35-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
35+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3636

3737
- id: go-version
3838
run: |

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ tools += goreleaser=v1.26.2
117117
# https://pkg.go.dev/github.com/anchore/syft/cmd/syft?tab=versions
118118
tools += syft=v0.100.0
119119
# https://github.com/cert-manager/helm-tool
120-
tools += helm-tool=v0.5.1
120+
tools += helm-tool=v0.5.3
121121
# https://github.com/cert-manager/cmctl
122122
tools += cmctl=v2.1.0
123123
# https://pkg.go.dev/github.com/cert-manager/release/cmd/cmrel?tab=versions
@@ -159,7 +159,7 @@ ADDITIONAL_TOOLS ?=
159159
tools += $(ADDITIONAL_TOOLS)
160160

161161
# https://go.dev/dl/
162-
VENDORED_GO_VERSION := 1.23.1
162+
VENDORED_GO_VERSION := 1.23.2
163163

164164
# Print the go version which can be used in GH actions
165165
.PHONY: print-go-version
@@ -183,7 +183,11 @@ CURL := curl --silent --show-error --fail --location --retry 10 --retry-connrefu
183183
# can run the "link $(DOWNLOAD_DIR)/tools/xxx@$(XXX_VERSION)_$(HOST_OS)_$(HOST_ARCH)
184184
# to $(bin_dir)/tools/xxx" operation simultaneously without issues (both
185185
# will perform the action and the second time the link will be overwritten).
186-
LN := ln -fs
186+
#
187+
# -s = Create a symbolic link
188+
# -f = Force the creation of the link (replace existing links)
189+
# -n = If destination already exists, replace it, don't use it as a directory to create a new link inside
190+
LN := ln -fsn
187191

188192
upper_map := a:A b:B c:C d:D e:E f:F g:G h:H i:I j:J k:K l:L m:M n:N o:O p:P q:Q r:R s:S t:T u:U v:V w:W x:X y:Y z:Z
189193
uc = $(strip \
@@ -374,10 +378,10 @@ $(call for_each_kv,go_dependency,$(go_dependencies))
374378
# File downloads #
375379
##################
376380

377-
go_linux_amd64_SHA256SUM=49bbb517cfa9eee677e1e7897f7cf9cfdbcf49e05f61984a2789136de359f9bd
378-
go_linux_arm64_SHA256SUM=faec7f7f8ae53fda0f3d408f52182d942cc89ef5b7d3d9f23ff117437d4b2d2f
379-
go_darwin_amd64_SHA256SUM=488d9e4ca3e3ed513ee4edd91bef3a2360c65fa6d6be59cf79640bf840130a58
380-
go_darwin_arm64_SHA256SUM=e223795ca340e285a760a6446ce57a74500b30e57469a4109961d36184d3c05a
381+
go_linux_amd64_SHA256SUM=542d3c1705f1c6a1c5a80d5dc62e2e45171af291e755d591c5e6531ef63b454e
382+
go_linux_arm64_SHA256SUM=f626cdd92fc21a88b31c1251f419c17782933a42903db87a174ce74eeecc66a9
383+
go_darwin_amd64_SHA256SUM=445c0ef19d8692283f4c3a92052cc0568f5a048f4e546105f58e991d4aea54f5
384+
go_darwin_arm64_SHA256SUM=d87031194fe3e01abdcaf3c7302148ade97a7add6eac3fec26765bcb3207b80f
381385

382386
.PRECIOUS: $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz
383387
$(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools

0 commit comments

Comments
 (0)