From f0e0807fa3273442ce2586fc735d30b581d3f132 Mon Sep 17 00:00:00 2001 From: jetstack-bot Date: Thu, 18 Apr 2024 00:59:01 +0000 Subject: [PATCH] BOT: run 'make upgrade-klone' and 'make generate' Signed-off-by: jetstack-bot --- klone.yaml | 18 +++++++++--------- make/_shared/tools/00_mod.mk | 16 +++++++++++----- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/klone.yaml b/klone.yaml index 2e776b6..35e9efd 100644 --- a/klone.yaml +++ b/klone.yaml @@ -10,45 +10,45 @@ targets: - folder_name: boilerplate repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429 + repo_hash: fd637b26a6d3d03ce25d022ca1c34557aadf8a45 repo_path: modules/boilerplate - folder_name: cert-manager repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429 + repo_hash: fd637b26a6d3d03ce25d022ca1c34557aadf8a45 repo_path: modules/cert-manager - folder_name: executable repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429 + repo_hash: fd637b26a6d3d03ce25d022ca1c34557aadf8a45 repo_path: modules/executable - folder_name: generate-verify repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429 + repo_hash: fd637b26a6d3d03ce25d022ca1c34557aadf8a45 repo_path: modules/generate-verify - folder_name: go repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429 + repo_hash: fd637b26a6d3d03ce25d022ca1c34557aadf8a45 repo_path: modules/go - folder_name: help repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429 + repo_hash: fd637b26a6d3d03ce25d022ca1c34557aadf8a45 repo_path: modules/help - folder_name: klone repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429 + repo_hash: fd637b26a6d3d03ce25d022ca1c34557aadf8a45 repo_path: modules/klone - folder_name: repository-base repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429 + repo_hash: fd637b26a6d3d03ce25d022ca1c34557aadf8a45 repo_path: modules/repository-base - folder_name: tools repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429 + repo_hash: fd637b26a6d3d03ce25d022ca1c34557aadf8a45 repo_path: modules/tools diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk index f05de2c..3c1546c 100644 --- a/make/_shared/tools/00_mod.mk +++ b/make/_shared/tools/00_mod.mk @@ -51,7 +51,7 @@ TOOLS += azwi=v1.2.0 # https://github.com/kyverno/kyverno/releases TOOLS += kyverno=v1.11.3 # https://github.com/mikefarah/yq/releases -TOOLS += yq=v4.40.5 +TOOLS += yq=v4.43.1 # https://github.com/ko-build/ko/releases TOOLS += ko=0.15.1 # https://github.com/protocolbuffers/protobuf/releases @@ -112,6 +112,10 @@ TOOLS += cmrel=fa10147dadc8c36718b7b08aed6d8c6418eb2 TOOLS += golangci-lint=v1.57.1 # https://pkg.go.dev/golang.org/x/vuln?tab=versions TOOLS += govulncheck=v1.0.4 +# https://pkg.go.dev/github.com/operator-framework/operator-sdk/cmd/operator-sdk?tab=versions +TOOLS += operator-sdk=v1.34.1 +# https://pkg.go.dev/github.com/cli/cli/v2?tab=versions +TOOLS += gh=v2.47.0 # https://pkg.go.dev/k8s.io/code-generator/cmd?tab=versions K8S_CODEGEN_VERSION=v0.29.1 @@ -311,6 +315,8 @@ GO_DEPENDENCIES += cmctl=github.com/cert-manager/cmctl/v2 GO_DEPENDENCIES += cmrel=github.com/cert-manager/release/cmd/cmrel GO_DEPENDENCIES += golangci-lint=github.com/golangci/golangci-lint/cmd/golangci-lint GO_DEPENDENCIES += govulncheck=golang.org/x/vuln/cmd/govulncheck +GO_DEPENDENCIES += operator-sdk=github.com/operator-framework/operator-sdk/cmd/operator-sdk +GO_DEPENDENCIES += gh=github.com/cli/cli/v2/cmd/gh ################# # go build tags # @@ -458,10 +464,10 @@ $(bin_dir)/downloaded/tools/kyverno@$(KYVERNO_VERSION)_%: | $(bin_dir)/downloade # yq # ###### -YQ_linux_amd64_SHA256SUM=0d6aaf1cf44a8d18fbc7ed0ef14f735a8df8d2e314c4cc0f0242d35c0a440c95 -YQ_linux_arm64_SHA256SUM=9431f0fa39a0af03a152d7fe19a86e42e9ff28d503ed4a70598f9261ec944a97 -YQ_darwin_amd64_SHA256SUM=7f88b959c3fd2755e77dbf5bd92780dc3626c1c00ac45d5b5134f04189a142dc -YQ_darwin_arm64_SHA256SUM=1ef0022ed6d0769d19e2d391dd731162034b0e0ba2c9b53dda039d16cec1c26a +YQ_linux_amd64_SHA256SUM=cfbbb9ba72c9402ef4ab9d8f843439693dfb380927921740e51706d90869c7e1 +YQ_linux_arm64_SHA256SUM=a8186efb079673293289f8c31ee252b0d533c7bb8b1ada6a778ddd5ec0f325b6 +YQ_darwin_amd64_SHA256SUM=fdc42b132ac460037f4f0f48caea82138772c651d91cfbb735210075ddfdbaed +YQ_darwin_arm64_SHA256SUM=9f1063d910698834cb9176593aa288471898031929138d226c2c2de9f262f8e5 $(bin_dir)/downloaded/tools/yq@$(YQ_VERSION)_%: | $(bin_dir)/downloaded/tools $(CURL) https://github.com/mikefarah/yq/releases/download/$(YQ_VERSION)/yq_$* -o $@