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

[CI] Merge self-upgrade-master into master

Author: cert-manager-prow[bot]

klone.yaml

@@ -10,46 +10,46 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/go
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/klone
     - folder_name: licenses
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/licenses
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/tools
   make/_shared_new:
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/helm

make/_shared/boilerplate/01_mod.mk

@@ -28,4 +28,4 @@ shared_verify_targets += verify-boilerplate
 generate-license:
 	cp -r $(license_base_dir)/. ./
 
-shared_generate_targets += generate-base
+shared_generate_targets += generate-license

make/_shared/licenses/01_mod.mk

@@ -68,6 +68,7 @@ oci-license-layer-$1: | $(bin_dir)/scratch $(NEEDS_GO-LICENSES)
 	cp $$(go_$1_mod_dir)/LICENSES $$(license_layer_path_$1)/licenses/LICENSES
 
 oci-build-$1: oci-license-layer-$1
+oci-build-$1__local: oci-license-layer-$1
 oci_$1_additional_layers += $$(license_layer_path_$1)
 endef
 

make/_shared/tools/00_mod.mk

@@ -707,12 +707,12 @@ endif
 non_go_tool_names := $(filter-out $(go_tool_names),$(tool_names))
 
 .PHONY: non-go-tools
-## Download and setup all Go tools
+## Download and setup all Non-Go tools
 ## @category [shared] Tools
 non-go-tools: $(non_go_tool_names:%=$(bin_dir)/tools/%)
 
 .PHONY: go-tools
-## Download and setup all Non-Go tools
+## Download and setup all Go tools
 ## NOTE: this target is also used to learn the shas of
 ## these tools (see scripts/learn_tools_shas.sh in the
 ## Makefile modules repo)