Merge pull request #7123 from cert-manager/self-upgrade-master

[CI] Merge self-upgrade-master into master

klone.yaml

@@ -10,35 +10,35 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+      repo_hash: cb3ebf9f13251b918c162335069ad7a64f839438
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+      repo_hash: cb3ebf9f13251b918c162335069ad7a64f839438
       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: cb3ebf9f13251b918c162335069ad7a64f839438
       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: cb3ebf9f13251b918c162335069ad7a64f839438
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+      repo_hash: cb3ebf9f13251b918c162335069ad7a64f839438
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: adb1dd2ffdb07aae9aea40c201633c7ae59714d8
+      repo_hash: cb3ebf9f13251b918c162335069ad7a64f839438
       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: cb3ebf9f13251b918c162335069ad7a64f839438
       repo_path: modules/tools

make/02_mod.mk

@@ -36,29 +36,8 @@ include make/e2e-setup.mk
 include make/scan.mk
 include make/ko.mk
 
-.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
-	$(GO) work use . ./cmd/acmesolver ./cmd/cainjector ./cmd/controller ./cmd/startupapicheck ./cmd/webhook ./test/integration ./test/e2e
-
 .PHONY: tidy
-## Run "go mod tidy" on each module in this repo
-##
-## @category Development
-tidy: | $(NEEDS_GO)
-	$(GO) mod tidy
-	cd cmd/acmesolver && $(GO) mod tidy
-	cd cmd/cainjector && $(GO) mod tidy
-	cd cmd/controller && $(GO) mod tidy
-	cd cmd/startupapicheck && $(GO) mod tidy
-	cd cmd/webhook && $(GO) mod tidy
-	cd test/integration && $(GO) mod tidy
-	cd test/e2e && $(GO) mod tidy
+tidy: generate-go-mod-tidy
 
 .PHONY: update-base-images
 update-base-images: | $(NEEDS_CRANE)

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