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

[CI] Merge self-upgrade into main

Author: jetstack-bot

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: 2d17d1af47e0c904fb46ade54df9101751d19251
+      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2d17d1af47e0c904fb46ade54df9101751d19251
+      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
       repo_path: modules/generate-verify
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2d17d1af47e0c904fb46ade54df9101751d19251
+      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2d17d1af47e0c904fb46ade54df9101751d19251
+      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
       repo_path: modules/klone
     - folder_name: oci-image
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2d17d1af47e0c904fb46ade54df9101751d19251
+      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
       repo_path: modules/oci-image
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2d17d1af47e0c904fb46ade54df9101751d19251
+      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2d17d1af47e0c904fb46ade54df9101751d19251
+      repo_hash: 06bb8b339f2033e196cba881bc0fb724e1315cc5
       repo_path: modules/tools

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

@@ -84,6 +84,7 @@ $(oci_build_targets): oci-build-%: | $(NEEDS_KO) $(NEEDS_GO) $(NEEDS_YQ) $(bin_d
 		$(YQ) '.builds[0].ldflags[2] = "{{.Env.LDFLAGS}}"' \
 		> $(CURDIR)/$(oci_layout_path).ko_config.yaml
 
+	KO_DOCKER_REPO=$(oci_$*_image_name_development) \
 	KOCACHE=$(bin_dir)/scratch/image/ko_cache \
 	KO_CONFIG_PATH=$(CURDIR)/$(oci_layout_path).ko_config.yaml \
 	SOURCE_DATE_EPOCH=$(GITEPOCH) \
@@ -93,11 +94,11 @@ $(oci_build_targets): oci-build-%: | $(NEEDS_KO) $(NEEDS_GO) $(NEEDS_YQ) $(bin_d
 	GOEXPERIMENT=$(GOEXPERIMENT) \
 	$(KO) build $(go_$*_source_path) \
 		--platform=$(oci_platforms) \
-		--oci-layout-path=$(CURDIR)/$(oci_layout_path) \
+		--oci-layout-path=$(oci_layout_path) \
 		--sbom-dir=$(CURDIR)/$(oci_layout_path).sbom \
 		--sbom=spdx \
 		--push=false \
-		--base-import-paths
+		--bare
 
 	cd $(image_tool_dir) && $(GO) run . list-digests \
 		$(CURDIR)/$(oci_layout_path) \

make/_shared/tools/util/checkhash.sh

@@ -21,16 +21,36 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 # This script takes the hash of its first argument and verifies it against the
 # hex hash given in its second argument
 
-SHASUM=$("${SCRIPT_DIR}/hash.sh" "$1")
+function usage_and_exit() {
+	echo "usage: $0 <path-to-target> <expected-hash>"
+	echo "or: LEARN_FILE=<path-to-learn-file> $0 <path-to-target> <old-hash>"
+	exit 1
+}
+
+HASH_TARGET=${1:-}
+EXPECTED_HASH=${2:-}
+
+if [[ -z $HASH_TARGET ]]; then
+	usage_and_exit
+fi
+
+if [[ -z $EXPECTED_HASH ]]; then
+	usage_and_exit
+fi
+
+SHASUM=$("${SCRIPT_DIR}/hash.sh" "$HASH_TARGET")
+
+if [[ "$SHASUM" == "$EXPECTED_HASH" ]]; then
+	exit 0
+fi
 
 # When running 'make learn-sha-tools', we don't want this script to fail.
 # Instead we log what sha values are wrong, so the make.mk file can be updated.
-if [ "$SHASUM" != "$2" ] && [ "${LEARN_FILE:-}" != "" ]; then
-	echo "s/$2/$SHASUM/g" >> "${LEARN_FILE:-}"
+
+if [ "${LEARN_FILE:-}" != "" ]; then
+	echo "s/$EXPECTED_HASH/$SHASUM/g" >> "${LEARN_FILE:-}"
 	exit 0
 fi
 
-if [ "$SHASUM" != "$2"  ]; then
-	echo "invalid checksum for \"$1\": wanted \"$2\" but got \"$SHASUM\""
-	exit 1
-fi
+echo "invalid checksum for \"$HASH_TARGET\": wanted \"$EXPECTED_HASH\" but got \"$SHASUM\""
+exit 1