From 9845bcf80ecbe7ebc45a7f7e116c60d37c3fd3b8 Mon Sep 17 00:00:00 2001 From: jetstack-bot Date: Tue, 26 Mar 2024 00:53:24 +0000 Subject: [PATCH] BOT: run 'make upgrade-klone' and 'make generate' Signed-off-by: jetstack-bot --- klone.yaml | 26 +++++++++++++------------- make/_shared/oci-image/01_mod.mk | 8 ++++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/klone.yaml b/klone.yaml index 5182d384..bc14c695 100644 --- a/klone.yaml +++ b/klone.yaml @@ -10,65 +10,65 @@ targets: - folder_name: api-docs repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a + repo_hash: c51befc3fd027f556baf0070407cc17cc80273b4 repo_path: modules/api-docs - folder_name: boilerplate repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a + repo_hash: c51befc3fd027f556baf0070407cc17cc80273b4 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: c51befc3fd027f556baf0070407cc17cc80273b4 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: c51befc3fd027f556baf0070407cc17cc80273b4 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: c51befc3fd027f556baf0070407cc17cc80273b4 repo_path: modules/generate-verify - folder_name: go repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a + repo_hash: c51befc3fd027f556baf0070407cc17cc80273b4 repo_path: modules/go - folder_name: helm repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: caaef09569dec46733ee1c1e9c79198872f6ff9a + repo_hash: c51befc3fd027f556baf0070407cc17cc80273b4 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: c51befc3fd027f556baf0070407cc17cc80273b4 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: c51befc3fd027f556baf0070407cc17cc80273b4 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: c51befc3fd027f556baf0070407cc17cc80273b4 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: c51befc3fd027f556baf0070407cc17cc80273b4 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: c51befc3fd027f556baf0070407cc17cc80273b4 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: c51befc3fd027f556baf0070407cc17cc80273b4 repo_path: modules/tools diff --git a/make/_shared/oci-image/01_mod.mk b/make/_shared/oci-image/01_mod.mk index 773b55d1..cc503183 100644 --- a/make/_shared/oci-image/01_mod.mk +++ b/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) \ No newline at end of file + 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)