From ecb2ba4d976dbc5e8c5ae441cd2a1e7ea6fff10b Mon Sep 17 00:00:00 2001 From: cert-manager-bot Date: Fri, 7 Feb 2025 00:47:00 +0000 Subject: [PATCH] BOT: run 'make upgrade-klone' and 'make generate' Signed-off-by: cert-manager-bot --- klone.yaml | 26 +++++++++++++------------- make/_shared/go/01_mod.mk | 2 +- make/_shared/helm/helm.mk | 9 ++++++--- make/_shared/oci-build/01_mod.mk | 5 ++++- make/_shared/tools/00_mod.mk | 4 ++-- make/_shared/tools/util/lock.sh | 2 +- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/klone.yaml b/klone.yaml index 934e99d3..241d7909 100644 --- a/klone.yaml +++ b/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: 5e0365e0e997012613326ab0bfd9a865d9a2615e + repo_hash: 2fca1bd493366176027430cb7cb9e2c0ef863f74 repo_path: modules/boilerplate - folder_name: cert-manager repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e + repo_hash: 2fca1bd493366176027430cb7cb9e2c0ef863f74 repo_path: modules/cert-manager - folder_name: controller-gen repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e + repo_hash: 2fca1bd493366176027430cb7cb9e2c0ef863f74 repo_path: modules/controller-gen - folder_name: generate-verify repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e + repo_hash: 2fca1bd493366176027430cb7cb9e2c0ef863f74 repo_path: modules/generate-verify - folder_name: go repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e + repo_hash: 2fca1bd493366176027430cb7cb9e2c0ef863f74 repo_path: modules/go - folder_name: helm repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e + repo_hash: 2fca1bd493366176027430cb7cb9e2c0ef863f74 repo_path: modules/helm - folder_name: help repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e + repo_hash: 2fca1bd493366176027430cb7cb9e2c0ef863f74 repo_path: modules/help - folder_name: kind repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e + repo_hash: 2fca1bd493366176027430cb7cb9e2c0ef863f74 repo_path: modules/kind - folder_name: klone repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e + repo_hash: 2fca1bd493366176027430cb7cb9e2c0ef863f74 repo_path: modules/klone - folder_name: oci-build repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e + repo_hash: 2fca1bd493366176027430cb7cb9e2c0ef863f74 repo_path: modules/oci-build - folder_name: oci-publish repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e + repo_hash: 2fca1bd493366176027430cb7cb9e2c0ef863f74 repo_path: modules/oci-publish - folder_name: repository-base repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e + repo_hash: 2fca1bd493366176027430cb7cb9e2c0ef863f74 repo_path: modules/repository-base - folder_name: tools repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 5e0365e0e997012613326ab0bfd9a865d9a2615e + repo_hash: 2fca1bd493366176027430cb7cb9e2c0ef863f74 repo_path: modules/tools diff --git a/make/_shared/go/01_mod.mk b/make/_shared/go/01_mod.mk index 47e37383..d01931d2 100644 --- a/make/_shared/go/01_mod.mk +++ b/make/_shared/go/01_mod.mk @@ -84,7 +84,7 @@ shared_generate_targets += generate-govulncheck # `verify-govulncheck` not added to the `shared_verify_targets` variable and is # not run by `make verify`, because `make verify` is run for each PR, and we do # not want new vulnerabilities in existing code to block the merging of PRs. -# Instead `make verify-govulnecheck` is intended to be run periodically by a CI job. +# Instead `make verify-govulncheck` is intended to be run periodically by a CI job. verify-govulncheck: | $(NEEDS_GOVULNCHECK) @find . -name go.mod -not \( -path "./$(bin_dir)/*" -or -path "./make/_shared/*" \) \ | while read d; do \ diff --git a/make/_shared/helm/helm.mk b/make/_shared/helm/helm.mk index 57f0efa3..20c6286b 100644 --- a/make/_shared/helm/helm.mk +++ b/make/_shared/helm/helm.mk @@ -45,11 +45,14 @@ helm_chart_name := $(notdir $(helm_chart_image_name)) helm_chart_image_registry := $(dir $(helm_chart_image_name)) helm_chart_image_tag := $(helm_chart_version) helm_chart_sources := $(shell find $(helm_chart_source_dir) -maxdepth 1 -type f) $(shell find $(helm_chart_source_dir)/templates -type f) -helm_chart_archive := $(bin_dir)/scratch/image/$(helm_chart_name)-$(helm_chart_version).tgz -helm_digest_path := $(bin_dir)/scratch/image/$(helm_chart_name)-$(helm_chart_version).digests +helm_chart_archive := $(bin_dir)/scratch/helm/$(helm_chart_name)-$(helm_chart_version).tgz +helm_digest_path := $(bin_dir)/scratch/helm/$(helm_chart_name)-$(helm_chart_version).digests helm_digest = $(shell head -1 $(helm_digest_path) 2> /dev/null) -$(helm_chart_archive): $(helm_chart_sources) | $(NEEDS_HELM) $(NEEDS_YQ) $(bin_dir)/scratch/image +$(bin_dir)/scratch/helm: + @mkdir -p $@ + +$(helm_chart_archive): $(helm_chart_sources) | $(NEEDS_HELM) $(NEEDS_YQ) $(bin_dir)/scratch/helm $(eval helm_chart_source_dir_versioned := $@.tmp) rm -rf $(helm_chart_source_dir_versioned) mkdir -p $(dir $(helm_chart_source_dir_versioned)) diff --git a/make/_shared/oci-build/01_mod.mk b/make/_shared/oci-build/01_mod.mk index d185bbf9..c419f3ca 100644 --- a/make/_shared/oci-build/01_mod.mk +++ b/make/_shared/oci-build/01_mod.mk @@ -22,7 +22,10 @@ IMAGE_TOOL := $(CURDIR)/$(bin_dir)/tools/image_tool NEEDS_IMAGE_TOOL := $(bin_dir)/tools/image_tool $(NEEDS_IMAGE_TOOL): $(wildcard $(image_tool_dir)/*.go) | $(NEEDS_GO) cd $(image_tool_dir) && GOWORK=off GOBIN=$(CURDIR)/$(dir $@) $(GO) install . - + +$(bin_dir)/scratch/image: + @mkdir -p $@ + define ko_config_target .PHONY: $(ko_config_path_$1:$(CURDIR)/%=%) $(ko_config_path_$1:$(CURDIR)/%=%): | $(NEEDS_YQ) $(bin_dir)/scratch/image diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk index 67d91bde..863a6501 100644 --- a/make/_shared/tools/00_mod.mk +++ b/make/_shared/tools/00_mod.mk @@ -21,7 +21,7 @@ endif export DOWNLOAD_DIR ?= $(CURDIR)/$(bin_dir)/downloaded export GOVENDOR_DIR ?= $(CURDIR)/$(bin_dir)/go_vendor -$(bin_dir)/scratch/image $(bin_dir)/tools $(DOWNLOAD_DIR)/tools: +$(bin_dir)/tools $(DOWNLOAD_DIR)/tools: @mkdir -p $@ checkhash_script := $(dir $(lastword $(MAKEFILE_LIST)))/util/checkhash.sh @@ -111,7 +111,7 @@ tools += oras=v1.2.0 detected_ginkgo_version := $(shell [[ -f go.mod ]] && awk '/ginkgo\/v2/ {print $$2}' go.mod || echo "v2.13.2") tools += ginkgo=$(detected_ginkgo_version) # https://pkg.go.dev/github.com/cert-manager/klone?tab=versions -tools += klone=v0.1.0 +tools += klone=v0.1.1 # https://pkg.go.dev/github.com/goreleaser/goreleaser?tab=versions tools += goreleaser=v1.26.2 # https://pkg.go.dev/github.com/anchore/syft/cmd/syft?tab=versions. We are still diff --git a/make/_shared/tools/util/lock.sh b/make/_shared/tools/util/lock.sh index 22564f7c..0b89fda7 100755 --- a/make/_shared/tools/util/lock.sh +++ b/make/_shared/tools/util/lock.sh @@ -29,7 +29,7 @@ set -o pipefail finalfile="$1" lockfile="$finalfile.lock" -# On OSX, flock is not installed, we just skip locking in that case, +# On macOS, flock is not installed, we just skip locking in that case, # this means that running verify in parallel without downloading all # tools first will not work. flock_installed=$(command -v flock >/dev/null && echo "yes" || echo "no")