Merge pull request #5 from inteon/upgrade_oci_module

Upgrade oci module

Author: jetstack-bot

klone.yaml

@@ -10,40 +10,40 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
+      repo_hash: 1539e50a1ea7d7c3f97ea37b3f9557971295acc1
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
+      repo_hash: 1539e50a1ea7d7c3f97ea37b3f9557971295acc1
       repo_path: modules/cert-manager
     - folder_name: executable
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
+      repo_hash: 1539e50a1ea7d7c3f97ea37b3f9557971295acc1
       repo_path: modules/executable
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
+      repo_hash: 1539e50a1ea7d7c3f97ea37b3f9557971295acc1
       repo_path: modules/generate-verify
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
+      repo_hash: 1539e50a1ea7d7c3f97ea37b3f9557971295acc1
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
+      repo_hash: 1539e50a1ea7d7c3f97ea37b3f9557971295acc1
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
+      repo_hash: 1539e50a1ea7d7c3f97ea37b3f9557971295acc1
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
+      repo_hash: 1539e50a1ea7d7c3f97ea37b3f9557971295acc1
       repo_path: modules/tools

make/00_mod.mk

@@ -17,14 +17,16 @@ repo_name := github.com/cert-manager/cmctl/v2
 exe_build_names := cmctl kubectl_cert-manager
 gorelease_file := .goreleaser.yml
 
-go_cmctl_source_path := main.go
+go_cmctl_main_dir := .
+go_cmctl_mod_dir := .
 go_cmctl_ldflags := \
 	-X $(repo_name)/pkg/build.name=cmctl \
 	-X $(repo_name)/pkg/build/commands.registerCompletion=true \
 	-X github.com/cert-manager/cert-manager/pkg/util.AppVersion=$(VERSION) \
 	-X github.com/cert-manager/cert-manager/pkg/util.AppGitCommit=$(GITCOMMIT)
 
-go_kubectl_cert-manager_source_path := main.go
+go_kubectl_cert-manager_main_dir := .
+go_kubectl_cert-manager_mod_dir := .
 go_kubectl_cert-manager_ldflags := \
 	-X $(repo_name)/pkg/build.name=kubectl \
 	-X $(repo_name)/pkg/build/commands.registerCompletion=false \

make/02_mod.mk

@@ -25,7 +25,6 @@ dryrun-release: release
 ## Publish all release artifacts (image + helm chart)
 ## @category [shared] Release
 release: | $(NEEDS_CRANE) $(bin_dir)/scratch
-	$(MAKE) oci-push-cmctl
 	$(MAKE) exe-publish
 
 	@echo "Release complete!"

make/_shared/executable/01_mod.mk

@@ -22,6 +22,7 @@ ifndef build_names
 ifndef exe_build_names
 $(error build_names and exe_build_names are not set)
 endif
+build_names := # empty
 endif
 
 all_exe_build_names := $(sort $(build_names) $(exe_build_names))
@@ -30,7 +31,28 @@ fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not
 
 define check_variables
 $(call fatal_if_undefined,go_$1_ldflags)
-$(call fatal_if_undefined,go_$1_source_path)
+$(call fatal_if_undefined,go_$1_main_dir)
+$(call fatal_if_undefined,go_$1_mod_dir)
+
+ifneq ($(go_$1_main_dir:.%=.),.)
+$$(error go_$1_main_dir "$(go_$1_main_dir)" should be a directory path that DOES start with ".")
+endif
+ifeq ($(go_$1_main_dir:%/=/),/)
+$$(error go_$1_main_dir "$(go_$1_main_dir)" should be a directory path that DOES NOT end with "/")
+endif
+ifeq ($(go_$1_main_dir:%.go=.go),.go)
+$$(error go_$1_main_dir "$(go_$1_main_dir)" should be a directory path that DOES NOT end with ".go")
+endif
+ifneq ($(go_$1_mod_dir:\.%=\.),.)
+$$(error go_$1_mod_dir "$(go_$1_mod_dir)" should be a directory path that DOES start with ".")
+endif
+ifeq ($(go_$1_mod_dir:%/=/),/)
+$$(error go_$1_mod_dir "$(go_$1_mod_dir)" should be a directory path that DOES NOT end with "/")
+endif
+ifeq ($(go_$1_mod_dir:%.go=.go),.go)
+$$(error go_$1_mod_dir "$(go_$1_mod_dir)" should be a directory path that DOES NOT end with ".go")
+endif
+
 endef
 
 $(foreach build_name,$(all_exe_build_names),$(eval $(call check_variables,$(build_name))))
@@ -55,18 +77,21 @@ $(bin_dir)/bin:
 .PHONY: $(run_targets)
 ARGS ?= # default empty
 ## Directly run the go source locally.
+## Any Go workfile is ignored.
 ## @category [shared] Build
 $(run_targets): run-%: | $(NEEDS_GO)
+	GOWORK=off \
 	CGO_ENABLED=$(CGO_ENABLED) \
 	GOEXPERIMENT=$(GOEXPERIMENT) \
 	$(GO) run \
 		-ldflags '$(go_$*_ldflags)' \
 		$(go_$*_source_path) $(ARGS)
 
 ## Build the go source locally for development/ testing
-## on the local platform.
+## on the local platform. Any Go workfile is ignored.
 ## @category [shared] Build
 $(build_targets): $(bin_dir)/bin/%: FORCE | $(NEEDS_GO)
+	GOWORK=off \
 	CGO_ENABLED=$(CGO_ENABLED) \
 	GOEXPERIMENT=$(GOEXPERIMENT) \
 	$(GO) build \
@@ -76,7 +101,8 @@ $(build_targets): $(bin_dir)/bin/%: FORCE | $(NEEDS_GO)
 
 define template_for_target
 	$(YQ) 'with(.builds[]; select(.id == "$(1)") | .binary = "$(1)")' | \
-	$(YQ) 'with(.builds[]; select(.id == "$(1)") | .main = "$(go_$(1)_source_path)")' | \
+	$(YQ) 'with(.builds[]; select(.id == "$(1)") | .main = "$(go_$(1)_main_dir)")' | \
+	$(YQ) 'with(.builds[]; select(.id == "$(1)") | .dir = "$(go_$(1)_mod_dir)")' | \
 	$(YQ) 'with(.builds[]; select(.id == "$(1)") | .env[0] = "CGO_ENABLED={{.Env.CGO_ENABLED}}")' | \
 	$(YQ) 'with(.builds[]; select(.id == "$(1)") | .env[1] = "GOEXPERIMENT={{.Env.GOEXPERIMENT}}")' | \
 	$(YQ) 'with(.builds[]; select(.id == "$(1)") | .mod_timestamp = "{{.Env.SOURCE_DATE_EPOCH}}")' | \
@@ -106,6 +132,7 @@ ifeq ($(RELEASE_DRYRUN),true)
 	$(eval extra_args := $(extra_args) --skip=announce,publish,validate,sign)
 endif
 
+	GOWORK=off \
 	SOURCE_DATE_EPOCH=$(GITEPOCH) \
 	CGO_ENABLED=$(CGO_ENABLED) \
 	GOEXPERIMENT=$(GOEXPERIMENT) \

make/_shared/tools/00_mod.mk

@@ -282,7 +282,7 @@ GO_DEPENDENCIES += helm-tool=github.com/cert-manager/helm-tool
 
 define go_dependency
 $$(bin_dir)/downloaded/tools/$1@$($(call UC,$1)_VERSION)_%: | $$(NEEDS_GO) $$(bin_dir)/downloaded/tools
-	GOBIN=$$(CURDIR)/$$(dir $$@) $$(GO) install $2@$($(call UC,$1)_VERSION)
+	GOWORK=off GOBIN=$$(CURDIR)/$$(dir $$@) $$(GO) install $2@$($(call UC,$1)_VERSION)
 	@mv $$(CURDIR)/$$(dir $$@)/$1 $$@
 endef