Skip to content

Commit 999e6b0

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #466 from cert-manager/self-upgrade-main
[CI] Self-upgrade merging self-upgrade-main into main
2 parents c033e9e + a41e2df commit 999e6b0

File tree

6 files changed

+37
-35
lines changed

6 files changed

+37
-35
lines changed

‎.github/workflows/make-self-upgrade.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ jobs:
3333
exit 1
3434
3535
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
36+
# Adding `fetch-depth: 0` makes sure tags are also fetched. We need
37+
# the tags so `git describe` returns a valid version.
38+
# see https://github.com/actions/checkout/issues/701 for extra info about this option
39+
with: { fetch-depth: 0 }
3640

3741
- id: go-version
3842
run: |

‎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: 124f5ace44727ff538132ca3be21259e1d48c3c3
13+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
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: 124f5ace44727ff538132ca3be21259e1d48c3c3
18+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
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: 124f5ace44727ff538132ca3be21259e1d48c3c3
23+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
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: 124f5ace44727ff538132ca3be21259e1d48c3c3
28+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
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: 124f5ace44727ff538132ca3be21259e1d48c3c3
33+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
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: 124f5ace44727ff538132ca3be21259e1d48c3c3
38+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
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: 124f5ace44727ff538132ca3be21259e1d48c3c3
43+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
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: 124f5ace44727ff538132ca3be21259e1d48c3c3
48+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
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: 124f5ace44727ff538132ca3be21259e1d48c3c3
53+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
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: 124f5ace44727ff538132ca3be21259e1d48c3c3
58+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
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: 124f5ace44727ff538132ca3be21259e1d48c3c3
63+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
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: 124f5ace44727ff538132ca3be21259e1d48c3c3
68+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
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: 124f5ace44727ff538132ca3be21259e1d48c3c3
73+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
7474
repo_path: modules/tools

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

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,16 @@
1515
# This file is auto-generated by the learn_kind_images.sh script in the makefile-modules repo.
1616
# Do not edit manually.
1717

18-
kind_image_kindversion := v0.25.0
18+
kind_image_kindversion := v0.26.0
1919

20-
kind_image_kube_1.26_amd64 := docker.io/kindest/node:v1.26.15@sha256:70c6ccbd3ed58116ad489691148e0437d390ae4349d6990b9aa3863b5c5cc508
21-
kind_image_kube_1.26_arm64 := docker.io/kindest/node:v1.26.15@sha256:83d636689f447921fdf13439391b252eebf471329f3d28a565d5a1a446d73cf7
22-
kind_image_kube_1.27_amd64 := docker.io/kindest/node:v1.27.16@sha256:9a08bfb799b90527eb58f0c3ac54252c3578d93758bae768e975f1bd7ba3bca0
23-
kind_image_kube_1.27_arm64 := docker.io/kindest/node:v1.27.16@sha256:637860d14e28d47c3ef1fe85bed7962a89269dfe6cb0fc6984fa98d61735a54e
24-
kind_image_kube_1.28_amd64 := docker.io/kindest/node:v1.28.15@sha256:af665d70820b816eb1384b9f715f608dca9c625014ebbfa59415dcf703860e93
25-
kind_image_kube_1.28_arm64 := docker.io/kindest/node:v1.28.15@sha256:4659eb060ae96f79dd9f66a54671dc5a6cd3ca83c7bdd765ad13c76dae510b18
26-
kind_image_kube_1.29_amd64 := docker.io/kindest/node:v1.29.10@sha256:f2dc4d5c4a2ccbeadbc4da7e897710ccbf89c098c534c5850fcc26f6e91af81c
27-
kind_image_kube_1.29_arm64 := docker.io/kindest/node:v1.29.10@sha256:0b6b641e44a02f75c3b6607de82598bdb5972c9f4b01572f2e7ecb32f717b35a
28-
kind_image_kube_1.30_amd64 := docker.io/kindest/node:v1.30.6@sha256:2f2a7cddf4080e72da3c12372e6895027c6829df83f5ba3c4c9f1b4acd132aa6
29-
kind_image_kube_1.30_arm64 := docker.io/kindest/node:v1.30.6@sha256:211095e72afdd11964c0afca8a891a60e66e523aac9f3fff2b87ece71eedf8ba
30-
kind_image_kube_1.31_amd64 := docker.io/kindest/node:v1.31.2@sha256:0526eb5cd8d892ed79b56feb48d17eeee1f719f55d5c35cef468f053caffad32
31-
kind_image_kube_1.31_arm64 := docker.io/kindest/node:v1.31.2@sha256:d60ac67de1482e71ea626ac98556cf5833c5c4bdedcf92ea158df61ea9eeaf5e
32-
kind_image_kube_1.32_amd64 := docker.io/kindest/node:v1.32.0@sha256:dbfe3fe9f25dc234af268f5ac9a945e421ac43a30df02acae8c98224523f89f1
33-
kind_image_kube_1.32_arm64 := docker.io/kindest/node:v1.32.0@sha256:4487ecad11a7bba166ab8781c5f5e914f33fb13215c6cacf8a9ce93e33c56923
20+
kind_image_kube_1.29_amd64 := docker.io/kindest/node:v1.29.12@sha256:c1b696872c6d4d41889c1c7ca460d6c6349665061e6dd2a9cc5abda7dd8e21bc
21+
kind_image_kube_1.29_arm64 := docker.io/kindest/node:v1.29.12@sha256:a29e3189829c4784b31507c793b5d186914a6ed81d2296c39d32543988911f36
22+
kind_image_kube_1.30_amd64 := docker.io/kindest/node:v1.30.8@sha256:da9368e0cfa74ca1a7e2c6d6c7abf890e627a94d9c8300dd9d951f63947a456c
23+
kind_image_kube_1.30_arm64 := docker.io/kindest/node:v1.30.8@sha256:27b247e13bac7271e013ea4118843f8072e5a4f1fa8ce2c5c47018e6b2d45cce
24+
kind_image_kube_1.31_amd64 := docker.io/kindest/node:v1.31.4@sha256:29370cbe44fd9798ac1e47e7ad04e53c375c0c683a25cc0cc7db331ad07c9952
25+
kind_image_kube_1.31_arm64 := docker.io/kindest/node:v1.31.4@sha256:496ab674cddaa72e97f2aa70729df5b403f46ee5834fb9a44773284998fea6d5
26+
kind_image_kube_1.32_amd64 := docker.io/kindest/node:v1.32.0@sha256:dd45e7e76478f76d2881cf031e64512f51be63dcb61420307982a24913badf8f
27+
kind_image_kube_1.32_arm64 := docker.io/kindest/node:v1.32.0@sha256:eff24f9d99bc56271a456484d87cd6e6fc0beec7d4418958d589804703c00588
3428

3529
kind_image_latest_amd64 := $(kind_image_kube_1.32_amd64)
3630
kind_image_latest_arm64 := $(kind_image_kube_1.32_arm64)

‎make/_shared/oci-build/00_mod.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ oci_platforms ?= linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le
1616

1717
# Use distroless as minimal base image to package the manager binary
1818
# To get latest SHA run "crane digest quay.io/jetstack/base-static:latest"
19-
base_image_static := quay.io/jetstack/base-static@sha256:6dd468efaceafb7d2b5ba437bb81500636237bac747fd751b75b0cb375600fae
19+
base_image_static := quay.io/jetstack/base-static@sha256:feae5ef1171e639476e4134057228e0355837642993adfcb2b5c77fdc9c51d7d
2020

2121
# Use custom apko-built image as minimal base image to package the manager binary
2222
# To get latest SHA run "crane digest quay.io/jetstack/base-static-csi:latest"
23-
base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:b88c19bfe28a83799e08817ffb7205a3aac1b99ad07739a5433a7fb554b4d223
23+
base_image_csi-static := quay.io/jetstack/base-static-csi@sha256:9e92ef3912568138f865b2268d3f13285736fb55856342cd32456ae2e284658b
2424

2525
# Utility functions
2626
fatal_if_undefined = $(if $(findstring undefined,$(origin $1)),$(error $1 is not set))

‎make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ jobs:
3333
exit 1
3434
3535
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
36+
# Adding `fetch-depth: 0` makes sure tags are also fetched. We need
37+
# the tags so `git describe` returns a valid version.
38+
# see https://github.com/actions/checkout/issues/701 for extra info about this option
39+
with: { fetch-depth: 0 }
3640

3741
- id: go-version
3842
run: |

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ tools += helm=v3.15.4
5656
# https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
5757
tools += kubectl=v1.31.0
5858
# https://github.com/kubernetes-sigs/kind/releases
59-
tools += kind=v0.25.0
59+
tools += kind=v0.26.0
6060
# https://www.vaultproject.io/downloads
6161
tools += vault=1.17.3
6262
# https://github.com/Azure/azure-workload-identity/releases
@@ -416,10 +416,10 @@ $(DOWNLOAD_DIR)/tools/kubectl@$(KUBECTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DO
416416
$(checkhash_script) $(outfile) $(kubectl_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
417417
chmod +x $(outfile)
418418

419-
kind_linux_amd64_SHA256SUM=b22ff7e5c02b8011e82cc3223d069d178b9e1543f1deb21e936d11764780a3d8
420-
kind_linux_arm64_SHA256SUM=06e544e3f12ea54de5962ceaecd97513a25dbab4168a44f03f01833349afdda3
421-
kind_darwin_amd64_SHA256SUM=180404ae1c0de8d333583d2958cdfac5338ec3e32cd765a158cfd6d09eb8cd7d
422-
kind_darwin_arm64_SHA256SUM=222701bb72ff596928c57b3c64ca3e0b969d593ef24ccc790f9c17904e7b63ea
419+
kind_linux_amd64_SHA256SUM=d445b44c28297bc23fd67e51cc24bb294ae7b977712be2d4d312883d0835829b
420+
kind_linux_arm64_SHA256SUM=53fffdc37bd7149ccea440b1bdde2464f517d2c462dc8913ad37e7939e7f422d
421+
kind_darwin_amd64_SHA256SUM=a2c30525db86a7807ad4bba0094437406518f41d8a2882e6ea659d94099adcc4
422+
kind_darwin_arm64_SHA256SUM=e5bf92d8d46017e23482bfe266929d4d82e6f8c754e216c105cb7fbea937bea2
423423

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

0 commit comments

Comments
 (0)