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

[CI] Merge self-upgrade-main into main

Author: cert-manager-prow[bot]

klone.yaml

@@ -9,60 +9,60 @@ targets:
     - folder_name: api-docs
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/api-docs
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/go
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/oci-build
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: b28a6c7b188e2c3c6540779d4f036db4d54de9f1
+      repo_hash: 737c51c1bf36dea15a7ef2bc5c070d09845530a2
       repo_path: modules/tools

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

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-oci_platforms ?= linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le
-
 # Use distroless as minimal base image to package the manager binary
 # To get latest SHA run "crane digest quay.io/jetstack/base-static:latest"
 base_image_static := quay.io/jetstack/base-static@sha256:1da2e7de36c9d7a1931d765e8054a3c9fe7ed5126bacf728bb7429e923386146
@@ -32,6 +30,7 @@ $(call fatal_if_undefined,build_names)
 # Set default config values
 CGO_ENABLED ?= 0
 GOEXPERIMENT ?=  # empty by default
+oci_platforms ?= linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le
 
 # Default variables per build_names entry
 #
@@ -40,6 +39,7 @@ define default_per_build_variables
 go_$1_cgo_enabled ?= $(CGO_ENABLED)
 go_$1_goexperiment ?= $(GOEXPERIMENT)
 go_$1_flags ?= -tags=
+oci_$1_platforms ?= $(oci_platforms)
 oci_$1_additional_layers ?= 
 oci_$1_linux_capabilities ?= 
 oci_$1_build_args ?= 
@@ -105,17 +105,23 @@ ifneq ($(words $(oci_$1_image_name_development)),1)
 $$(error oci_$1_image_name_development "$(oci_$1_image_name_development)" should be a single image name)
 endif
 
+# Validate that the build name does not end in __local
+ifeq ($(1:%__local=__local),__local)
+$$(error build_name "$1" SHOULD NOT end in __local)
+endif
 endef
 
 $(foreach build_name,$(build_names),$(eval $(call check_per_build_variables,$(build_name))))
 
 # Create variables holding targets
 #
 # We create the following targets for each $(build_names)
-# - oci-build-$(build_name) = build the oci directory
+# - oci-build-$(build_name) = build the oci directory (multi-arch)
+# - oci-build-$(build_name)__local = build the oci directory (local arch: linux/$(HOST_ARCH))
 # - 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
 oci_build_targets := $(build_names:%=oci-build-%)
+oci_build_targets += $(build_names:%=oci-build-%__local)
 oci_load_targets := $(build_names:%=oci-load-%)
 docker_tarball_targets := $(build_names:%=docker-tarball-%)
 

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

@@ -17,47 +17,54 @@ $(bin_dir)/scratch/image:
 
 .PHONY: $(oci_build_targets)
 ## Build the OCI image.
+## - oci-build-$(build_name) = build the oci directory (multi-arch)
+## - oci-build-$(build_name)__local = build the oci directory (local arch: linux/$(HOST_ARCH))
 ## @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_$*)
+	$(eval a := $(patsubst %__local,%,$*))
+	$(eval is_local := $(if $(findstring $a__local,$*),true))
+	$(eval layout_path := $(if $(is_local),$(oci_layout_path_$a).local,$(oci_layout_path_$a)))
+	$(eval digest_path := $(if $(is_local),$(oci_digest_path_$a).local,$(oci_digest_path_$a)))
+
+	rm -rf $(CURDIR)/$(layout_path)
 
 	echo '{}' | \
-		$(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) '.defaultBaseImage = "$(oci_$a_base_image)"' | \
+		$(YQ) '.builds[0].id = "$a"' | \
+		$(YQ) '.builds[0].dir = "$(go_$a_mod_dir)"' | \
+		$(YQ) '.builds[0].main = "$(go_$a_main_dir)"' | \
+		$(YQ) '.builds[0].env[0] = "CGO_ENABLED=$(go_$a_cgo_enabled)"' | \
+		$(YQ) '.builds[0].env[1] = "GOEXPERIMENT=$(go_$a_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_$*_flags)"' | \
-		$(YQ) '.builds[0].linux_capabilities = "$(oci_$*_linux_capabilities)"' \
-		> $(CURDIR)/$(oci_layout_path_$*).ko_config.yaml
+		$(YQ) '.builds[0].flags[0] = "$(go_$a_flags)"' | \
+		$(YQ) '.builds[0].linux_capabilities = "$(oci_$a_linux_capabilities)"' \
+		> $(CURDIR)/$(layout_path).ko_config.yaml
 
 	GOWORK=off \
-	KO_DOCKER_REPO=$(oci_$*_image_name_development) \
+	KO_DOCKER_REPO=$(oci_$a_image_name_development) \
 	KOCACHE=$(CURDIR)/$(bin_dir)/scratch/image/ko_cache \
-	KO_CONFIG_PATH=$(CURDIR)/$(oci_layout_path_$*).ko_config.yaml \
+	KO_CONFIG_PATH=$(CURDIR)/$(layout_path).ko_config.yaml \
 	SOURCE_DATE_EPOCH=$(GITEPOCH) \
 	KO_GO_PATH=$(GO) \
-	LDFLAGS="$(go_$*_ldflags)" \
-	$(KO) build $(go_$*_mod_dir)/$(go_$*_main_dir) \
-		--platform=$(oci_platforms) \
-		$(oci_$*_build_args) \
-		--oci-layout-path=$(oci_layout_path_$*) \
-		--sbom-dir=$(CURDIR)/$(oci_layout_path_$*).sbom \
+	LDFLAGS="$(go_$a_ldflags)" \
+	$(KO) build $(go_$a_mod_dir)/$(go_$a_main_dir) \
+		--platform=$(if $(is_local),linux/$(HOST_ARCH),$(oci_$a_platforms)) \
+		$(oci_$a_build_args) \
+		--oci-layout-path=$(layout_path) \
+		--sbom-dir=$(CURDIR)/$(layout_path).sbom \
 		--sbom=spdx \
 		--push=false \
 		--bare
 
 	$(IMAGE-TOOL) append-layers \
-		$(CURDIR)/$(oci_layout_path_$*) \
-		$(oci_$*_additional_layers)
+		$(CURDIR)/$(layout_path) \
+		$(oci_$a_additional_layers)
 
 	$(IMAGE-TOOL) list-digests \
-		$(CURDIR)/$(oci_layout_path_$*) \
-		> $(oci_digest_path_$*)
+		$(CURDIR)/$(layout_path) \
+		> $(digest_path)
 
 # Only include the oci-load target if kind is provided by the kind makefile-module
 ifdef kind_cluster_name
@@ -72,6 +79,5 @@ endif
 ## Build Docker tarball image for the local architecture
 ## @category [shared] Build
 .PHONY: $(docker_tarball_targets)
-$(docker_tarball_targets): oci_platforms := "linux/$(HOST_ARCH)"
-$(docker_tarball_targets): docker-tarball-%: oci-build-% | $(NEEDS_GO) $(NEEDS_IMAGE-TOOL)
-	$(IMAGE-TOOL) convert-to-docker-tar $(CURDIR)/$(oci_layout_path_$*) $(docker_tarball_path_$*) $(oci_$*_image_name_development):$(oci_$*_image_tag)
+$(docker_tarball_targets): docker-tarball-%: oci-build-%__local | $(NEEDS_GO) $(NEEDS_IMAGE-TOOL)
+	$(IMAGE-TOOL) convert-to-docker-tar $(CURDIR)/$(oci_layout_path_$*).local $(docker_tarball_path_$*) $(oci_$*_image_name_development):$(oci_$*_image_tag)