Merge pull request #222 from cert-manager/self-upgrade

[CI] Merge self-upgrade into main

Author: jetstack-bot

klone.yaml

@@ -10,55 +10,55 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
+      repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
+      repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
+      repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
+      repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
       repo_path: modules/generate-verify
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
+      repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
+      repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
+      repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
+      repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
       repo_path: modules/klone
     - folder_name: oci-image
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
+      repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
       repo_path: modules/oci-image
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
+      repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a
+      repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
       repo_path: modules/tools

make/_shared/oci-image/01_mod.mk

@@ -170,11 +170,11 @@ $(oci_push_targets): oci-push-%: oci-build-% | $(NEEDS_CRANE) $(NEEDS_COSIGN) $(
 ifneq ($(RELEASE_DRYRUN),true)
 	if $(CRANE) image digest $(oci_$*_image_name)@$(call oci_digest,$*) >/dev/null 2>&1; then \
 		echo "Digest already exists, will retag without resigning."; \
-		$(call oci_push_command,$*); \
+		$(call oci_push_command,$*) \
 	else \
 		echo "Digest does not yet exist, pushing image and signing."; \
-		$(call oci_push_command,$*); \
-		$(call oci_sign_command,$*); \
+		$(call oci_push_command,$*) \
+		$(call oci_sign_command,$*) \
 	fi
 endif
 
@@ -219,4 +219,4 @@ $(oci_load_targets): oci-load-%: docker-tarball-% | kind-cluster $(NEEDS_KIND)
 .PHONY: $(docker_tarball_targets)
 $(docker_tarball_targets): oci_platforms := ""
 $(docker_tarball_targets): docker-tarball-%: oci-build-%
-	cd $(image_tool_dir) && GOWORK=off $(GO) run . convert-to-docker-tar $(CURDIR)/$(oci_layout_path_$*) $(docker_tarball_path_$*) $(oci_$*_image_name_development):$(oci_$*_image_tag)
+	cd $(image_tool_dir) && GOWORK=off $(GO) run . convert-to-docker-tar $(CURDIR)/$(oci_layout_path_$*) $(docker_tarball_path_$*) $(oci_$*_image_name_development):$(oci_$*_image_tag)