Skip to content

[CI] Merge self-upgrade-main into main #304

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

Merged
merged 1 commit into from
Sep 18, 2024
Merged

[CI] Merge self-upgrade-main into main #304

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
26 changes: 13 additions & 13 deletions klone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,65 +10,65 @@ targets:
- folder_name: boilerplate
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: bc83f8e485d6a9bc300489026240666cea8566f3
repo_hash: 890fc91ea961bd454bee0ce21a3511b0acfa2822
repo_path: modules/boilerplate
- folder_name: cert-manager
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: bc83f8e485d6a9bc300489026240666cea8566f3
repo_hash: 890fc91ea961bd454bee0ce21a3511b0acfa2822
repo_path: modules/cert-manager
- folder_name: controller-gen
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: bc83f8e485d6a9bc300489026240666cea8566f3
repo_hash: 890fc91ea961bd454bee0ce21a3511b0acfa2822
repo_path: modules/controller-gen
- folder_name: generate-verify
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: bc83f8e485d6a9bc300489026240666cea8566f3
repo_hash: 890fc91ea961bd454bee0ce21a3511b0acfa2822
repo_path: modules/generate-verify
- folder_name: go
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: bc83f8e485d6a9bc300489026240666cea8566f3
repo_hash: 890fc91ea961bd454bee0ce21a3511b0acfa2822
repo_path: modules/go
- folder_name: helm
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: bc83f8e485d6a9bc300489026240666cea8566f3
repo_hash: 890fc91ea961bd454bee0ce21a3511b0acfa2822
repo_path: modules/helm
- folder_name: help
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: bc83f8e485d6a9bc300489026240666cea8566f3
repo_hash: 890fc91ea961bd454bee0ce21a3511b0acfa2822
repo_path: modules/help
- folder_name: kind
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: bc83f8e485d6a9bc300489026240666cea8566f3
repo_hash: 890fc91ea961bd454bee0ce21a3511b0acfa2822
repo_path: modules/kind
- folder_name: klone
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: bc83f8e485d6a9bc300489026240666cea8566f3
repo_hash: 890fc91ea961bd454bee0ce21a3511b0acfa2822
repo_path: modules/klone
- folder_name: oci-build
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: bc83f8e485d6a9bc300489026240666cea8566f3
repo_hash: 890fc91ea961bd454bee0ce21a3511b0acfa2822
repo_path: modules/oci-build
- folder_name: oci-publish
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: bc83f8e485d6a9bc300489026240666cea8566f3
repo_hash: 890fc91ea961bd454bee0ce21a3511b0acfa2822
repo_path: modules/oci-publish
- folder_name: repository-base
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: bc83f8e485d6a9bc300489026240666cea8566f3
repo_hash: 890fc91ea961bd454bee0ce21a3511b0acfa2822
repo_path: modules/repository-base
- folder_name: tools
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: bc83f8e485d6a9bc300489026240666cea8566f3
repo_hash: 890fc91ea961bd454bee0ce21a3511b0acfa2822
repo_path: modules/tools
2 changes: 1 addition & 1 deletion make/_shared/generate-verify/util/verify.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ if ! diff \
then
echo
echo "Project '${projectdir}' is out of date."
echo "Please run '${*}'"
echo "Please run '${*}' or apply the above diffs"
exit 1
fi
4 changes: 2 additions & 2 deletions make/_shared/oci-build/00_mod.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ 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:262e3020adb3b09ddbf9cd8fe672330451a556c8e7024142fa205c8876c3fd75
base_image_static := quay.io/jetstack/base-static@sha256:9115b6b23bd3760a6d226b46a208c5ef317313ae8d0147fcd066db0903d24698

# Use custom apko-built image as minimal base image to package the manager binary
# To get latest SHA run "crane digest quay.io/jetstack/base-static-csi:latest"
base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:f776795838d73f9836b134f688b4c827fcd7ed22f46d3cefcb9f57d668388fef
base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:3352a7b0b16c062658b4a43718ca7f08a7d3a402688069d39f6754dcf936189b

# Utility functions
fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not set))
Expand Down