Skip to content

Commit c41e87f

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #145 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents 0a3779b + ba8049b commit c41e87f

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

‎klone.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,65 +10,65 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
13+
repo_hash: a31dfd4be22b8ff43ce1659ab7bcece06f525805
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
18+
repo_hash: a31dfd4be22b8ff43ce1659ab7bcece06f525805
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
23+
repo_hash: a31dfd4be22b8ff43ce1659ab7bcece06f525805
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: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
28+
repo_hash: a31dfd4be22b8ff43ce1659ab7bcece06f525805
2929
repo_path: modules/generate-verify
3030
- folder_name: go
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
33+
repo_hash: a31dfd4be22b8ff43ce1659ab7bcece06f525805
3434
repo_path: modules/go
3535
- folder_name: helm
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
38+
repo_hash: a31dfd4be22b8ff43ce1659ab7bcece06f525805
3939
repo_path: modules/helm
4040
- folder_name: help
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
43+
repo_hash: a31dfd4be22b8ff43ce1659ab7bcece06f525805
4444
repo_path: modules/help
4545
- folder_name: kind
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
48+
repo_hash: a31dfd4be22b8ff43ce1659ab7bcece06f525805
4949
repo_path: modules/kind
5050
- folder_name: klone
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
53+
repo_hash: a31dfd4be22b8ff43ce1659ab7bcece06f525805
5454
repo_path: modules/klone
5555
- folder_name: oci-build
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
58+
repo_hash: a31dfd4be22b8ff43ce1659ab7bcece06f525805
5959
repo_path: modules/oci-build
6060
- folder_name: oci-publish
6161
repo_url: https://github.com/cert-manager/makefile-modules.git
6262
repo_ref: main
63-
repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
63+
repo_hash: a31dfd4be22b8ff43ce1659ab7bcece06f525805
6464
repo_path: modules/oci-publish
6565
- folder_name: repository-base
6666
repo_url: https://github.com/cert-manager/makefile-modules.git
6767
repo_ref: main
68-
repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
68+
repo_hash: a31dfd4be22b8ff43ce1659ab7bcece06f525805
6969
repo_path: modules/repository-base
7070
- folder_name: tools
7171
repo_url: https://github.com/cert-manager/makefile-modules.git
7272
repo_ref: main
73-
repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd
73+
repo_hash: a31dfd4be22b8ff43ce1659ab7bcece06f525805
7474
repo_path: modules/tools

‎make/_shared/kind/00_mod.mk‎

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

18-
kind_k8s_version := v1.29.2
18+
kind_k8s_version := v1.29.4
1919

2020
# Goto https://github.com/kubernetes-sigs/kind/releases/tag/<KIND-VERSION> and find the
2121
# multi-arch digest for the image you want to use. Then use crane to get the platform
@@ -24,5 +24,5 @@ kind_k8s_version := v1.29.2
2424
# crane digest --platform=linux/amd64 docker.io/kindest/node@$digest
2525
# crane digest --platform=linux/arm64 docker.io/kindest/node@$digest
2626

27-
images_amd64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:acc9e82a5a5bd3dfccfd03117e9ef5f96b46108b55cd647fb5e7d0d1a35c9c6f
28-
images_arm64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:068aaa834c09ab60d925a8569c6b5f5b9cf46eccf670499176f3267f2ac3189c
27+
images_amd64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:ea40a6bd365a17f71fd3883a1d34a0791d7d6b0eb75832c6d85b6f2326827f1e
28+
images_arm64 += docker.io/kindest/node:$(kind_k8s_version)@sha256:e63a7f74e80b746328fbaa70be406639d0c31c8c8cf0a3d57efdd23c64fe4bba

‎make/_shared/tools/00_mod.mk‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ tools += helm=v3.14.4
5050
# https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
5151
tools += kubectl=v1.30.0
5252
# https://github.com/kubernetes-sigs/kind/releases
53-
tools += kind=v0.22.0
53+
tools += kind=v0.23.0
5454
# https://www.vaultproject.io/downloads
5555
tools += vault=1.16.2
5656
# https://github.com/Azure/azure-workload-identity/releases
@@ -126,8 +126,10 @@ tools += operator-sdk=v1.34.1
126126
tools += gh=v2.49.0
127127
# https:///github.com/redhat-openshift-ecosystem/openshift-preflight/releases
128128
tools += preflight=1.9.2
129-
# https://github.com/daixiang0/gci/releases/
129+
# https://github.com/daixiang0/gci/releases
130130
tools += gci=v0.13.4
131+
# https://github.com/google/yamlfmt/releases
132+
tools += yamlfmt=v0.12.1
131133

132134
# https://pkg.go.dev/k8s.io/code-generator/cmd?tab=versions
133135
K8S_CODEGEN_VERSION := v0.29.3
@@ -326,6 +328,7 @@ go_dependencies += govulncheck=golang.org/x/vuln/cmd/govulncheck
326328
go_dependencies += operator-sdk=github.com/operator-framework/operator-sdk/cmd/operator-sdk
327329
go_dependencies += gh=github.com/cli/cli/v2/cmd/gh
328330
go_dependencies += gci=github.com/daixiang0/gci
331+
go_dependencies += yamlfmt=github.com/google/yamlfmt/cmd/yamlfmt
329332

330333
#################
331334
# go build tags #
@@ -396,10 +399,10 @@ $(DOWNLOAD_DIR)/tools/kubectl@$(KUBECTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DO
396399
$(checkhash_script) $(outfile) $(kubectl_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
397400
chmod +x $(outfile)
398401

399-
kind_linux_amd64_SHA256SUM=e4264d7ee07ca642fe52818d7c0ed188b193c214889dd055c929dbcb968d1f62
400-
kind_linux_arm64_SHA256SUM=4431805115da3b54290e3e976fe2db9a7e703f116177aace6735dfa1d8a4f3fe
401-
kind_darwin_amd64_SHA256SUM=28a9f7ad7fd77922c639e21c034d0f989b33402693f4f842099cd9185b144d20
402-
kind_darwin_arm64_SHA256SUM=c8dd3b287965150ae4db668294edc48229116e95d94620c306d8fae932ee633f
402+
kind_linux_amd64_SHA256SUM=1d86e3069ffbe3da9f1a918618aecbc778e00c75f838882d0dfa2d363bc4a68c
403+
kind_linux_arm64_SHA256SUM=a416d6c311882337f0e56910e4a2e1f8c106ec70c22cbf0ac1dd8f33c1e284fe
404+
kind_darwin_amd64_SHA256SUM=81c77f104b4b668812f7930659dc01ad88fa4d1cfc56900863eacdfb2731c457
405+
kind_darwin_arm64_SHA256SUM=68ec87c1e1ea2a708df883f4b94091150d19552d7b344e80ca59f449b301c2a0
403406

404407
.PRECIOUS: $(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH)
405408
$(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools

0 commit comments

Comments
 (0)