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

[CI] Merge self-upgrade into main
cert-manager · Feb 6, 2024 · 5f90fd2 · 5f90fd2
2 parents 2271cb3 + 31193f2
commit 5f90fd2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git 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
@@ -15,17 +15,19 @@
 .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
 
 # Run the supplied make target argument in a temporary workspace and diff the results.
 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
@@ -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
@@ -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)