Merge pull request #403 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: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/klone
     - folder_name: licenses
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/licenses
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 01f8036da297256be41f6cc520cb248cb0f609fc
+      repo_hash: c845b0b20c6a21023f6bf4a5d8d3f346825c7480
       repo_path: modules/tools

make/_shared/kind/kind.mk

@@ -80,7 +80,7 @@ kind-cluster-clean: $(NEEDS_KIND)
 .PHONY: kind-logs
 ## Get the Kind cluster
 ## @category [shared] Kind cluster
-kind-logs: | kind-cluster $(NEEDS_KIND) $(bin_dir)/artifacts
-	rm -rf $(bin_dir)/artifacts/e2e-logs
-	mkdir -p $(bin_dir)/artifacts/e2e-logs
-	$(KIND) export logs $(bin_dir)/artifacts/e2e-logs --name=$(kind_cluster_name)
+kind-logs: | kind-cluster $(NEEDS_KIND) $(ARTIFACTS)
+	rm -rf $(ARTIFACTS)/e2e-logs
+	mkdir -p $(ARTIFACTS)/e2e-logs
+	$(KIND) export logs $(ARTIFACTS)/e2e-logs --name=$(kind_cluster_name)