Merge pull request #19 from cert-manager/self-upgrade

[CI] Merge self-upgrade into main
cert-manager · Feb 14, 2024 · 0885ae1 · 0885ae1
2 parents c19a9d1 + 0ec92c9
commit 0885ae1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 23 deletions.
diff --git a/klone.yaml b/klone.yaml
@@ -10,40 +10,40 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: ffff9fc8a6472655604ca453b48753ffd27fc840
+      repo_hash: a98099a0375460aad0718064642a0482a7cebf92
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: ffff9fc8a6472655604ca453b48753ffd27fc840
+      repo_hash: a98099a0375460aad0718064642a0482a7cebf92
       repo_path: modules/cert-manager
     - folder_name: executable
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: ffff9fc8a6472655604ca453b48753ffd27fc840
+      repo_hash: a98099a0375460aad0718064642a0482a7cebf92
       repo_path: modules/executable
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: ffff9fc8a6472655604ca453b48753ffd27fc840
+      repo_hash: a98099a0375460aad0718064642a0482a7cebf92
       repo_path: modules/generate-verify
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: ffff9fc8a6472655604ca453b48753ffd27fc840
+      repo_hash: a98099a0375460aad0718064642a0482a7cebf92
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: ffff9fc8a6472655604ca453b48753ffd27fc840
+      repo_hash: a98099a0375460aad0718064642a0482a7cebf92
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: ffff9fc8a6472655604ca453b48753ffd27fc840
+      repo_hash: a98099a0375460aad0718064642a0482a7cebf92
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: ffff9fc8a6472655604ca453b48753ffd27fc840
+      repo_hash: a98099a0375460aad0718064642a0482a7cebf92
       repo_path: modules/tools
diff --git a/make/_shared/cert-manager/00_mod.mk b/make/_shared/cert-manager/00_mod.mk
@@ -15,14 +15,14 @@
 images_amd64 ?=
 images_arm64 ?=
 
-cert_manager_version := v1.13.3
+cert_manager_version := v1.14.2
 
-images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:3490283b7a8fb4e13d9864963f94ab710fc2d669d3d53608f01608c887d4f741
-images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:c3a5ce22b8521e1a0a792152540cbbcb3ef8d509c9f3583cffb6b4e9a5b7bd60
-images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:afe9a27be1e6b3847d6483eb9a83b20fb8576ba5c314f381a90b185af022a105
-images_amd64 += quay.io/jetstack/cert-manager-ctl:$(cert_manager_version)@sha256:38f549eba224094c6810c088e5f8e257690dc882956234b8db3cad15c6253822
+images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:8c5b6bfe84dfb0127aaab3b64ffcb4a2741aa5a7aa4736cc6edeb481a5ac47cf
+images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:67ccc881f34b2d1dd3fa3d422d37bbb6934d268f08aefadb33e55cb0e515e270
+images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:dfc8027dd294d29bda073b3ceef06be4b4a0cada853b1eb170b4686e10fcce47
+images_amd64 += quay.io/jetstack/cert-manager-ctl:$(cert_manager_version)@sha256:4e603416401ba94e773ec710236a417481c8f039336895a592e3727900a3dff0
 
-images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:2ec91011538846690da6c236e51ef0221b2e3dbd45de41cce6dfa16d531a4dc4
-images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:1bdddcf53317991f01be03cffc126b10df4136556e0440836bee07a192dcc3f5
-images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:04c79086f1e3440bac8b584304fe5444d6184c5345c7e7115147ee39d4591d2e
-images_arm64 += quay.io/jetstack/cert-manager-ctl:$(cert_manager_version)@sha256:f0755d949d0facd64550d2f1e2f974ce5592a199b84772fd9ab4a97a2a19a609
+images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:01a0388d5b1f15c8ae6cfd0672558697eef2992b956690a6cf335ccebeb646c2
+images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:ffbb4641da6562c965db8e9cc28b653a89fc4bbbf22639d014bac6fc837db5e7
+images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:fdf548c247afbbf25ca8f74c5fde98f58976169504cf75c79d03ced552b93626
+images_arm64 += quay.io/jetstack/cert-manager-ctl:$(cert_manager_version)@sha256:d0ab0106c62621b85614afae26c54e89d4bc5ac222b3402f7deb8f16fa0aa852
diff --git a/make/_shared/executable/01_mod.mk b/make/_shared/executable/01_mod.mk
@@ -80,24 +80,26 @@ ARGS ?= # default empty
 ## Any Go workfile is ignored.
 ## @category [shared] Build
 $(run_targets): run-%: | $(NEEDS_GO)
+	cd $(go_$*_mod_dir) && \
 	GOWORK=off \
 	CGO_ENABLED=$(CGO_ENABLED) \
 	GOEXPERIMENT=$(GOEXPERIMENT) \
 	$(GO) run \
 		-ldflags '$(go_$*_ldflags)' \
-		$(go_$*_source_path) $(ARGS)
+		$(go_$*_main_dir) $(ARGS)
 
 ## Build the go source locally for development/ testing
 ## on the local platform. Any Go workfile is ignored.
 ## @category [shared] Build
 $(build_targets): $(bin_dir)/bin/%: FORCE | $(NEEDS_GO)
+	cd $(go_$*_mod_dir) && \
 	GOWORK=off \
 	CGO_ENABLED=$(CGO_ENABLED) \
 	GOEXPERIMENT=$(GOEXPERIMENT) \
 	$(GO) build \
 		-ldflags '$(go_$*_ldflags)' \
 		-o $@ \
-		$(go_$*_source_path)
+		$(go_$*_main_dir)
 
 define template_for_target
 	$(YQ) 'with(.builds[]; select(.id == "$(1)") | .binary = "$(1)")' | \

diff --git a/make/_shared/generate-verify/02_mod.mk b/make/_shared/generate-verify/02_mod.mk
@@ -15,17 +15,19 @@
 .PHONY: generate
 ## Generate all generate targets.
 ## @category [shared] Generate/ Verify
-generate: $(shared_generate_targets)
+generate: $$(shared_generate_targets)
 
 verify_script := $(dir $(lastword $(MAKEFILE_LIST)))/util/verify.sh
 
 # Run the supplied make target argument in a temporary workspace and diff the results.
 verify-%: FORCE
 	$(verify_script) $(MAKE) -s $*
 
+verify_generated_targets = $(shared_generate_targets:%=verify-%)
+
 .PHONY: verify
 ## Verify code and generate targets.
 ## @category [shared] Generate/ Verify
-verify: $(shared_generate_targets:%=verify-%) $(shared_verify_targets)
+verify: $$(verify_generated_targets) $$(shared_verify_targets)
 	@echo "The following targets create temporary files in the current directory, that is why they have to be run last:"
 	$(MAKE) noop $(shared_verify_targets_dirty)
diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk
@@ -95,7 +95,7 @@ TOOLS += goreleaser=v1.23.0
 # https://pkg.go.dev/github.com/anchore/syft/cmd/syft?tab=versions
 TOOLS += syft=v0.100.0
 # https://github.com/cert-manager/helm-tool
-TOOLS += helm-tool=v0.2.3
+TOOLS += helm-tool=v0.3.0
 
 # https://pkg.go.dev/k8s.io/code-generator/cmd?tab=versions
 K8S_CODEGEN_VERSION=v0.29.1
@@ -114,7 +114,7 @@ ADDITIONAL_TOOLS ?=
 TOOLS += $(ADDITIONAL_TOOLS)
 
 # https://go.dev/dl/
-VENDORED_GO_VERSION := 1.21.6
+VENDORED_GO_VERSION := 1.21.7
 
 # Print the go version which can be used in GH actions
 .PHONY: print-go-version