Merge pull request #627 from cert-manager/self-upgrade-main

[CI] Merge self-upgrade-main into main

Author: cert-manager-prow[bot]

klone.yaml

@@ -10,70 +10,70 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/klone
     - folder_name: licenses
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/licenses
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 295c82e6491dda09283630c8f9d3cf90ec8b21a1
+      repo_hash: 2e0c0b8f4e6aa1869a695a26c452b61970f30532
       repo_path: modules/tools

make/_shared/licenses/01_mod.mk

@@ -16,14 +16,14 @@
 
 ## Generate licenses for the golang dependencies
 ## @category [shared] Generate/Verify
-generate-go-licences: #
-shared_generate_targets += generate-go-licences
+generate-go-licenses: #
+shared_generate_targets += generate-go-licenses
 
 define license_generate
 $1/LICENSES: $1/go.mod | $(NEEDS_GO-LICENSES)
 	cd $$(dir $$@) && GOOS=linux GOARCH=amd64 $(GO-LICENSES) report --ignore "$$(license_ignore)" ./... > LICENSES
 
-generate-go-licences: $1/LICENSES
+generate-go-licenses: $1/LICENSES
 endef
 
 # Calculate all the go.mod directories, build targets may share go.mod dirs so
@@ -45,7 +45,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_$1_additional_layers += $(license_layer_path_$1)
+oci_$1_additional_layers += $$(license_layer_path_$1)
 endef
 
 $(foreach build_name,$(build_names),$(eval $(call license_layer,$(build_name))))