From 8d7f5e23a3cd5ff1ff0c74478c343a79e2715d72 Mon Sep 17 00:00:00 2001 From: jetstack-bot Date: Thu, 8 Feb 2024 13:48:50 +0000 Subject: [PATCH] BOT: run 'make upgrade-klone' and 'make generate' Signed-off-by: jetstack-bot --- klone.yaml | 22 +++++++++++----------- make/_shared/cert-manager/00_mod.mk | 18 +++++++++--------- make/_shared/oci-image/01_mod.mk | 2 ++ make/_shared/tools/00_mod.mk | 2 +- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/klone.yaml b/klone.yaml index 74993109..2fc82dbf 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: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 + repo_hash: 8705421cbac00182e41adeb3a0ce08c0a9710cb1 repo_path: modules/boilerplate - folder_name: cert-manager repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 + repo_hash: 8705421cbac00182e41adeb3a0ce08c0a9710cb1 repo_path: modules/cert-manager - folder_name: controller-gen repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 + repo_hash: 8705421cbac00182e41adeb3a0ce08c0a9710cb1 repo_path: modules/controller-gen - folder_name: generate-verify repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 + repo_hash: 8705421cbac00182e41adeb3a0ce08c0a9710cb1 repo_path: modules/generate-verify - folder_name: helm repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 + repo_hash: 8705421cbac00182e41adeb3a0ce08c0a9710cb1 repo_path: modules/helm - folder_name: help repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 + repo_hash: 8705421cbac00182e41adeb3a0ce08c0a9710cb1 repo_path: modules/help - folder_name: kind repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 + repo_hash: 8705421cbac00182e41adeb3a0ce08c0a9710cb1 repo_path: modules/kind - folder_name: klone repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 + repo_hash: 8705421cbac00182e41adeb3a0ce08c0a9710cb1 repo_path: modules/klone - folder_name: oci-image repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 + repo_hash: 8705421cbac00182e41adeb3a0ce08c0a9710cb1 repo_path: modules/oci-image - folder_name: repository-base repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 + repo_hash: 8705421cbac00182e41adeb3a0ce08c0a9710cb1 repo_path: modules/repository-base - folder_name: tools repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 8ecd0620d9aa0eeb3c6a964b6e2f0a5d8e3de655 + repo_hash: 8705421cbac00182e41adeb3a0ce08c0a9710cb1 repo_path: modules/tools diff --git a/make/_shared/cert-manager/00_mod.mk b/make/_shared/cert-manager/00_mod.mk index 2b9a5cd3..a366dcd8 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.13.3 +cert_manager_version := v1.14.2 -images_amd64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:3490283b7a8fb4e13d9864963f94ab710fc2d669d3d53608f01608c887d4f741 -images_amd64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:c3a5ce22b8521e1a0a792152540cbbcb3ef8d509c9f3583cffb6b4e9a5b7bd60 -images_amd64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:afe9a27be1e6b3847d6483eb9a83b20fb8576ba5c314f381a90b185af022a105 -images_amd64 += quay.io/jetstack/cert-manager-ctl:$(cert_manager_version)@sha256:38f549eba224094c6810c088e5f8e257690dc882956234b8db3cad15c6253822 +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_arm64 += quay.io/jetstack/cert-manager-controller:$(cert_manager_version)@sha256:2ec91011538846690da6c236e51ef0221b2e3dbd45de41cce6dfa16d531a4dc4 -images_arm64 += quay.io/jetstack/cert-manager-cainjector:$(cert_manager_version)@sha256:1bdddcf53317991f01be03cffc126b10df4136556e0440836bee07a192dcc3f5 -images_arm64 += quay.io/jetstack/cert-manager-webhook:$(cert_manager_version)@sha256:04c79086f1e3440bac8b584304fe5444d6184c5345c7e7115147ee39d4591d2e -images_arm64 += quay.io/jetstack/cert-manager-ctl:$(cert_manager_version)@sha256:f0755d949d0facd64550d2f1e2f974ce5592a199b84772fd9ab4a97a2a19a609 +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 diff --git a/make/_shared/oci-image/01_mod.mk b/make/_shared/oci-image/01_mod.mk index 9719feaf..3c16929d 100644 --- a/make/_shared/oci-image/01_mod.mk +++ b/make/_shared/oci-image/01_mod.mk @@ -45,6 +45,8 @@ ifeq ($(oci_$1_base_image_flavor),static) oci_$1_base_image := $(base_image_static) else ifeq ($(oci_$1_base_image_flavor),csi-static) oci_$1_base_image := $(base_image_csi-static) +else ifeq ($(oci_$1_base_image_flavor),custom) + $$(call fatal_if_undefined,oci_$1_base_image) else $$(error oci_$1_base_image_flavor has unknown value "$(oci_$1_base_image_flavor)") endif diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk index ad19f846..e764a2ad 100644 --- a/make/_shared/tools/00_mod.mk +++ b/make/_shared/tools/00_mod.mk @@ -114,7 +114,7 @@ ADDITIONAL_TOOLS ?= TOOLS += $(ADDITIONAL_TOOLS) # https://go.dev/dl/ -VENDORED_GO_VERSION := 1.21.6 +VENDORED_GO_VERSION := 1.21.7 # Print the go version which can be used in GH actions .PHONY: print-go-version