Skip to content

Commit 6b3b365

Browse files
maelvlsmaelvls
committed
make upgrade-klone
1 parent 4666773 commit 6b3b365

File tree

15 files changed

+153
-132
lines changed

15 files changed

+153
-132
lines changed

‎klone.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,50 +10,50 @@ targets:
1010
- folder_name: generate-verify
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
13+
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
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: 2547c81aaa2ff4aeefdda53988191b5cbe929985
18+
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
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: 2547c81aaa2ff4aeefdda53988191b5cbe929985
23+
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
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: 2547c81aaa2ff4aeefdda53988191b5cbe929985
28+
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
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: 2547c81aaa2ff4aeefdda53988191b5cbe929985
33+
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
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: 2547c81aaa2ff4aeefdda53988191b5cbe929985
38+
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
3939
repo_path: modules/klone
4040
- folder_name: oci-build
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
43+
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
4444
repo_path: modules/oci-build
4545
- folder_name: oci-publish
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
48+
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
4949
repo_path: modules/oci-publish
5050
- folder_name: repository-base
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
53+
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
5454
repo_path: modules/repository-base
5555
- folder_name: tools
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
58+
repo_hash: 3cf24410bca85e4b3f39f71882c8655b2d34464c
5959
repo_path: modules/tools

‎make/_shared/generate-verify/02_mod.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
## Generate all generate targets.
1717
## @category [shared] Generate/ Verify
1818
generate: $$(shared_generate_targets)
19-
@echo "The following targets cannot be run simultaniously with each other or other generate scripts:"
19+
@echo "The following targets cannot be run simultaneously with each other or other generate scripts:"
2020
$(foreach TARGET,$(shared_generate_targets_dirty), $(MAKE) $(TARGET))
2121

2222
verify_script := $(dir $(lastword $(MAKEFILE_LIST)))/util/verify.sh

‎make/_shared/generate-verify/util/verify.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ if ! diff \
5858
then
5959
echo
6060
echo "Project '${projectdir}' is out of date."
61-
echo "Please run '${*}'"
61+
echo "Please run '${*}' or apply the above diffs"
6262
exit 1
6363
fi

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ linters:
77
- bidichk
88
- bodyclose
99
- contextcheck
10+
- copyloopvar
1011
- decorder
1112
- dogsled
1213
- dupword
1314
- durationcheck
1415
- errcheck
1516
- errchkjson
1617
- errname
17-
- execinquery
1818
- exhaustive
19-
- exportloopref
2019
- forbidigo
2120
- gci
2221
- ginkgolinter

‎make/_shared/go/01_mod.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ shared_verify_targets_dirty += verify-golangci-lint
126126
## @category [shared] Generate/ Verify
127127
fix-golangci-lint: | $(NEEDS_GOLANGCI-LINT) $(NEEDS_YQ) $(NEEDS_GCI) $(bin_dir)/scratch
128128
$(GCI) write \
129+
--skip-generated \
130+
--skip-vendor \
129131
-s "standard" \
130132
-s "default" \
131133
-s "prefix($(repo_name))" \

‎make/_shared/helm/01_mod.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
ifndef helm_dont_include_crds
1516
include $(dir $(lastword $(MAKEFILE_LIST)))/crds.mk
17+
endif
18+
1619
include $(dir $(lastword $(MAKEFILE_LIST)))/helm.mk
1720
include $(dir $(lastword $(MAKEFILE_LIST)))/deploy.mk

‎make/_shared/helm/crds.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ endif
4242
## @category [shared] Generate/ Verify
4343
generate-crds: | $(NEEDS_CONTROLLER-GEN) $(NEEDS_YQ)
4444
$(eval crds_gen_temp := $(bin_dir)/scratch/crds)
45-
$(eval directories := $(shell ls -d */ | grep -v -e '_bin' -e 'make' $(shell git check-ignore -- * | sed 's/^/-e /')))
45+
$(eval directories := $(shell ls -d */ | grep -v -e 'make' $(shell git check-ignore -- * | sed 's/^/-e /')))
4646

4747
rm -rf $(crds_gen_temp)
4848
mkdir -p $(crds_gen_temp)

‎make/_shared/helm/helm.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ ifndef helm_chart_version
3232
$(error helm_chart_version is not set)
3333
endif
3434

35+
ifndef helm_chart_app_version
36+
# Default to the same as the chart version
37+
helm_chart_app_version = $(helm_chart_version)
38+
endif
39+
3540
ifndef helm_values_mutation_function
3641
$(error helm_values_mutation_function is not set)
3742
endif
@@ -59,7 +64,7 @@ $(helm_chart_archive): $(helm_chart_sources) | $(NEEDS_HELM) $(NEEDS_YQ) $(bin_d
5964

6065
mkdir -p $(dir $@)
6166
$(HELM) package $(helm_chart_source_dir_versioned) \
62-
--app-version $(helm_chart_version) \
67+
--app-version $(helm_chart_app_version) \
6368
--version $(helm_chart_version) \
6469
--destination $(dir $@)
6570

‎make/_shared/kind/00_kind_image_versions.mk

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,22 @@
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.23.0
18+
kind_image_kindversion := v0.24.0
1919

20-
kind_image_kube_1.25_amd64 := docker.io/kindest/node:v1.25.16@sha256:06bd8a1c3af74cf360a524aa0c4a59922e023a1fb3526ee748609d4823f560f3
21-
kind_image_kube_1.25_arm64 := docker.io/kindest/node:v1.25.16@sha256:3b2127454d2e55a96e594debf450b80e87fe3273f0c7f74aa0c6be9972b8467e
22-
kind_image_kube_1.26_amd64 := docker.io/kindest/node:v1.26.15@sha256:ad06ec62683fe300927150377e43df432da2228261bedf8eb2442fe5956d5e58
23-
kind_image_kube_1.26_arm64 := docker.io/kindest/node:v1.26.15@sha256:73f30c6f49b97aa178d14483dfb3ad47a1e014a53589ec02191c3fcd1df7cb71
24-
kind_image_kube_1.27_amd64 := docker.io/kindest/node:v1.27.13@sha256:30c5d91cab1f2915ad61f38b6279254397c433fc745b74533daa3c1e16617326
25-
kind_image_kube_1.27_arm64 := docker.io/kindest/node:v1.27.13@sha256:f72a6686e25f80052f37b177215a0a353ed23718d8ee2739cc17cfdb4b8feffb
26-
kind_image_kube_1.28_amd64 := docker.io/kindest/node:v1.28.9@sha256:9ba4d311e7861d27b210e5960e5ce921a7c53d3c67e0545fd8a1cb9a76dfa2cb
27-
kind_image_kube_1.28_arm64 := docker.io/kindest/node:v1.28.9@sha256:2bbf55860a6d38e25e5db113a1035f2286c87fb4f7b1594cfc3643a17b59351f
28-
kind_image_kube_1.29_amd64 := docker.io/kindest/node:v1.29.4@sha256:ea40a6bd365a17f71fd3883a1d34a0791d7d6b0eb75832c6d85b6f2326827f1e
29-
kind_image_kube_1.29_arm64 := docker.io/kindest/node:v1.29.4@sha256:e63a7f74e80b746328fbaa70be406639d0c31c8c8cf0a3d57efdd23c64fe4bba
30-
kind_image_kube_1.30_amd64 := docker.io/kindest/node:v1.30.0@sha256:2af5d1b382926abcd6336312d652cd045b7cc47475844a608669c71b1fefcfbc
31-
kind_image_kube_1.30_arm64 := docker.io/kindest/node:v1.30.0@sha256:5e4ce6f9033bdb9ce81a7fd699c8e67cfcacfab57076058e3e6f33c32036b42b
20+
kind_image_kube_1.25_amd64 := docker.io/kindest/node:v1.25.16@sha256:fedeb7ebef9794b3acbe656901f87231fb33381e0f586033ed18d2587bd9b73d
21+
kind_image_kube_1.25_arm64 := docker.io/kindest/node:v1.25.16@sha256:f16a9c7caa65d394176ce2e628eb371d5af8b7bd913e88c826a357cadde698c7
22+
kind_image_kube_1.26_amd64 := docker.io/kindest/node:v1.26.15@sha256:290e3765fbabbeb2ddcde36bdf3e8452166dc94a4c970a25c10290ebd480ca6e
23+
kind_image_kube_1.26_arm64 := docker.io/kindest/node:v1.26.15@sha256:7b34bc4f381a4aa0bd81239bbc2af5f44d933c11b3510da85f13cf8b2a34c9fd
24+
kind_image_kube_1.27_amd64 := docker.io/kindest/node:v1.27.17@sha256:84aff282b523c3943c374d95807e1e748ccd43432dce614d6c7a148a7028fb01
25+
kind_image_kube_1.27_arm64 := docker.io/kindest/node:v1.27.17@sha256:2c6de687b6ea20b385c0b18b85d4e55e214882b3cbde857974ccfe010f4a90a9
26+
kind_image_kube_1.28_amd64 := docker.io/kindest/node:v1.28.13@sha256:d97df9fff48099bf9a94c92fdc39adde65bec2aa1d011f84233b96172c1003c9
27+
kind_image_kube_1.28_arm64 := docker.io/kindest/node:v1.28.13@sha256:ddef612bb93a9aa3a989f9d3d4e01c0a7c4d866a4b949264146c182cd202d738
28+
kind_image_kube_1.29_amd64 := docker.io/kindest/node:v1.29.8@sha256:b69a150f9951ef41158ec76de381a920df2be3582fd16fc19cf4757eef0dded9
29+
kind_image_kube_1.29_arm64 := docker.io/kindest/node:v1.29.8@sha256:0d5623800cf6290edbc1007ca8a33a5f7e2ad92b41dc7022b4d20a66447db23c
30+
kind_image_kube_1.30_amd64 := docker.io/kindest/node:v1.30.4@sha256:34cb98a38a57a3357fde925a41d61232bbbbeb411b45a25c0d766635d6c3b975
31+
kind_image_kube_1.30_arm64 := docker.io/kindest/node:v1.30.4@sha256:6becd630a18e77730e31f3833f0b129bbcc9c09ee49c3b88429b3c1fdc30bfc4
32+
kind_image_kube_1.31_amd64 := docker.io/kindest/node:v1.31.0@sha256:919a65376fd11b67df05caa2e60802ad5de2fca250c9fe0c55b0dce5c9591af3
33+
kind_image_kube_1.31_arm64 := docker.io/kindest/node:v1.31.0@sha256:0ccfb11dc66eae4abc20c30ee95687bab51de8aeb04e325e1c49af0890646548
3234

33-
kind_image_latest_amd64 := $(kind_image_kube_1.30_amd64)
34-
kind_image_latest_arm64 := $(kind_image_kube_1.30_arm64)
35+
kind_image_latest_amd64 := $(kind_image_kube_1.31_amd64)
36+
kind_image_latest_arm64 := $(kind_image_kube_1.31_arm64)

‎make/_shared/kind/kind.mk

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,16 @@ $(kind_kubeconfig): $(kind_cluster_config) $(bin_dir)/scratch/cluster-check | im
5555
$(KIND) get kubeconfig --name $(kind_cluster_name) > $@
5656

5757
.PHONY: kind-cluster
58+
kind-cluster: $(kind_kubeconfig)
59+
60+
.PHONY: kind-cluster-load
5861
## Create Kind cluster and wait for nodes to be ready
62+
## Load the kubeconfig into the default location so that
63+
## it can be easily queried by kubectl. This target is
64+
## meant to be used directly, NOT as a dependency.
65+
## Use `kind-cluster` as a dependency instead.
5966
## @category [shared] Kind cluster
60-
kind-cluster: $(kind_kubeconfig) | $(NEEDS_KUBECTL)
67+
kind-cluster-load: kind-cluster | $(NEEDS_KUBECTL)
6168
mkdir -p ~/.kube
6269
KUBECONFIG=~/.kube/config:$(kind_kubeconfig) $(KUBECTL) config view --flatten > ~/.kube/config
6370
$(KUBECTL) config use-context kind-$(kind_cluster_name)

0 commit comments

Comments
 (0)