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

[CI] Merge self-upgrade into main

Author: jetstack-bot

LICENSE

@@ -198,4 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

Makefile

@@ -49,8 +49,12 @@ noop: # do nothing
 # and Intel).
 HOST_OS ?= $(shell uname -s | tr A-Z a-z)
 HOST_ARCH ?= $(shell uname -m)
+
 ifeq (x86_64, $(HOST_ARCH))
 	HOST_ARCH = amd64
+else ifeq (aarch64, $(HOST_ARCH))
+	# linux reports the arm64 arch as aarch64
+	HOST_ARCH = arm64
 endif
 
 ##################################

OWNERS_ALIASES

@@ -0,0 +1,13 @@
+# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
+# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/OWNERS_ALIASES instead.
+
+aliases:
+  cm-maintainers:
+    - munnerz
+    - joshvanl
+    - wallrj
+    - jakexks
+    - maelvls
+    - irbekrm
+    - sgtcodfish
+    - inteon

klone.yaml

@@ -10,35 +10,35 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: dc8ce162c76ca7b95f80157aefa4afb9d2783b82
+      repo_hash: 2d17d1af47e0c904fb46ade54df9101751d19251
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: dc8ce162c76ca7b95f80157aefa4afb9d2783b82
+      repo_hash: 2d17d1af47e0c904fb46ade54df9101751d19251
       repo_path: modules/generate-verify
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: dc8ce162c76ca7b95f80157aefa4afb9d2783b82
+      repo_hash: 2d17d1af47e0c904fb46ade54df9101751d19251
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: dc8ce162c76ca7b95f80157aefa4afb9d2783b82
+      repo_hash: 2d17d1af47e0c904fb46ade54df9101751d19251
       repo_path: modules/klone
     - folder_name: oci-image
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: dc8ce162c76ca7b95f80157aefa4afb9d2783b82
+      repo_hash: 2d17d1af47e0c904fb46ade54df9101751d19251
       repo_path: modules/oci-image
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: dc8ce162c76ca7b95f80157aefa4afb9d2783b82
+      repo_hash: 2d17d1af47e0c904fb46ade54df9101751d19251
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: dc8ce162c76ca7b95f80157aefa4afb9d2783b82
+      repo_hash: 2d17d1af47e0c904fb46ade54df9101751d19251
       repo_path: modules/tools

make/_shared/generate-verify/00_mod.mk

@@ -12,11 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Shared targets are set by other Makefile modules.
 shared_generate_targets ?=
+shared_verify_targets ?=
 shared_verify_targets_dirty ?=
-
-# Extra targets are set by the Makefiles in the project.
-extra_generate_targets ?=
-extra_verify_targets ?=
-extra_verify_targets_dirty ?=

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) $(extra_generate_targets)
+generate: $(shared_generate_targets)
 
 verify_script := $(dir $(lastword $(MAKEFILE_LIST)))/util/verify.sh
 
@@ -26,6 +26,6 @@ verify-%: FORCE
 .PHONY: verify
 ## Verify code and generate targets.
 ## @category [shared] Generate/ Verify
-verify: $(shared_generate_targets:%=verify-%) $(extra_generate_targets:%=verify-%) $(shared_verify_targets) $(extra_verify_targets)
+verify: $(shared_generate_targets:%=verify-%) $(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) $(extra_verify_targets_dirty)
+	$(MAKE) noop $(shared_verify_targets_dirty)

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

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-oci_platforms := all
+oci_platforms := linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
@@ -54,50 +54,31 @@ $(foreach build_name,$(build_names),$(eval $(call check_variables,$(build_name))
 
 ##########################################
 
+RELEASE_DRYRUN ?= false
+
 CGO_ENABLED ?= 0
+GOEXPERIMENT ?=  # empty by default
 
-build_targets := $(build_names:%=$(bin_dir)/bin/%)
-run_targets := $(build_names:%=run-%)
 oci_build_targets := $(build_names:%=oci-build-%)
 oci_push_targets := $(build_names:%=oci-push-%)
 oci_maybe_push_targets := $(build_names:%=oci-maybe-push-%)
 oci_load_targets := $(build_names:%=oci-load-%)
 
 image_tool_dir := $(dir $(lastword $(MAKEFILE_LIST)))/image_tool/
 
-$(bin_dir)/bin:
-	mkdir -p $@
-
-## Build manager binary.
-## @category [shared] Build
-$(build_targets): $(bin_dir)/bin/%: FORCE | $(NEEDS_GO) $(bin_dir)/bin
-	CGO_ENABLED=$(CGO_ENABLED) \
-	$(GO) build \
-		-ldflags '$(go_$*_ldflags)' \
-		-o $@ \
-		$(go_$*_source_path)
-
-.PHONY: $(run_targets)
-ARGS ?= # default empty
-## Run a controller from your host.
-## @category [shared] Build
-$(run_targets): run-%: | $(NEEDS_GO)
-	$(GO) run \
-		-ldflags '$(go_$*_ldflags)' \
-		$(go_$*_source_path) $(ARGS)
-
 .PHONY: $(oci_build_targets)
-## Build the oci image.
+## Build the OCI image.
 ## @category [shared] Build
 $(oci_build_targets): oci-build-%: | $(NEEDS_KO) $(NEEDS_GO) $(NEEDS_YQ) $(bin_dir)/scratch/image
 	$(eval oci_layout_path := $(bin_dir)/scratch/image/oci-layout-$*.$(oci_$*_image_tag))
 	rm -rf $(CURDIR)/$(oci_layout_path)
-	
+
 	echo '{}' | \
 		$(YQ) '.defaultBaseImage = "$(oci_$*_base_image)"' | \
 		$(YQ) '.builds[0].id = "$*"' | \
 		$(YQ) '.builds[0].main = "$(go_$*_source_path)"' | \
 		$(YQ) '.builds[0].env[0] = "CGO_ENABLED={{.Env.CGO_ENABLED}}"' | \
+		$(YQ) '.builds[0].env[1] = "GOEXPERIMENT={{.Env.GOEXPERIMENT}}"' | \
 		$(YQ) '.builds[0].ldflags[0] = "-s"' | \
 		$(YQ) '.builds[0].ldflags[1] = "-w"' | \
 		$(YQ) '.builds[0].ldflags[2] = "{{.Env.LDFLAGS}}"' \
@@ -109,6 +90,7 @@ $(oci_build_targets): oci-build-%: | $(NEEDS_KO) $(NEEDS_GO) $(NEEDS_YQ) $(bin_d
 	KO_GO_PATH=$(GO) \
 	LDFLAGS="$(go_$*_ldflags)" \
 	CGO_ENABLED=$(CGO_ENABLED) \
+	GOEXPERIMENT=$(GOEXPERIMENT) \
 	$(KO) build $(go_$*_source_path) \
 		--platform=$(oci_platforms) \
 		--oci-layout-path=$(CURDIR)/$(oci_layout_path) \
@@ -122,7 +104,7 @@ $(oci_build_targets): oci-build-%: | $(NEEDS_KO) $(NEEDS_GO) $(NEEDS_YQ) $(bin_d
 		> $(CURDIR)/$(oci_layout_path).digests
 
 .PHONY: $(oci_push_targets)
-## Push docker image.
+## Build and push OCI image.
 ## If the tag already exists, this target will overwrite it.
 ## If an identical image was already built before, we will add a new tag to it, but we will not sign it again.
 ## Expected pushed images:
@@ -133,6 +115,7 @@ $(oci_push_targets): oci-push-%: oci-build-% | $(NEEDS_CRANE) $(NEEDS_COSIGN) $(
 	$(eval oci_layout_path := $(bin_dir)/scratch/image/oci-layout-$*.$(oci_$*_image_tag))
 	$(eval image_ref := $(shell head -1 $(CURDIR)/$(oci_layout_path).digests))
 
+ifneq ($(RELEASE_DRYRUN),true)
 	if $(CRANE) image digest $(oci_$*_image_name)@$(image_ref) >/dev/null 2>&1; then \
 		echo "Digest already exists, will retag without resigning."; \
 		$(CRANE) push "$(oci_layout_path)" "$(oci_$*_image_name):$(oci_$*_image_tag)"; \
@@ -141,12 +124,10 @@ $(oci_push_targets): oci-push-%: oci-build-% | $(NEEDS_CRANE) $(NEEDS_COSIGN) $(
 		$(CRANE) push "$(oci_layout_path)" "$(oci_$*_image_name):$(oci_$*_image_tag)"; \
 		$(COSIGN) sign --yes=true "$(oci_$*_image_name)@$(image_ref)"; \
 	fi
+endif
 
 .PHONY: $(oci_maybe_push_targets)
-## Push docker image if tag does not already exist.
-## Expected pushed images:
-## - :v1.2.3, @sha256:0000001
-## - :v1.2.3.sig, :sha256-0000001.sig
+## Run 'make oci-push-...' if tag does not already exist in registry.
 ## @category [shared] Build
 $(oci_maybe_push_targets): oci-maybe-push-%: | $(NEEDS_CRANE)
 	if $(CRANE) manifest digest $(oci_$*_image_name):$(oci_$*_image_tag) > /dev/null 2>&1; then \
@@ -157,7 +138,8 @@ $(oci_maybe_push_targets): oci-maybe-push-%: | $(NEEDS_CRANE)
 	fi
 
 .PHONY: $(oci_load_targets)
-## Load docker image.
+## Build OCI image for the local architecture and load
+## it into the $(kind_cluster_name) kind cluster.
 ## @category [shared] Build
 $(oci_load_targets): oci_platforms := ""
 $(oci_load_targets): oci-load-%: oci-build-% | kind-cluster $(NEEDS_KIND)