Skip to content

Commit d767973

Browse files
SgtCoDFishSgtCoDFish
committed
chore: manually upgrade makefile-modules
1 parent bd8ce9e commit d767973

File tree

10 files changed

+236
-154
lines changed

10 files changed

+236
-154
lines changed

‎.golangci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ linters:
1313
- nilerr
1414
- unparam
1515
text: .*
16-
paths: [third_party$, builtin$, examples$]
16+
paths: [third_party, builtin$, examples$]
1717
warn-unused: true
1818
settings:
1919
staticcheck:
@@ -86,4 +86,4 @@ formatters:
8686
- dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
8787
exclusions:
8888
generated: lax
89-
paths: [third_party$, builtin$, examples$]
89+
paths: [third_party, builtin$, examples$]

‎LICENSES

Lines changed: 152 additions & 114 deletions
Large diffs are not rendered by default.

‎klone.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,55 +10,55 @@ targets:
1010
- folder_name: generate-verify
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 5c3266f17637fbd1d4af1191b34674991e2160ab
13+
repo_hash: 2a0b032b3a629076796e8760c59c29428c60ce0d
1414
repo_path: modules/generate-verify
1515
- folder_name: go
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: 5c3266f17637fbd1d4af1191b34674991e2160ab
18+
repo_hash: 2a0b032b3a629076796e8760c59c29428c60ce0d
1919
repo_path: modules/go
2020
- folder_name: helm
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: 5c3266f17637fbd1d4af1191b34674991e2160ab
23+
repo_hash: 2a0b032b3a629076796e8760c59c29428c60ce0d
2424
repo_path: modules/helm
2525
- folder_name: help
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: 5c3266f17637fbd1d4af1191b34674991e2160ab
28+
repo_hash: 2a0b032b3a629076796e8760c59c29428c60ce0d
2929
repo_path: modules/help
3030
- folder_name: kind
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: 5c3266f17637fbd1d4af1191b34674991e2160ab
33+
repo_hash: 2a0b032b3a629076796e8760c59c29428c60ce0d
3434
repo_path: modules/kind
3535
- folder_name: klone
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: 5c3266f17637fbd1d4af1191b34674991e2160ab
38+
repo_hash: 2a0b032b3a629076796e8760c59c29428c60ce0d
3939
repo_path: modules/klone
4040
- folder_name: licenses
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: 5c3266f17637fbd1d4af1191b34674991e2160ab
43+
repo_hash: 2a0b032b3a629076796e8760c59c29428c60ce0d
4444
repo_path: modules/licenses
4545
- folder_name: oci-build
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: 5c3266f17637fbd1d4af1191b34674991e2160ab
48+
repo_hash: 2a0b032b3a629076796e8760c59c29428c60ce0d
4949
repo_path: modules/oci-build
5050
- folder_name: oci-publish
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: 5c3266f17637fbd1d4af1191b34674991e2160ab
53+
repo_hash: 2a0b032b3a629076796e8760c59c29428c60ce0d
5454
repo_path: modules/oci-publish
5555
- folder_name: repository-base
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: 5c3266f17637fbd1d4af1191b34674991e2160ab
58+
repo_hash: 2a0b032b3a629076796e8760c59c29428c60ce0d
5959
repo_path: modules/repository-base
6060
- folder_name: tools
6161
repo_url: https://github.com/cert-manager/makefile-modules.git
6262
repo_ref: main
63-
repo_hash: 5c3266f17637fbd1d4af1191b34674991e2160ab
63+
repo_hash: 2a0b032b3a629076796e8760c59c29428c60ce0d
6464
repo_path: modules/tools

‎make/_shared/go/.golangci.override.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ linters:
44
exclusions:
55
generated: lax
66
presets: [ comments, common-false-positives, legacy, std-error-handling ]
7-
paths: [ third_party$, builtin$, examples$ ]
7+
paths: [ third_party, builtin$, examples$ ]
88
warn-unused: true
99
settings:
1010
staticcheck:
@@ -77,4 +77,4 @@ formatters:
7777
- dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
7878
exclusions:
7979
generated: lax
80-
paths: [ third_party$, builtin$, examples$ ]
80+
paths: [ third_party, builtin$, examples$ ]

‎make/_shared/helm/crd.template.header.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.crds.enabled }}
1+
{{- if REPLACE_CRD_EXPRESSION }}
22
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:

‎make/_shared/helm/crds.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ endif
3939

4040
crds_dir ?= deploy/crds
4141
crds_dir_readme := $(dir $(lastword $(MAKEFILE_LIST)))/crds_dir.README.md
42+
crds_expression ?= .Values.crds.enabled
4243

4344
.PHONY: generate-crds
4445
## Generate CRD manifests.
@@ -60,6 +61,7 @@ generate-crds: | $(NEEDS_CONTROLLER-GEN) $(NEEDS_YQ)
6061
crd_name=$$($(YQ) eval '.metadata.name' $(crds_gen_temp)/$$i); \
6162
cat $(crd_template_header) > $(helm_chart_source_dir)/templates/crd-$$i; \
6263
echo "" >> $(helm_chart_source_dir)/templates/crd-$$i; \
64+
$(sed_inplace) "s/REPLACE_CRD_EXPRESSION/$(crds_expression)/g" $(helm_chart_source_dir)/templates/crd-$$i; \
6365
$(sed_inplace) "s/REPLACE_CRD_NAME/$$crd_name/g" $(helm_chart_source_dir)/templates/crd-$$i; \
6466
$(sed_inplace) "s/REPLACE_LABELS_TEMPLATE/$(helm_labels_template_name)/g" $(helm_chart_source_dir)/templates/crd-$$i; \
6567
$(YQ) -I2 '{"spec": .spec}' $(crds_gen_temp)/$$i >> $(helm_chart_source_dir)/templates/crd-$$i; \

‎make/_shared/kind/00_kind_image_versions.mk

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,16 @@
1515
# This file is auto-generated by the learn_kind_images.sh script in the makefile-modules repo.
1616
# Do not edit manually.
1717

18-
kind_image_kindversion := v0.27.0
18+
kind_image_kindversion := v0.29.0
1919

20-
kind_image_kube_1.29_amd64 := docker.io/kindest/node:v1.29.14@sha256:e7858e6394f5e834802ce573ab340a0584d8314f909cb0717e14b57f2dd97257
21-
kind_image_kube_1.29_arm64 := docker.io/kindest/node:v1.29.14@sha256:6eed9bfd0313cc3574c4613adeb7f53832cb8d9c0ca9ffa8b8221716fd96dc18
22-
kind_image_kube_1.30_amd64 := docker.io/kindest/node:v1.30.10@sha256:e382f9b891474f1c4b0b5cfcf27f8e471f1bdc1f285afe38adeec1bd5b856cfe
23-
kind_image_kube_1.30_arm64 := docker.io/kindest/node:v1.30.10@sha256:ca8e16c04ee9ebaeb9a4dd85abbe188f3893fb39bd658d6d3e639d16cf46e3da
24-
kind_image_kube_1.31_amd64 := docker.io/kindest/node:v1.31.6@sha256:37d52dc19f59394f9347b00547c3ed2d73eb301a60294b9b05fbe56fb6196517
25-
kind_image_kube_1.31_arm64 := docker.io/kindest/node:v1.31.6@sha256:4e6223faa19178922d30e7b62546c5464fdf9bc66a3df64073424a51ab44f2ab
26-
kind_image_kube_1.32_amd64 := docker.io/kindest/node:v1.32.2@sha256:a37b679ad8c1cfa7c64aca1734cc4299dc833258d6c131ed0204c8cd2bd56ff7
27-
kind_image_kube_1.32_arm64 := docker.io/kindest/node:v1.32.2@sha256:4d0e1b60f1da0d1349996a9778f8bace905189af5e05e04618eae0a155dd9f9c
28-
kind_image_kube_1.33_amd64 := docker.io/kindest/node:v1.33.0@sha256:c9ec7bf998c310c5a6c903d66c2e595fb3e2eb53fb626cd53d07a3a5499de412
29-
kind_image_kube_1.33_arm64 := docker.io/kindest/node:v1.33.0@sha256:96ae3b980f87769e0117c2a89ec74fc660b84eedb573432abd2a682af3eccc02
20+
kind_image_kube_1.30_amd64 := docker.io/kindest/node:v1.30.13@sha256:cf819926d6f5ba996f7489fa18a38156f952f5dd172395da7d83f734190e95da
21+
kind_image_kube_1.30_arm64 := docker.io/kindest/node:v1.30.13@sha256:80a284ddc8886bc12ede5ecb1e65f7a927ca15847e6a0e958e01bf903222fe87
22+
kind_image_kube_1.31_amd64 := docker.io/kindest/node:v1.31.9@sha256:48608b82ab1a6a97f735d621451525affab9c8dc91dcc2cab80ee0efcbd216da
23+
kind_image_kube_1.31_arm64 := docker.io/kindest/node:v1.31.9@sha256:ccbba29cfd3e42e4b5102426c1bf1486643a0eb461ea9617526f819c95151406
24+
kind_image_kube_1.32_amd64 := docker.io/kindest/node:v1.32.5@sha256:5d5a4d793d2a3d9727013b8b0cf6c95008c71abeb547759a273ef27e9c564984
25+
kind_image_kube_1.32_arm64 := docker.io/kindest/node:v1.32.5@sha256:0fddc6deec2a667040504053eccb8ecaa0fb2fb5e5e7f6a2e0f60294667b7412
26+
kind_image_kube_1.33_amd64 := docker.io/kindest/node:v1.33.1@sha256:14ffd6ee8a3daa20cc934ba786626b181e1797268c5465f2c299a7cf54494c77
27+
kind_image_kube_1.33_arm64 := docker.io/kindest/node:v1.33.1@sha256:cfea27c21c338b9948ea55c413b9c9e2549f3df89a89424889a1fd3ecb0c8951
3028

3129
kind_image_latest_amd64 := $(kind_image_kube_1.33_amd64)
3230
kind_image_latest_arm64 := $(kind_image_kube_1.33_arm64)

‎make/_shared/licenses/01_mod.mk

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
###################### Generate LICENSES files ######################
1616

17+
# _module_dir is the directory containing this Makefile, used to retrieve the path of the licenses.tmpl file
18+
_module_dir := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
19+
1720
# Create a go.work file so that go-licenses can discover the LICENSE file of the
1821
# other modules in the repo.
1922
#
@@ -25,16 +28,16 @@ $(licenses_go_work): $(bin_dir)/scratch
2528
$(MAKE) go-workspace
2629

2730
## Generate licenses for the golang dependencies
28-
## @category [shared] Generate/Verify
31+
## @category [shared] Generate/ Verify
2932
generate-go-licenses: #
3033
shared_generate_targets += generate-go-licenses
3134

3235
define licenses_target
33-
$1/LICENSES: $1/go.mod $(licenses_go_work) | $(NEEDS_GO-LICENSES)
36+
$1/LICENSES: $1/go.mod $(licenses_go_work) $(_module_dir)/licenses.tmpl | $(NEEDS_GO-LICENSES)
3437
cd $$(dir $$@) && \
3538
GOWORK=$(abspath $(licenses_go_work)) \
3639
GOOS=linux GOARCH=amd64 \
37-
$(GO-LICENSES) report --ignore "$$(license_ignore)" ./... > LICENSES
40+
$(GO-LICENSES) report --ignore "$$(license_ignore)" --template $(_module_dir)/licenses.tmpl ./... > LICENSES
3841

3942
generate-go-licenses: $1/LICENSES
4043
# The /LICENSE targets make sure these files exist.

‎make/_shared/licenses/licenses.tmpl

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
This LICENSES file is generated by the `licenses` module in makefile-modules[0].
2+
3+
The licenses below the "---" are determined by the go-licenses tool[1].
4+
5+
The aim of this file is to collect the licenses of all dependencies, and provide
6+
a single source of truth for licenses used by this project.
7+
8+
## For Developers
9+
10+
If CI reports that this file is out of date, you should be careful to check that the
11+
new licenses are acceptable for this project before running `make generate-go-licenses`
12+
to update this file.
13+
14+
Acceptable licenses are those allowlisted by the CNCF[2].
15+
16+
You MUST NOT add any new dependencies whose licenses are not allowlisted by the CNCF,
17+
or which do not have an explicit license exception[3].
18+
19+
## For Users
20+
21+
If this file was included in a release artifact, it is a snapshot of the licenses of all dependencies at the time of the release.
22+
23+
You can retrieve the actual license text by following these steps:
24+
25+
1. Find the dependency name in this file
26+
2. Go to the source code repository of this project, and go to the tag corresponding to this release.
27+
3. Find the exact version of the dependency in the `go.mod` file
28+
4. Search for the dependency at the correct version in the [Go package index](https://pkg.go.dev/).
29+
30+
## Links
31+
32+
[0]: https://github.com/cert-manager/makefile-modules/
33+
[1]: https://github.com/google/go-licenses
34+
[2]: https://github.com/cncf/foundation/blob/db4179134ebe7fa00b140a050c19147db808b6fa/policies-guidance/allowed-third-party-license-policy.md#cncf-allowlist-license-policy
35+
[3]: https://github.com/cncf/foundation/blob/db4179134ebe7fa00b140a050c19147db808b6fa/license-exceptions/README.md
36+
37+
---
38+
39+
{{ range . -}}
40+
{{ .Name }},{{ .LicenseName }}
41+
{{ end -}}

‎make/_shared/tools/00_mod.mk

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ tools += helm=v3.17.2
6565
# https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
6666
tools += kubectl=v1.32.3
6767
# https://github.com/kubernetes-sigs/kind/releases
68-
tools += kind=v0.27.0
68+
tools += kind=v0.29.0
6969
# https://www.vaultproject.io/downloads
7070
tools += vault=1.19.1
7171
# https://github.com/Azure/azure-workload-identity/releases
@@ -172,7 +172,7 @@ ADDITIONAL_TOOLS ?=
172172
tools += $(ADDITIONAL_TOOLS)
173173

174174
# https://go.dev/dl/
175-
VENDORED_GO_VERSION := 1.24.3
175+
VENDORED_GO_VERSION := 1.24.4
176176

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

398-
go_linux_amd64_SHA256SUM=3333f6ea53afa971e9078895eaa4ac7204a8c6b5c68c10e6bc9a33e8e391bdd8
399-
go_linux_arm64_SHA256SUM=a463cb59382bd7ae7d8f4c68846e73c4d589f223c589ac76871b66811ded7836
400-
go_darwin_amd64_SHA256SUM=13e6fe3fcf65689d77d40e633de1e31c6febbdbcb846eb05fc2434ed2213e92b
401-
go_darwin_arm64_SHA256SUM=64a3fa22142f627e78fac3018ce3d4aeace68b743eff0afda8aae0411df5e4fb
398+
go_linux_amd64_SHA256SUM=77e5da33bb72aeaef1ba4418b6fe511bc4d041873cbf82e5aa6318740df98717
399+
go_linux_arm64_SHA256SUM=d5501ee5aca0f258d5fe9bfaed401958445014495dc115f202d43d5210b45241
400+
go_darwin_amd64_SHA256SUM=69bef555e114b4a2252452b6e7049afc31fbdf2d39790b669165e89525cd3f5c
401+
go_darwin_arm64_SHA256SUM=27973684b515eaf461065054e6b572d9390c05e69ba4a423076c160165336470
402402

403403
.PRECIOUS: $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz
404404
$(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools
@@ -432,10 +432,10 @@ $(DOWNLOAD_DIR)/tools/kubectl@$(KUBECTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DO
432432
$(checkhash_script) $(outfile) $(kubectl_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
433433
chmod +x $(outfile)
434434

435-
kind_linux_amd64_SHA256SUM=a6875aaea358acf0ac07786b1a6755d08fd640f4c79b7a2e46681cc13f49a04b
436-
kind_linux_arm64_SHA256SUM=5e4507a41c69679562610b1be82ba4f80693a7826f4e9c6e39236169a3e4f9d0
437-
kind_darwin_amd64_SHA256SUM=3435134325b6b9406ccfec417b13bb46a808fc74e9a2ebb0ca31b379c8293863
438-
kind_darwin_arm64_SHA256SUM=5240ca1acb587e1d0386532dd8c3373d81f5173b5af322919fc56f0cdd646596
435+
kind_linux_amd64_SHA256SUM=c72eda46430f065fb45c5f70e7c957cc9209402ef309294821978677c8fb3284
436+
kind_linux_arm64_SHA256SUM=03d45095dbd9cc1689f179a3e5e5da24b77c2d1b257d7645abf1b4174bebcf2a
437+
kind_darwin_amd64_SHA256SUM=3eb0d4de25b854f34ea8ce8a3cbe15054fc03bc962b03e96fd10664b829fb6ed
438+
kind_darwin_arm64_SHA256SUM=314d8f1428842fd1ba2110fd0052a0f0b3ab5773ab1bdcdad1ff036e913310c9
439439

440440
.PRECIOUS: $(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH)
441441
$(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools

0 commit comments

Comments
 (0)