Skip to content

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

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
Apr 18, 2025
Merged

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

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: 63de69c93b4abd5f087b5ec9e845ac901334f3f4
repo_hash: c50107e376014fcc18cc2d1805adf06c649b069c
repo_path: modules/boilerplate
- folder_name: cert-manager
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 63de69c93b4abd5f087b5ec9e845ac901334f3f4
repo_hash: c50107e376014fcc18cc2d1805adf06c649b069c
repo_path: modules/cert-manager
- folder_name: controller-gen
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 63de69c93b4abd5f087b5ec9e845ac901334f3f4
repo_hash: c50107e376014fcc18cc2d1805adf06c649b069c
repo_path: modules/controller-gen
- folder_name: generate-verify
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 63de69c93b4abd5f087b5ec9e845ac901334f3f4
repo_hash: c50107e376014fcc18cc2d1805adf06c649b069c
repo_path: modules/generate-verify
- folder_name: go
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 63de69c93b4abd5f087b5ec9e845ac901334f3f4
repo_hash: c50107e376014fcc18cc2d1805adf06c649b069c
repo_path: modules/go
- folder_name: helm
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 63de69c93b4abd5f087b5ec9e845ac901334f3f4
repo_hash: c50107e376014fcc18cc2d1805adf06c649b069c
repo_path: modules/helm
- folder_name: help
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 63de69c93b4abd5f087b5ec9e845ac901334f3f4
repo_hash: c50107e376014fcc18cc2d1805adf06c649b069c
repo_path: modules/help
- folder_name: kind
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 63de69c93b4abd5f087b5ec9e845ac901334f3f4
repo_hash: c50107e376014fcc18cc2d1805adf06c649b069c
repo_path: modules/kind
- folder_name: klone
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 63de69c93b4abd5f087b5ec9e845ac901334f3f4
repo_hash: c50107e376014fcc18cc2d1805adf06c649b069c
repo_path: modules/klone
- folder_name: oci-build
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 63de69c93b4abd5f087b5ec9e845ac901334f3f4
repo_hash: c50107e376014fcc18cc2d1805adf06c649b069c
repo_path: modules/oci-build
- folder_name: oci-publish
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 63de69c93b4abd5f087b5ec9e845ac901334f3f4
repo_hash: c50107e376014fcc18cc2d1805adf06c649b069c
repo_path: modules/oci-publish
- folder_name: repository-base
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 63de69c93b4abd5f087b5ec9e845ac901334f3f4
repo_hash: c50107e376014fcc18cc2d1805adf06c649b069c
repo_path: modules/repository-base
- folder_name: tools
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 63de69c93b4abd5f087b5ec9e845ac901334f3f4
repo_hash: c50107e376014fcc18cc2d1805adf06c649b069c
repo_path: modules/tools
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:713aaf3b2c45b103d37778943f2c384120eabb97b9097eea4b5cbbd32880b86d
base_image_static := quay.io/jetstack/base-static@sha256:16a5a64b918592f5c38fa73721a87f8585a3a501d261087e7b953f8b59279cd0

# 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:3499c6d3073503bd13e015c27b039e58a790e5623906af1cf42ebbf85a8ff7f6
base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:fb97fc098aabdfb5b9b01475d3531b688a9c2219f4bbc143816d3e47a267be6d

# Utility functions
fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not set))
Expand Down
2 changes: 1 addition & 1 deletion make/_shared/tools/00_mod.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ tools += cmctl=v2.1.1
# https://pkg.go.dev/github.com/cert-manager/release/cmd/cmrel?tab=versions
tools += cmrel=e3cbe5171488deda000145003e22567bdce622ea
# https://pkg.go.dev/github.com/golangci/golangci-lint/v2/cmd/golangci-lint?tab=versions
tools += golangci-lint=v2.1.1
tools += golangci-lint=v2.1.2
# https://pkg.go.dev/golang.org/x/vuln?tab=versions
tools += govulncheck=v1.1.4
# https://pkg.go.dev/github.com/operator-framework/operator-sdk/cmd/operator-sdk?tab=versions
Expand Down