Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Merge self-upgrade into main #65

Merged
merged 1 commit into from
Jan 13, 2024
Merged

[CI] Merge self-upgrade into main #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions klone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,55 +10,55 @@ targets:
- folder_name: boilerplate
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
repo_hash: 9f0a38db1bbd0ac468c2b12d6f61251b2f4452d9
repo_path: modules/boilerplate
- folder_name: cert-manager
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
repo_hash: 9f0a38db1bbd0ac468c2b12d6f61251b2f4452d9
repo_path: modules/cert-manager
- folder_name: controller-gen
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
repo_hash: 9f0a38db1bbd0ac468c2b12d6f61251b2f4452d9
repo_path: modules/controller-gen
- folder_name: generate-verify
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
repo_hash: 9f0a38db1bbd0ac468c2b12d6f61251b2f4452d9
repo_path: modules/generate-verify
- folder_name: helm
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
repo_hash: 9f0a38db1bbd0ac468c2b12d6f61251b2f4452d9
repo_path: modules/helm
- folder_name: help
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
repo_hash: 9f0a38db1bbd0ac468c2b12d6f61251b2f4452d9
repo_path: modules/help
- folder_name: kind
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
repo_hash: 9f0a38db1bbd0ac468c2b12d6f61251b2f4452d9
repo_path: modules/kind
- folder_name: klone
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
repo_hash: 9f0a38db1bbd0ac468c2b12d6f61251b2f4452d9
repo_path: modules/klone
- folder_name: oci-image
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
repo_hash: 9f0a38db1bbd0ac468c2b12d6f61251b2f4452d9
repo_path: modules/oci-image
- folder_name: repository-base
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
repo_hash: 9f0a38db1bbd0ac468c2b12d6f61251b2f4452d9
repo_path: modules/repository-base
- folder_name: tools
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 57b8956c0f7dcb24c829e96590881595db95d583
repo_hash: 9f0a38db1bbd0ac468c2b12d6f61251b2f4452d9
repo_path: modules/tools
2 changes: 1 addition & 1 deletion make/_shared/cert-manager/00_mod.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)
images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:292facf28fd4f0db074fed12437669eef9c0ab8c1b9812d2c91e42b4a7448a36
images_amd64 += quay.io/jetstack/cert-manager-ctl:$(cert_manager_version)@sha256:5c985c4ebd8da6592cbe0249936f7513c0527488d754198699b3be9389b8b587

images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:3a218da3db0b05bf487729b07374662b73805a44e6568a2661bba659b22110b2
images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:f2adb86c11c305dcb78607cdf86fa232e657d196f82d0592799aebbfea22dec8
images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:118b985b0f0051ee9c428a3736c47bea92c3d8e7cb7c6eda881f7ecd4430cbed
images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:0195441dc0f7f81e7514e6497bf68171bc54ef8481efc5fa0efe51892bd28c36
images_arm64 += quay.io/jetstack/cert-manager-ctl:$(cert_manager_version)@sha256:f376994ae17c519b12dd59c406a0abf8c6265c5f0c57431510eee15eaa40e4eb
2 changes: 1 addition & 1 deletion make/_shared/help/help.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PURPLE=$(tput setaf 125)
EMPTYLINE_REGEX="^\s*$"
DOCBLOCK_REGEX="^##\s*(.*)$"
CATEGORY_REGEX="^##\s*@category\s*(.*)$"
TARGET_REGEX="^([a-zA-Z0-9%_\/%-\$\(\)]+):.*$"
TARGET_REGEX="^([a-zA-Z0-9\_\/\%\$\-\(\)]+):.*$"

EMPTY_ITEM="<start-category><end-category><start-target><end-target><start-comment><end-comment>"

Expand Down
6 changes: 4 additions & 2 deletions make/_shared/kind/00_mod.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,7 @@
images_amd64 ?=
images_arm64 ?=

images_amd64 += docker.io/kindest/node:v1.27.3@sha256:9dd3392d79af1b084671b05bcf65b21de476256ad1dcc853d9f3b10b4ac52dde
images_arm64 += docker.io/kindest/node:v1.27.3@sha256:de0b3dfe848ccf07e24f4278eaf93edb857b6231b39773f46b36a2b1a6543ae9
kind_version := v1.27.3

images_amd64 += docker.io/kindest/node:$(kind_version)@sha256:9dd3392d79af1b084671b05bcf65b21de476256ad1dcc853d9f3b10b4ac52dde
images_arm64 += docker.io/kindest/node:$(kind_version)@sha256:de0b3dfe848ccf07e24f4278eaf93edb857b6231b39773f46b36a2b1a6543ae9
2 changes: 1 addition & 1 deletion make/_shared/kind/kind-image-preload.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $(images_tars): $(images_tar_dir)/%.tar: | $(NEEDS_CRANE)
@$(eval image_without_digest=$(shell cut -d@ -f1 <<<"$(image)"))
@$(eval digest=$(subst $(image_without_digest)@,,$(image)))
@mkdir -p $(dir $@)
diff <(echo "$(digest) -" | cut -d: -f2) <($(CRANE) manifest $(image) | sha256sum)
diff <(echo "$(digest) -" | cut -d: -f2) <($(CRANE) manifest --platform=linux/$(HOST_ARCH) $(image_without_digest) | sha256sum)
$(CRANE) pull $(image_without_digest) $@ --platform=linux/$(HOST_ARCH)

images_tar_envs := $(images_files:%=env-%)
Expand Down
6 changes: 3 additions & 3 deletions make/_shared/tools/00_mod.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,13 +472,13 @@ tools: $(TOOLS_PATHS) $(K8S_CODEGEN_TOOLS_PATHS)

self_file := $(dir $(lastword $(MAKEFILE_LIST)))/00_mod.mk

# This target is used to learn the sha256sum of the tools. It is used only
# in the makefile-modules repo, and should not be used in any other repo.
.PHONY: tools-learn-sha
## re-download all tools and learn the sha values, useful after upgrading
## @category [shared] Tools
tools-learn-sha: | $(bin_dir)
rm -rf ./$(bin_dir)/
mkdir -p ./$(bin_dir)/scratch/
$(eval export LEARN_FILE=$(CURDIR)/$(bin_dir)/scratch/learn_file)
$(eval export LEARN_FILE=$(CURDIR)/$(bin_dir)/scratch/learn_tools_file)
echo -n "" > "$(LEARN_FILE)"

HOST_OS=linux HOST_ARCH=amd64 $(MAKE) tools
Expand Down