BOT: run 'make upgrade-klone' and 'make generate'

Signed-off-by: cert-manager-bot <cert-manager-bot@users.noreply.github.com>

klone.yaml

@@ -9,60 +9,60 @@ targets:
  - folder_name: api-docs
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+ repo_hash: 652f41ca2a789690977902191af89b423482853f
  repo_path: modules/api-docs
  - folder_name: boilerplate
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+ repo_hash: 652f41ca2a789690977902191af89b423482853f
  repo_path: modules/boilerplate
  - folder_name: cert-manager
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+ repo_hash: 652f41ca2a789690977902191af89b423482853f
  repo_path: modules/cert-manager
  - folder_name: controller-gen
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+ repo_hash: 652f41ca2a789690977902191af89b423482853f
  repo_path: modules/controller-gen
  - folder_name: generate-verify
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+ repo_hash: 652f41ca2a789690977902191af89b423482853f
  repo_path: modules/generate-verify
  - folder_name: go
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+ repo_hash: 652f41ca2a789690977902191af89b423482853f
  repo_path: modules/go
  - folder_name: help
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+ repo_hash: 652f41ca2a789690977902191af89b423482853f
  repo_path: modules/help
  - folder_name: kind
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+ repo_hash: 652f41ca2a789690977902191af89b423482853f
  repo_path: modules/kind
  - folder_name: klone
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+ repo_hash: 652f41ca2a789690977902191af89b423482853f
  repo_path: modules/klone
  - folder_name: oci-build
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+ repo_hash: 652f41ca2a789690977902191af89b423482853f
  repo_path: modules/oci-build
  - folder_name: repository-base
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+ repo_hash: 652f41ca2a789690977902191af89b423482853f
  repo_path: modules/repository-base
  - folder_name: tools
  repo_url: https://github.com/cert-manager/makefile-modules.git
  repo_ref: main
- repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+ repo_hash: 652f41ca2a789690977902191af89b423482853f
  repo_path: modules/tools

make/_shared/go/01_mod.mk

@@ -23,6 +23,41 @@ endif
 go_base_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base/
 golangci_lint_override := $(dir $(lastword $(MAKEFILE_LIST)))/.golangci.override.yaml
 
+.PHONY: go-workspace
+go-workspace: export GOWORK?=$(abspath go.work)
+## Create a go.work file in the repository root (or GOWORK)
+##
+## @category Development
+go-workspace: | $(NEEDS_GO)
+ @rm -f $(GOWORK)
+ $(GO) work init
+ @find . -name go.mod -not \( -path "./$(bin_dir)/*" -or -path "./make/_shared/*" \) \
+ | while read d; do \
+ target=$$(dirname $${d}); \
+ $(GO) work use "$${target}"; \
+ done
+
+.PHONY: go-tidy
+## Alias for `make generate-go-mod-tidy`
+## @category [shared] Generate/ Verify
+go-tidy: generate-go-mod-tidy
+
+.PHONY: generate-go-mod-tidy
+## Run `go mod tidy` on all Go modules
+## @category [shared] Generate/ Verify
+generate-go-mod-tidy: | $(NEEDS_GO)
+ @find . -name go.mod -not \( -path "./$(bin_dir)/*" -or -path "./make/_shared/*" \) \
+ | while read d; do \
+ target=$$(dirname $${d}); \
+ echo "Running 'go mod tidy' in directory '$${target}'"; \
+ pushd "$${target}" >/dev/null; \
+ $(GO) mod tidy || exit; \
+ popd >/dev/null; \
+ echo ""; \
+ done
+
+shared_generate_targets += generate-go-mod-tidy
+
 .PHONY: generate-govulncheck
 ## Generate base files in the repository
 ## @category [shared] Generate/ Verify

make/_shared/kind/00_kind_image_versions.mk

@@ -0,0 +1,22 @@
+# +skip_license_check 
+
+# This file is auto-generated by the learn_tools_shas.kind_images.sh script.
+# Do not edit manually.
+
+kind_image_kindversion := v0.23.0
+
+kind_image_kube_1.25_amd64 := docker.io/kindest/node:v1.25.16@sha256:06bd8a1c3af74cf360a524aa0c4a59922e023a1fb3526ee748609d4823f560f3
+kind_image_kube_1.25_arm64 := docker.io/kindest/node:v1.25.16@sha256:3b2127454d2e55a96e594debf450b80e87fe3273f0c7f74aa0c6be9972b8467e
+kind_image_kube_1.26_amd64 := docker.io/kindest/node:v1.26.15@sha256:ad06ec62683fe300927150377e43df432da2228261bedf8eb2442fe5956d5e58
+kind_image_kube_1.26_arm64 := docker.io/kindest/node:v1.26.15@sha256:73f30c6f49b97aa178d14483dfb3ad47a1e014a53589ec02191c3fcd1df7cb71
+kind_image_kube_1.27_amd64 := docker.io/kindest/node:v1.27.13@sha256:30c5d91cab1f2915ad61f38b6279254397c433fc745b74533daa3c1e16617326
+kind_image_kube_1.27_arm64 := docker.io/kindest/node:v1.27.13@sha256:f72a6686e25f80052f37b177215a0a353ed23718d8ee2739cc17cfdb4b8feffb
+kind_image_kube_1.28_amd64 := docker.io/kindest/node:v1.28.9@sha256:9ba4d311e7861d27b210e5960e5ce921a7c53d3c67e0545fd8a1cb9a76dfa2cb
+kind_image_kube_1.28_arm64 := docker.io/kindest/node:v1.28.9@sha256:2bbf55860a6d38e25e5db113a1035f2286c87fb4f7b1594cfc3643a17b59351f
+kind_image_kube_1.29_amd64 := docker.io/kindest/node:v1.29.4@sha256:ea40a6bd365a17f71fd3883a1d34a0791d7d6b0eb75832c6d85b6f2326827f1e
+kind_image_kube_1.29_arm64 := docker.io/kindest/node:v1.29.4@sha256:e63a7f74e80b746328fbaa70be406639d0c31c8c8cf0a3d57efdd23c64fe4bba
+kind_image_kube_1.30_amd64 := docker.io/kindest/node:v1.30.0@sha256:2af5d1b382926abcd6336312d652cd045b7cc47475844a608669c71b1fefcfbc
+kind_image_kube_1.30_arm64 := docker.io/kindest/node:v1.30.0@sha256:5e4ce6f9033bdb9ce81a7fd699c8e67cfcacfab57076058e3e6f33c32036b42b
+
+kind_image_latest_amd64 := $(kind_image_kube_1.30_amd64)
+kind_image_latest_arm64 := $(kind_image_kube_1.30_arm64)

make/_shared/kind/00_mod.mk

@@ -12,17 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+include $(dir $(lastword $(MAKEFILE_LIST)))/00_kind_image_versions.mk
+
 images_amd64 ?=
 images_arm64 ?=
 
-kind_k8s_version := v1.29.4
-
-# Goto https://github.com/kubernetes-sigs/kind/releases/tag/<KIND-VERSION> and find the
-# multi-arch digest for the image you want to use. Then use crane to get the platform
-# specific digest. For example (digest is the multi-arch digest from the release page):
-# digest="sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245"
-# crane digest --platform=linux/amd64 docker.io/kindest/node@$digest
-# crane digest --platform=linux/arm64 docker.io/kindest/node@$digest
-
-images_amd64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:ea40a6bd365a17f71fd3883a1d34a0791d7d6b0eb75832c6d85b6f2326827f1e
-images_arm64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:e63a7f74e80b746328fbaa70be406639d0c31c8c8cf0a3d57efdd23c64fe4bba
+images_amd64 += $(kind_image_latest_amd64)
+images_arm64 += $(kind_image_latest_arm64)

make/_shared/kind/kind-image-preload.mk

@@ -32,6 +32,11 @@ images_files := $(foreach image,$(images),$(subst :,+,$(image)))
 images_tar_dir := $(bin_dir)/downloaded/containers/$(HOST_ARCH)
 images_tars := $(images_files:%=$(images_tar_dir)/%.tar)
 
+# Download the images as tarballs. We must use the tag because the digest
+# will change after we docker import the image. The tag is the only way to
+# reference the image after it has been imported. Before downloading the
+# image, we check that the provided digest matches the digest of the image
+# that we are about to pull.
 $(images_tars): $(images_tar_dir)/%.tar: | $(NEEDS_CRANE)
  @$(eval image=$(subst +,:,$*))
  @$(eval image_without_digest=$(shell cut -d@ -f1 <<<"$(image)"))

make/_shared/kind/kind.mk

@@ -39,7 +39,7 @@ $(bin_dir)/scratch/cluster-check: FORCE | $(NEEDS_KIND) $(bin_dir)/scratch
  $(eval export KUBECONFIG=$(absolute_kubeconfig))
 
 kind_post_create_hook ?= 
-$(kind_kubeconfig): $(kind_cluster_config) $(bin_dir)/scratch/cluster-check | images-preload $(bin_dir)/scratch $(NEEDS_KIND) $(NEEDS_KUBECTL)
+$(kind_kubeconfig): $(kind_cluster_config) $(bin_dir)/scratch/cluster-check | images-preload $(bin_dir)/scratch $(NEEDS_KIND) $(NEEDS_KUBECTL) $(NEEDS_CTR)
  @[ -f "$(bin_dir)/scratch/cluster-check" ] && ( \
  $(KIND) delete cluster --name $(kind_cluster_name); \
  $(CTR) load -i $(docker.io/kindest/node.TAR); \

make/_shared/oci-build/00_mod.mk

@@ -16,11 +16,11 @@ oci_platforms ?= linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le
 
 # Use distroless as minimal base image to package the manager binary
 # To get latest SHA run "crane digest quay.io/jetstack/base-static:latest"
-base_image_static := quay.io/jetstack/base-static@sha256:23631cd1be9a63515cb5975e783284b209f7f9a449c02bb117f2a15413e13bfa
+base_image_static := quay.io/jetstack/base-static@sha256:262e3020adb3b09ddbf9cd8fe672330451a556c8e7024142fa205c8876c3fd75
 
 # Use custom apko-built image as minimal base image to package the manager binary
 # To get latest SHA run "crane digest quay.io/jetstack/base-static-csi:latest"
-base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:95b33b948da3790ac09f112486a1e9f10e3e705cfacc159cb7b12429b874c78f
+base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:f776795838d73f9836b134f688b4c827fcd7ed22f46d3cefcb9f57d668388fef
 
 # Utility functions
 fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not set))

make/_shared/tools/00_mod.mk

@@ -42,7 +42,13 @@ for_each_kv = $(foreach item,$2,$(eval $(call $1,$(word 1,$(subst =, ,$(item))),
 # variables: https://stackoverflow.com/questions/54726457
 export PATH := $(CURDIR)/$(bin_dir)/tools:$(PATH)
 
-CTR=docker
+CTR ?= docker
+.PHONY: __require-ctr
+ifneq ($(shell command -v $(CTR) >/dev/null || echo notfound),)
+__require-ctr:
+ @:$(error "$(CTR) (or set CTR to a docker-compatible tool)")
+endif
+NEEDS_CTR = __require-ctr
 
 tools :=
 # https://github.com/helm/helm/releases
@@ -153,7 +159,7 @@ ADDITIONAL_TOOLS ?=
 tools += $(ADDITIONAL_TOOLS)
 
 # https://go.dev/dl/
-VENDORED_GO_VERSION := 1.22.4
+VENDORED_GO_VERSION := 1.22.5
 
 # Print the go version which can be used in GH actions
 .PHONY: print-go-version
@@ -241,8 +247,13 @@ detected_vendoring := $(findstring vendor-go,$(MAKECMDGOALS))$(shell [ -f $(bin_
 export VENDOR_GO ?= $(detected_vendoring)
 
 ifeq ($(VENDOR_GO),)
+.PHONY: __require-go
+ifneq ($(shell command -v go >/dev/null || echo notfound),)
+__require-go:
+ @:$(error "$(GO) (or run 'make vendor-go')")
+endif
 GO := go
-NEEDS_GO := #
+NEEDS_GO = __require-go
 else
 export GOROOT := $(CURDIR)/$(bin_dir)/tools/goroot
 export PATH := $(CURDIR)/$(bin_dir)/tools/goroot/bin:$(PATH)
@@ -363,10 +374,10 @@ $(call for_each_kv,go_dependency,$(go_dependencies))
 # File downloads #
 ##################
 
-go_linux_amd64_SHA256SUM=ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d
-go_linux_arm64_SHA256SUM=a8e177c354d2e4a1b61020aca3562e27ea3e8f8247eca3170e3fa1e0c2f9e771
-go_darwin_amd64_SHA256SUM=c95967f50aa4ace34af0c236cbdb49a9a3e80ee2ad09d85775cb4462a5c19ed3
-go_darwin_arm64_SHA256SUM=242b78dc4c8f3d5435d28a0d2cec9b4c1aa999b601fb8aa59fb4e5a1364bf827
+go_linux_amd64_SHA256SUM=904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0
+go_linux_arm64_SHA256SUM=8d21325bfcf431be3660527c1a39d3d9ad71535fabdf5041c826e44e31642b5a
+go_darwin_amd64_SHA256SUM=95d9933cdcf45f211243c42c7705c37353cccd99f27eb4d8e2d1bf2f4165cb50
+go_darwin_arm64_SHA256SUM=4cd1bcb05be03cecb77bccd765785d5ff69d79adf4dd49790471d00c06b41133
 
 .PRECIOUS: $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz
 $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools
@@ -604,10 +615,7 @@ $(DOWNLOAD_DIR)/tools/preflight@$(PREFLIGHT_VERSION)_linux_$(HOST_ARCH): | $(DOW
 missing=$(shell (command -v curl >/dev/null || echo curl) \
  && (command -v sha256sum >/dev/null || command -v shasum >/dev/null || echo sha256sum) \
  && (command -v git >/dev/null || echo git) \
- && (command -v rsync >/dev/null || echo rsync) \
- && ([ -n "$(findstring vendor-go,$(MAKECMDGOALS),)" ] \
- || command -v $(GO) >/dev/null || echo "$(GO) (or run 'make vendor-go')") \
- && (command -v $(CTR) >/dev/null || echo "$(CTR) (or set CTR to a docker-compatible tool)"))
+ && (command -v rsync >/dev/null || echo rsync))
 ifneq ($(missing),)
 $(error Missing required tools: $(missing))
 endif
@@ -616,34 +624,3 @@ endif
 ## Download and setup all tools
 ## @category [shared] Tools
 tools: $(tools_paths)
-
-self_file := $(dir $(lastword $(MAKEFILE_LIST)))/00_mod.mk
-
-# see https://stackoverflow.com/a/53408233
-sed_inplace := sed -i''
-ifeq ($(HOST_OS),darwin)
- sed_inplace := sed -i ''
-endif
-
-# This target is used to learn the sha256sum of the tools. It is used only
-# in the makefile-modules repo, and should not be used in any other repo.
-.PHONY: tools-learn-sha
-tools-learn-sha: | $(bin_dir)
- rm -rf ./$(bin_dir)/
- mkdir -p ./$(bin_dir)/scratch/
- $(eval export LEARN_FILE=$(CURDIR)/$(bin_dir)/scratch/learn_tools_file)
- echo -n "" > "$(LEARN_FILE)"
-
- HOST_OS=linux HOST_ARCH=amd64 $(MAKE) tools
- HOST_OS=linux HOST_ARCH=arm64 $(MAKE) tools
- HOST_OS=darwin HOST_ARCH=amd64 $(MAKE) tools
- HOST_OS=darwin HOST_ARCH=arm64 $(MAKE) tools
-
- HOST_OS=linux HOST_ARCH=amd64 $(MAKE) vendor-go
- HOST_OS=linux HOST_ARCH=arm64 $(MAKE) vendor-go
- HOST_OS=darwin HOST_ARCH=amd64 $(MAKE) vendor-go
- HOST_OS=darwin HOST_ARCH=arm64 $(MAKE) vendor-go
-
- while read p; do \
- $(sed_inplace) "$$p" $(self_file); \
- done <"$(LEARN_FILE)"