Skip to content

Commit 0409c2e

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #321 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents 0986c0a + 2d75637 commit 0409c2e

File tree

3 files changed

+25
-20
lines changed

3 files changed

+25
-20
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
13+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
18+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
23+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
28+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
33+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
38+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
43+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
48+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
53+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
58+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
63+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
68+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
73+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
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: 684d99b0a6378fb3625c188bc5a0081ae9d2bbdc
78+
repo_hash: 66c701b603b3136524e923ab55fb5885b3377cf3
7979
repo_path: modules/tools

‎make/_shared/go/01_mod.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ generate-go-mod-tidy: | $(NEEDS_GO)
5858
shared_generate_targets += generate-go-mod-tidy
5959

6060
default_govulncheck_generate_base_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base/
61+
6162
# The base directory used to copy the govulncheck GH action from. This can be
6263
# overwritten with an action with extra authentication or with a totally different
6364
# pipeline (eg. a GitLab pipeline).
@@ -67,6 +68,10 @@ govulncheck_generate_base_dir ?= $(default_govulncheck_generate_base_dir)
6768
# being run on every fork of the repo.
6869
govulncheck_generate_org ?= cert-manager
6970

71+
# Any closed-source or inaccessible Go modules that should be ignored by govulncheck; not needed
72+
# for most open-source projects.
73+
govulncheck_goprivate ?=
74+
7075
.PHONY: generate-govulncheck
7176
## Generate base files in the repository
7277
## @category [shared] Generate/ Verify
@@ -96,7 +101,7 @@ verify-govulncheck: | $(NEEDS_GOVULNCHECK)
96101
target=$$(dirname $${d}); \
97102
echo "Running 'GOTOOLCHAIN=go$(VENDORED_GO_VERSION) $(bin_dir)/tools/govulncheck ./...' in directory '$${target}'"; \
98103
pushd "$${target}" >/dev/null; \
99-
GOTOOLCHAIN=go$(VENDORED_GO_VERSION) $(GOVULNCHECK) ./... || exit; \
104+
GOPRIVATE=$(govulncheck_goprivate) GOTOOLCHAIN=go$(VENDORED_GO_VERSION) $(GOVULNCHECK) ./... || exit; \
100105
popd >/dev/null; \
101106
echo ""; \
102107
done

‎make/_shared/tools/00_mod.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ ADDITIONAL_TOOLS ?=
172172
tools += $(ADDITIONAL_TOOLS)
173173

174174
# https://go.dev/dl/
175-
VENDORED_GO_VERSION := 1.24.5
175+
VENDORED_GO_VERSION := 1.24.6
176176

177177
# Print the go version which can be used in GH actions
178178
.PHONY: print-go-version
@@ -394,10 +394,10 @@ $(call for_each_kv,go_dependency,$(go_dependencies))
394394
# File downloads #
395395
##################
396396

397-
go_linux_amd64_SHA256SUM=10ad9e86233e74c0f6590fe5426895de6bf388964210eac34a6d83f38918ecdc
398-
go_linux_arm64_SHA256SUM=0df02e6aeb3d3c06c95ff201d575907c736d6c62cfa4b6934c11203f1d600ffa
399-
go_darwin_amd64_SHA256SUM=2fe5f3866b8fbcd20625d531f81019e574376b8a840b0a096d8a2180308b1672
400-
go_darwin_arm64_SHA256SUM=92d30a678f306c327c544758f2d2fa5515aa60abe9dba4ca35fbf9b8bfc53212
397+
go_linux_amd64_SHA256SUM=bbca37cc395c974ffa4893ee35819ad23ebb27426df87af92e93a9ec66ef8712
398+
go_linux_arm64_SHA256SUM=124ea6033a8bf98aa9fbab53e58d134905262d45a022af3a90b73320f3c3afd5
399+
go_darwin_amd64_SHA256SUM=4a8d7a32052f223e71faab424a69430455b27b3fff5f4e651f9d97c3e51a8746
400+
go_darwin_arm64_SHA256SUM=4e29202c49573b953be7cc3500e1f8d9e66ddd12faa8cf0939a4951411e09a2a
401401

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

0 commit comments

Comments
 (0)