diff --git a/klone.yaml b/klone.yaml index fe5fdd50..7042bb1a 100644 --- a/klone.yaml +++ b/klone.yaml @@ -10,55 +10,55 @@ targets: - folder_name: boilerplate repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71 + repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda repo_path: modules/boilerplate - folder_name: cert-manager repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71 + repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda repo_path: modules/cert-manager - folder_name: controller-gen repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71 + repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda repo_path: modules/controller-gen - folder_name: generate-verify repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71 + repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda repo_path: modules/generate-verify - folder_name: helm repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71 + repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda repo_path: modules/helm - folder_name: help repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71 + repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda repo_path: modules/help - folder_name: kind repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71 + repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda repo_path: modules/kind - folder_name: klone repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71 + repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda repo_path: modules/klone - folder_name: oci-image repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71 + repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda repo_path: modules/oci-image - folder_name: repository-base repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71 + repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda repo_path: modules/repository-base - folder_name: tools repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71 + repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda repo_path: modules/tools diff --git a/make/_shared/cert-manager/00_mod.mk b/make/_shared/cert-manager/00_mod.mk index a366dcd8..0a61381a 100644 --- a/make/_shared/cert-manager/00_mod.mk +++ b/make/_shared/cert-manager/00_mod.mk @@ -15,14 +15,14 @@ images_amd64 ?= images_arm64 ?= -cert_manager_version := v1.14.2 +cert_manager_version := v1.14.4 -images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:8c5b6bfe84dfb0127aaab3b64ffcb4a2741aa5a7aa4736cc6edeb481a5ac47cf -images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:67ccc881f34b2d1dd3fa3d422d37bbb6934d268f08aefadb33e55cb0e515e270 -images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:dfc8027dd294d29bda073b3ceef06be4b4a0cada853b1eb170b4686e10fcce47 -images_amd64 += quay.io/jetstack/cert-manager-ctl:$(cert_manager_version)@sha256:4e603416401ba94e773ec710236a417481c8f039336895a592e3727900a3dff0 +images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:f84edf06327f84ed2ca056776659aa144cf3cc982c5403650c24553c5a44b03d +images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:8267563833c31cc428b9ae460b890d079a1da09a4d8d00ec299a47dd613fbd24 +images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:ba5469d1a77b1cb04a703199b0e69bc25644a00498adc3694a0369c87375b4ca +images_amd64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:2a1545099cf6386ab08e979a58a6280fe123d091c69f8222bfb22c597003a3f0 -images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:01a0388d5b1f15c8ae6cfd0672558697eef2992b956690a6cf335ccebeb646c2 -images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:ffbb4641da6562c965db8e9cc28b653a89fc4bbbf22639d014bac6fc837db5e7 -images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:fdf548c247afbbf25ca8f74c5fde98f58976169504cf75c79d03ced552b93626 -images_arm64 += quay.io/jetstack/cert-manager-ctl:$(cert_manager_version)@sha256:d0ab0106c62621b85614afae26c54e89d4bc5ac222b3402f7deb8f16fa0aa852 +images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:39a6e9e699b3dacb8b92538efbaff85c16d4b30343ebeaaf2f35772ff3cebf53 +images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:956aac21371499fdcc8811b4b5fc8e2e0d6e552b15723c783fe56270347fc9e0 +images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:8ea8462c1daa7604f4f2e71e0cdeef3dd5d7e0f04341982a05dc296299766126 +images_arm64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:f4cd54540f8813e63a2f53b5b210454ae2a5fe0949b9f55d8f1270162ebad9a8 diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk index e4c2a5a7..b162a6ec 100644 --- a/make/_shared/tools/00_mod.mk +++ b/make/_shared/tools/00_mod.mk @@ -109,7 +109,7 @@ TOOLS += cmctl=2f75014a7c360c319f8c7c8afe8e9ce33fe26dca # https://pkg.go.dev/github.com/cert-manager/release/cmd/cmrel?tab=versions TOOLS += cmrel=fa10147dadc8c36718b7b08aed6d8c6418eb2 # https://github.com/golangci/golangci-lint/releases -TOOLS += golangci-lint=v1.55.2 +TOOLS += golangci-lint=v1.57.1 # https://pkg.go.dev/golang.org/x/vuln?tab=versions TOOLS += govulncheck=v1.0.4 diff --git a/make/test-e2e.mk b/make/test-e2e.mk index 1d98a5af..516eee18 100644 --- a/make/test-e2e.mk +++ b/make/test-e2e.mk @@ -31,8 +31,8 @@ e2e-setup-cert-manager: | kind-cluster $(NEEDS_HELM) $(NEEDS_KUBECTL) --set webhook.image.repository=$(quay.io/jetstack/cert-manager-webhook.REPO) \ --set webhook.image.tag=$(quay.io/jetstack/cert-manager-webhook.TAG) \ --set webhook.image.pullPolicy=Never \ - --set startupapicheck.image.repository=$(quay.io/jetstack/cert-manager-ctl.REPO) \ - --set startupapicheck.image.tag=$(quay.io/jetstack/cert-manager-ctl.TAG) \ + --set startupapicheck.image.repository=$(quay.io/jetstack/cert-manager-startupapicheck.REPO) \ + --set startupapicheck.image.tag=$(quay.io/jetstack/cert-manager-startupapicheck.TAG) \ --set startupapicheck.image.pullPolicy=Never \ cert-manager cert-manager >/dev/null