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

[CI] Merge self-upgrade-main into main

Author: cert-manager-prow[bot]

klone.yaml

@@ -10,65 +10,65 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
+      repo_hash: f9604e0f1728c59dad941c433a81672080edaf84
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
+      repo_hash: f9604e0f1728c59dad941c433a81672080edaf84
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
+      repo_hash: f9604e0f1728c59dad941c433a81672080edaf84
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
+      repo_hash: f9604e0f1728c59dad941c433a81672080edaf84
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
+      repo_hash: f9604e0f1728c59dad941c433a81672080edaf84
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
+      repo_hash: f9604e0f1728c59dad941c433a81672080edaf84
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
+      repo_hash: f9604e0f1728c59dad941c433a81672080edaf84
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
+      repo_hash: f9604e0f1728c59dad941c433a81672080edaf84
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
+      repo_hash: f9604e0f1728c59dad941c433a81672080edaf84
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
+      repo_hash: f9604e0f1728c59dad941c433a81672080edaf84
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
+      repo_hash: f9604e0f1728c59dad941c433a81672080edaf84
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
+      repo_hash: f9604e0f1728c59dad941c433a81672080edaf84
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2547c81aaa2ff4aeefdda53988191b5cbe929985
+      repo_hash: f9604e0f1728c59dad941c433a81672080edaf84
       repo_path: modules/tools

make/_shared/kind/kind.mk

@@ -55,9 +55,16 @@ $(kind_kubeconfig): $(kind_cluster_config) $(bin_dir)/scratch/cluster-check | im
 	$(KIND) get kubeconfig --name $(kind_cluster_name) > $@
 
 .PHONY: kind-cluster
+kind-cluster: $(kind_kubeconfig)
+
+.PHONY: kind-cluster-load
 ## Create Kind cluster and wait for nodes to be ready
+## Load the kubeconfig into the default location so that
+## it can be easily queried by kubectl. This target is
+## meant to be used directly, NOT as a dependency.
+## Use `kind-cluster` as a dependency instead.
 ## @category [shared] Kind cluster
-kind-cluster: $(kind_kubeconfig) | $(NEEDS_KUBECTL)
+kind-cluster-load: kind-cluster | $(NEEDS_KUBECTL)
 	mkdir -p ~/.kube
 	KUBECONFIG=~/.kube/config:$(kind_kubeconfig) $(KUBECTL) config view --flatten > ~/.kube/config
 	$(KUBECTL) config use-context kind-$(kind_cluster_name)

make/_shared/tools/00_mod.mk

@@ -615,7 +615,8 @@ $(DOWNLOAD_DIR)/tools/preflight@$(PREFLIGHT_VERSION)_linux_$(HOST_ARCH): | $(DOW
 missing=$(shell (command -v curl >/dev/null || echo curl) \
              && (command -v sha256sum >/dev/null || command -v shasum >/dev/null || echo sha256sum) \
              && (command -v git >/dev/null || echo git) \
-             && (command -v rsync >/dev/null || echo rsync))
+             && (command -v rsync >/dev/null || echo rsync) \
+             && (command -v bash >/dev/null || echo bash))
 ifneq ($(missing),)
 $(error Missing required tools: $(missing))
 endif