From 31193f2a5a800a1e89aed899cb62d7e6b14629ec Mon Sep 17 00:00:00 2001 From: jetstack-bot Date: Tue, 6 Feb 2024 00:34:43 +0000 Subject: [PATCH] BOT: run 'make upgrade-klone' and 'make generate' Signed-off-by: jetstack-bot --- klone.yaml | 22 +++++++++++----------- make/_shared/generate-verify/02_mod.mk | 6 ++++-- make/_shared/helm/deploy.mk | 3 +++ make/_shared/kind/kind.mk | 3 ++- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/klone.yaml b/klone.yaml index f743b066..74993109 100644 --- a/klone.yaml +++ b/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: 44ed034ae2fbd3192fb4373977eed94c9f252854 + repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 repo_path: modules/boilerplate - folder_name: cert-manager repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 44ed034ae2fbd3192fb4373977eed94c9f252854 + repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 repo_path: modules/cert-manager - folder_name: controller-gen repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 44ed034ae2fbd3192fb4373977eed94c9f252854 + repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 repo_path: modules/controller-gen - folder_name: generate-verify repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 44ed034ae2fbd3192fb4373977eed94c9f252854 + repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 repo_path: modules/generate-verify - folder_name: helm repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 44ed034ae2fbd3192fb4373977eed94c9f252854 + repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 repo_path: modules/helm - folder_name: help repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 44ed034ae2fbd3192fb4373977eed94c9f252854 + repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 repo_path: modules/help - folder_name: kind repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 44ed034ae2fbd3192fb4373977eed94c9f252854 + repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 repo_path: modules/kind - folder_name: klone repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 44ed034ae2fbd3192fb4373977eed94c9f252854 + repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 repo_path: modules/klone - folder_name: oci-image repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 44ed034ae2fbd3192fb4373977eed94c9f252854 + repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 repo_path: modules/oci-image - folder_name: repository-base repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 44ed034ae2fbd3192fb4373977eed94c9f252854 + repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 repo_path: modules/repository-base - folder_name: tools repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 44ed034ae2fbd3192fb4373977eed94c9f252854 + repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 repo_path: modules/tools diff --git a/make/_shared/generate-verify/02_mod.mk b/make/_shared/generate-verify/02_mod.mk index e456e1f4..2f2daacd 100644 --- a/make/_shared/generate-verify/02_mod.mk +++ b/make/_shared/generate-verify/02_mod.mk @@ -15,7 +15,7 @@ .PHONY: generate ## Generate all generate targets. ## @category [shared] Generate/ Verify -generate: $(shared_generate_targets) +generate: $$(shared_generate_targets) verify_script := $(dir $(lastword $(MAKEFILE_LIST)))/util/verify.sh @@ -23,9 +23,11 @@ verify_script := $(dir $(lastword $(MAKEFILE_LIST)))/util/verify.sh verify-%: FORCE $(verify_script) $(MAKE) -s $* +verify_generated_targets = $(shared_generate_targets:%=verify-%) + .PHONY: verify ## Verify code and generate targets. ## @category [shared] Generate/ Verify -verify: $(shared_generate_targets:%=verify-%) $(shared_verify_targets) +verify: $$(verify_generated_targets) $$(shared_verify_targets) @echo "The following targets create temporary files in the current directory, that is why they have to be run last:" $(MAKE) noop $(shared_verify_targets_dirty) diff --git a/make/_shared/helm/deploy.mk b/make/_shared/helm/deploy.mk index 2d02723e..8bc6ebb4 100644 --- a/make/_shared/helm/deploy.mk +++ b/make/_shared/helm/deploy.mk @@ -20,6 +20,9 @@ ifndef deploy_namespace $(error deploy_namespace is not set) endif +# Install options allows the user configuration of extra flags +INSTALL_OPTIONS ?= + ########################################## .PHONY: install diff --git a/make/_shared/kind/kind.mk b/make/_shared/kind/kind.mk index 6ad5ecea..c5734208 100644 --- a/make/_shared/kind/kind.mk +++ b/make/_shared/kind/kind.mk @@ -27,7 +27,7 @@ endif ########################################## kind_kubeconfig := $(bin_dir)/scratch/kube.config -export KUBECONFIG := $(CURDIR)/$(kind_kubeconfig) +absolute_kubeconfig := $(CURDIR)/$(kind_kubeconfig) $(bin_dir)/scratch/cluster-check: FORCE | $(NEEDS_KIND) $(bin_dir)/scratch @if ! $(KIND) get clusters -q | grep -q "^$(kind_cluster_name)\$$"; then \ @@ -36,6 +36,7 @@ $(bin_dir)/scratch/cluster-check: FORCE | $(NEEDS_KIND) $(bin_dir)/scratch else \ echo "✅ existing cluster $(kind_cluster_name) found"; \ fi + $(eval export KUBECONFIG=$(absolute_kubeconfig)) kind_post_create_hook ?= $(kind_kubeconfig): $(kind_cluster_config) $(bin_dir)/scratch/cluster-check | images-preload $(bin_dir)/scratch $(NEEDS_KIND) $(NEEDS_KUBECTL)