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

make/_shared/tools/00_mod.mk

@@ -499,7 +499,7 @@ $(DOWNLOAD_DIR)/tools/vault@$(VAULT_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLO
 	@source $(lock_script) $@; \
 		$(CURL) https://releases.hashicorp.com/vault/$(VAULT_VERSION:v%=%)/vault_$(VAULT_VERSION:v%=%)_$(HOST_OS)_$(HOST_ARCH).zip -o $(outfile).zip; \
 		$(checkhash_script) $(outfile).zip $(vault_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
-		unzip -qq -c $(outfile).zip > $(outfile); \
+		unzip -p $(outfile).zip vault > $(outfile); \
 		chmod +x $(outfile); \
 		rm -f $(outfile).zip
 
@@ -593,7 +593,7 @@ $(DOWNLOAD_DIR)/tools/protoc@$(PROTOC_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWN
 	@source $(lock_script) $@; \
 		$(CURL) https://github.com/protocolbuffers/protobuf/releases/download/$(PROTOC_VERSION)/protoc-$(PROTOC_VERSION:v%=%)-$(OS)-$(ARCH).zip -o $(outfile).zip; \
 		$(checkhash_script) $(outfile).zip $(protoc_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
-		unzip -qq -c $(outfile).zip bin/protoc > $(outfile); \
+		unzip -p $(outfile).zip bin/protoc > $(outfile); \
 		chmod +x $(outfile); \
 		rm -f $(outfile).zip