Skip to content

Commit 2309ade

Browse files
authored
Merge pull request #225 from cert-manager/self-upgrade
[CI] Merge self-upgrade into main
2 parents a639d6a + a30b951 commit 2309ade

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

klone.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,55 +10,55 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
13+
repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda
1414
repo_path: modules/boilerplate
1515
- folder_name: cert-manager
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
18+
repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda
1919
repo_path: modules/cert-manager
2020
- folder_name: controller-gen
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
23+
repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda
2424
repo_path: modules/controller-gen
2525
- folder_name: generate-verify
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
28+
repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda
2929
repo_path: modules/generate-verify
3030
- folder_name: helm
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
33+
repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda
3434
repo_path: modules/helm
3535
- folder_name: help
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
38+
repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda
3939
repo_path: modules/help
4040
- folder_name: kind
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
43+
repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda
4444
repo_path: modules/kind
4545
- folder_name: klone
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
48+
repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda
4949
repo_path: modules/klone
5050
- folder_name: oci-image
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
53+
repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda
5454
repo_path: modules/oci-image
5555
- folder_name: repository-base
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
58+
repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda
5959
repo_path: modules/repository-base
6060
- folder_name: tools
6161
repo_url: https://github.com/cert-manager/makefile-modules.git
6262
repo_ref: main
63-
repo_hash: 31cd2b68879ecb757d4009450079f6eed05dfd71
63+
repo_hash: bee8fa83c976e2bb96e58191ea560a5398e3fcda
6464
repo_path: modules/tools

make/_shared/cert-manager/00_mod.mk

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
images_amd64 ?=
1616
images_arm64 ?=
1717

18-
cert_manager_version := v1.14.2
18+
cert_manager_version := v1.14.4
1919

20-
images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:8c5b6bfe84dfb0127aaab3b64ffcb4a2741aa5a7aa4736cc6edeb481a5ac47cf
21-
images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:67ccc881f34b2d1dd3fa3d422d37bbb6934d268f08aefadb33e55cb0e515e270
22-
images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:dfc8027dd294d29bda073b3ceef06be4b4a0cada853b1eb170b4686e10fcce47
23-
images_amd64 += quay.io/jetstack/cert-manager-ctl:$(cert_manager_version)@sha256:4e603416401ba94e773ec710236a417481c8f039336895a592e3727900a3dff0
20+
images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:f84edf06327f84ed2ca056776659aa144cf3cc982c5403650c24553c5a44b03d
21+
images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:8267563833c31cc428b9ae460b890d079a1da09a4d8d00ec299a47dd613fbd24
22+
images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:ba5469d1a77b1cb04a703199b0e69bc25644a00498adc3694a0369c87375b4ca
23+
images_amd64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:2a1545099cf6386ab08e979a58a6280fe123d091c69f8222bfb22c597003a3f0
2424

25-
images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:01a0388d5b1f15c8ae6cfd0672558697eef2992b956690a6cf335ccebeb646c2
26-
images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:ffbb4641da6562c965db8e9cc28b653a89fc4bbbf22639d014bac6fc837db5e7
27-
images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:fdf548c247afbbf25ca8f74c5fde98f58976169504cf75c79d03ced552b93626
28-
images_arm64 += quay.io/jetstack/cert-manager-ctl:$(cert_manager_version)@sha256:d0ab0106c62621b85614afae26c54e89d4bc5ac222b3402f7deb8f16fa0aa852
25+
images_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:39a6e9e699b3dacb8b92538efbaff85c16d4b30343ebeaaf2f35772ff3cebf53
26+
images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:956aac21371499fdcc8811b4b5fc8e2e0d6e552b15723c783fe56270347fc9e0
27+
images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:8ea8462c1daa7604f4f2e71e0cdeef3dd5d7e0f04341982a05dc296299766126
28+
images_arm64 += quay.io/jetstack/cert-manager-startupapicheck:$(cert_manager_version)@sha256:f4cd54540f8813e63a2f53b5b210454ae2a5fe0949b9f55d8f1270162ebad9a8

make/_shared/tools/00_mod.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ TOOLS += cmctl=2f75014a7c360c319f8c7c8afe8e9ce33fe26dca
109109
# https://pkg.go.dev/github.com/cert-manager/release/cmd/cmrel?tab=versions
110110
TOOLS += cmrel=fa10147dadc8c36718b7b08aed6d8c6418eb2
111111
# https://github.com/golangci/golangci-lint/releases
112-
TOOLS += golangci-lint=v1.55.2
112+
TOOLS += golangci-lint=v1.57.1
113113
# https://pkg.go.dev/golang.org/x/vuln?tab=versions
114114
TOOLS += govulncheck=v1.0.4
115115

make/test-e2e.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ e2e-setup-cert-manager: | kind-cluster $(NEEDS_HELM) $(NEEDS_KUBECTL)
3131
--set webhook.image.repository=$(quay.io/jetstack/cert-manager-webhook.REPO) \
3232
--set webhook.image.tag=$(quay.io/jetstack/cert-manager-webhook.TAG) \
3333
--set webhook.image.pullPolicy=Never \
34-
--set startupapicheck.image.repository=$(quay.io/jetstack/cert-manager-ctl.REPO) \
35-
--set startupapicheck.image.tag=$(quay.io/jetstack/cert-manager-ctl.TAG) \
34+
--set startupapicheck.image.repository=$(quay.io/jetstack/cert-manager-startupapicheck.REPO) \
35+
--set startupapicheck.image.tag=$(quay.io/jetstack/cert-manager-startupapicheck.TAG) \
3636
--set startupapicheck.image.pullPolicy=Never \
3737
cert-manager cert-manager >/dev/null
3838

0 commit comments

Comments
 (0)