Merge pull request #392 from cert-manager/self-upgrade-main

[CI] Merge self-upgrade-main into main

Author: cert-manager-prow[bot]

klone.yaml

@@ -10,70 +10,70 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/klone
     - folder_name: licenses
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/licenses
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 6d5cc44645b0b9f0d2e23f0a28f981f942085fea
+      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
       repo_path: modules/tools

make/_shared/boilerplate/01_mod.mk

@@ -28,4 +28,4 @@ shared_verify_targets += verify-boilerplate
 generate-license:
 	cp -r $(license_base_dir)/. ./
 
-shared_generate_targets += generate-base
+shared_generate_targets += generate-license

make/_shared/oci-build/00_mod.mk

@@ -27,7 +27,6 @@ fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not
 fatal_if_deprecated_defined = $(if $(findstring undefined,$(origin $1)),,$(error $1 is deprecated, use $2 instead))
 
 # Validate globals that are required
-$(call fatal_if_undefined,bin_dir)
 $(call fatal_if_undefined,build_names)
 
 # Set default config values
@@ -98,7 +97,7 @@ ifeq ($(wildcard $(go_$1_mod_dir)/go.mod),)
 $$(error go_$1_mod_dir "$(go_$1_mod_dir)" does not contain a go.mod file)
 endif
 ifeq ($(wildcard $(go_$1_mod_dir)/$(go_$1_main_dir)/main.go),)
-$$(error go_$1_main_dir "$(go_$1_mod_dir)" does not contain a main.go file)
+$$(error go_$1_main_dir "$(go_$1_mod_dir)/$(go_$1_main_dir)" does not contain a main.go file)
 endif
 
 # Validate the config required to build OCI images
@@ -116,19 +115,15 @@ $(foreach build_name,$(build_names),$(eval $(call check_per_build_variables,$(bu
 # - oci-build-$(build_name) = build the oci directory
 # - oci-load-$(build_name) = load the image into docker using the oci_$(build_name)_image_name_development variable
 # - docker-tarball-$(build_name) = build a "docker load" compatible tarball of the image
-# - ko-config-$(build_name) = generate "ko" config for a given build
 oci_build_targets := $(build_names:%=oci-build-%)
 oci_load_targets := $(build_names:%=oci-load-%)
 docker_tarball_targets := $(build_names:%=docker-tarball-%)
-ko_config_targets := $(build_names:%=ko-config-%)
 
 # Derive config based on user config
 # 
 # - oci_layout_path_$(build_name) = path that the OCI image will be saved in OCI layout directory format
 # - oci_digest_path_$(build_name) = path to the file that will contain the digests
-# - ko_config_path_$(build_name) = path to the ko config file
 # - docker_tarball_path_$(build_name) = path that the docker tarball that the docker-tarball-$(build_name) will produce
 $(foreach build_name,$(build_names),$(eval oci_layout_path_$(build_name) := $(bin_dir)/scratch/image/oci-layout-$(build_name)))
 $(foreach build_name,$(build_names),$(eval oci_digest_path_$(build_name) := $(CURDIR)/$(oci_layout_path_$(build_name)).digests))
-$(foreach build_name,$(build_names),$(eval ko_config_path_$(build_name) := $(CURDIR)/$(oci_layout_path_$(build_name)).ko_config.yaml))
 $(foreach build_name,$(build_names),$(eval docker_tarball_path_$(build_name) := $(CURDIR)/$(oci_layout_path_$(build_name)).docker.tar))

make/_shared/oci-build/01_mod.mk

@@ -15,38 +15,30 @@
 $(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
+.PHONY: $(oci_build_targets)
+## Build the OCI image.
+## @category [shared] Build
+$(oci_build_targets): oci-build-%: | $(NEEDS_KO) $(NEEDS_GO) $(NEEDS_YQ) $(NEEDS_IMAGE-TOOL) $(bin_dir)/scratch/image
+	rm -rf $(CURDIR)/$(oci_layout_path_$*)
+
 	echo '{}' | \
-		$(YQ) '.defaultBaseImage = "$(oci_$1_base_image)"' | \
-		$(YQ) '.builds[0].id = "$1"' | \
-		$(YQ) '.builds[0].dir = "$(go_$1_mod_dir)"' | \
-		$(YQ) '.builds[0].main = "$(go_$1_main_dir)"' | \
-		$(YQ) '.builds[0].env[0] = "CGO_ENABLED=$(go_$1_cgo_enabled)"' | \
-		$(YQ) '.builds[0].env[1] = "GOEXPERIMENT=$(go_$1_goexperiment)"' | \
+		$(YQ) '.defaultBaseImage = "$(oci_$*_base_image)"' | \
+		$(YQ) '.builds[0].id = "$*"' | \
+		$(YQ) '.builds[0].dir = "$(go_$*_mod_dir)"' | \
+		$(YQ) '.builds[0].main = "$(go_$*_main_dir)"' | \
+		$(YQ) '.builds[0].env[0] = "CGO_ENABLED=$(go_$*_cgo_enabled)"' | \
+		$(YQ) '.builds[0].env[1] = "GOEXPERIMENT=$(go_$*_goexperiment)"' | \
 		$(YQ) '.builds[0].ldflags[0] = "-s"' | \
 		$(YQ) '.builds[0].ldflags[1] = "-w"' | \
 		$(YQ) '.builds[0].ldflags[2] = "{{.Env.LDFLAGS}}"' | \
-		$(YQ) '.builds[0].flags[0] = "$(go_$1_flags)"' | \
-		$(YQ) '.builds[0].linux_capabilities = "$(oci_$1_linux_capabilities)"' \
-		> $(CURDIR)/$(oci_layout_path_$1).ko_config.yaml
-
-ko-config-$1: $(ko_config_path_$1:$(CURDIR)/%=%)
-endef
+		$(YQ) '.builds[0].flags[0] = "$(go_$*_flags)"' | \
+		$(YQ) '.builds[0].linux_capabilities = "$(oci_$*_linux_capabilities)"' \
+		> $(CURDIR)/$(oci_layout_path_$*).ko_config.yaml
 
-.PHONY: $(ko_config_targets)
-$(foreach build_name,$(build_names),$(eval $(call ko_config_target,$(build_name))))
-
-.PHONY: $(oci_build_targets)
-## Build the OCI image.
-## @category [shared] Build
-$(oci_build_targets): oci-build-%: ko-config-% | $(NEEDS_KO) $(NEEDS_GO) $(NEEDS_YQ) $(NEEDS_IMAGE-TOOL) $(bin_dir)/scratch/image
-	rm -rf $(CURDIR)/$(oci_layout_path_$*)
 	GOWORK=off \
 	KO_DOCKER_REPO=$(oci_$*_image_name_development) \
 	KOCACHE=$(CURDIR)/$(bin_dir)/scratch/image/ko_cache \
-	KO_CONFIG_PATH=$(ko_config_path_$*) \
+	KO_CONFIG_PATH=$(CURDIR)/$(oci_layout_path_$*).ko_config.yaml \
 	SOURCE_DATE_EPOCH=$(GITEPOCH) \
 	KO_GO_PATH=$(GO) \
 	LDFLAGS="$(go_$*_ldflags)" \

make/_shared/tools/00_mod.mk

@@ -707,12 +707,12 @@ endif
 non_go_tool_names := $(filter-out $(go_tool_names),$(tool_names))
 
 .PHONY: non-go-tools
-## Download and setup all Go tools
+## Download and setup all Non-Go tools
 ## @category [shared] Tools
 non-go-tools: $(non_go_tool_names:%=$(bin_dir)/tools/%)
 
 .PHONY: go-tools
-## Download and setup all Non-Go tools
+## Download and setup all Go tools
 ## NOTE: this target is also used to learn the shas of
 ## these tools (see scripts/learn_tools_shas.sh in the
 ## Makefile modules repo)