Skip to content

Commit e5fede4

Browse files
committed
Run 'make upgrade-klone' and 'make generate'
Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com>
1 parent 930c03d commit e5fede4

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: c2ced18b50a2c5dd03b2a659145ef917f20be593
13+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
1414
repo_path: modules/boilerplate
1515
- folder_name: generate-verify
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: c2ced18b50a2c5dd03b2a659145ef917f20be593
18+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
1919
repo_path: modules/generate-verify
2020
- folder_name: help
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: c2ced18b50a2c5dd03b2a659145ef917f20be593
23+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
2424
repo_path: modules/help
2525
- folder_name: klone
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: c2ced18b50a2c5dd03b2a659145ef917f20be593
28+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
2929
repo_path: modules/klone
3030
- folder_name: repository-base
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: c2ced18b50a2c5dd03b2a659145ef917f20be593
33+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
3434
repo_path: modules/repository-base
3535
- folder_name: tools
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: c2ced18b50a2c5dd03b2a659145ef917f20be593
38+
repo_hash: 601d6f57d6750ae4cc5727a283eaffb47418c7f2
3939
repo_path: modules/tools

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.24.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=b89aada5a39d620da3fcd16435b7f28d858927dd53f92cbac77686b0588b600d
420-
kind_linux_arm64_SHA256SUM=2968808d916e12d0a25c56d07c9a1c987163f972513fa8a94a2125a69f9c50eb
421-
kind_darwin_amd64_SHA256SUM=6cf7ba50b37d3446153bbfb8990f03fb8102778898c84502cdb841710b499ed5
422-
kind_darwin_arm64_SHA256SUM=8e34f2edc7efc5c7c160487251848a954cd60ccd52b56a3fc360eaab33543fc0
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)