Skip to content

Commit 4e92632

Browse files
authored
Merge pull request #784 from jetstack/bump-klone
chore: make upgrade-klone && make generate
2 parents 9c7baf7 + 63aec4f commit 4e92632

6 files changed

Lines changed: 121 additions & 119 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
scope: 'jetstack/jetstack-secure'
3939
identity: make-self-upgrade
4040

41-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
41+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4242
# Adding `fetch-depth: 0` makes sure tags are also fetched. We need
4343
# the tags so `git describe` returns a valid version.
4444
# see https://github.com/actions/checkout/issues/701 for extra info about this option
@@ -50,7 +50,7 @@ jobs:
5050
run: |
5151
make print-go-version >> "$GITHUB_OUTPUT"
5252
53-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
53+
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
5454
with:
5555
go-version: ${{ steps.go-version.outputs.result }}
5656

klone.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,55 +10,55 @@ targets:
1010
- folder_name: generate-verify
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 2c5045aea89e02724fed0b9148e6b21abca94e9a
13+
repo_hash: 55974d81000a5135b824a5534a30858203fbfdb6
1414
repo_path: modules/generate-verify
1515
- folder_name: go
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: 2c5045aea89e02724fed0b9148e6b21abca94e9a
18+
repo_hash: 55974d81000a5135b824a5534a30858203fbfdb6
1919
repo_path: modules/go
2020
- folder_name: helm
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: 2c5045aea89e02724fed0b9148e6b21abca94e9a
23+
repo_hash: 55974d81000a5135b824a5534a30858203fbfdb6
2424
repo_path: modules/helm
2525
- folder_name: help
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: 2c5045aea89e02724fed0b9148e6b21abca94e9a
28+
repo_hash: 55974d81000a5135b824a5534a30858203fbfdb6
2929
repo_path: modules/help
3030
- folder_name: kind
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: 2c5045aea89e02724fed0b9148e6b21abca94e9a
33+
repo_hash: 55974d81000a5135b824a5534a30858203fbfdb6
3434
repo_path: modules/kind
3535
- folder_name: klone
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: 2c5045aea89e02724fed0b9148e6b21abca94e9a
38+
repo_hash: 55974d81000a5135b824a5534a30858203fbfdb6
3939
repo_path: modules/klone
4040
- folder_name: licenses
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: 2c5045aea89e02724fed0b9148e6b21abca94e9a
43+
repo_hash: 55974d81000a5135b824a5534a30858203fbfdb6
4444
repo_path: modules/licenses
4545
- folder_name: oci-build
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: 2c5045aea89e02724fed0b9148e6b21abca94e9a
48+
repo_hash: 55974d81000a5135b824a5534a30858203fbfdb6
4949
repo_path: modules/oci-build
5050
- folder_name: oci-publish
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: 2c5045aea89e02724fed0b9148e6b21abca94e9a
53+
repo_hash: 55974d81000a5135b824a5534a30858203fbfdb6
5454
repo_path: modules/oci-publish
5555
- folder_name: repository-base
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: 2c5045aea89e02724fed0b9148e6b21abca94e9a
58+
repo_hash: 55974d81000a5135b824a5534a30858203fbfdb6
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: 2c5045aea89e02724fed0b9148e6b21abca94e9a
63+
repo_hash: 55974d81000a5135b824a5534a30858203fbfdb6
6464
repo_path: modules/tools

make/_shared/go/base/.github/workflows/govulncheck.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: github.repository == '{{REPLACE:GH-REPOSITORY}}'
2121

2222
steps:
23-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
23+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2424
# Adding `fetch-depth: 0` makes sure tags are also fetched. We need
2525
# the tags so `git describe` returns a valid version.
2626
# see https://github.com/actions/checkout/issues/701 for extra info about this option
@@ -30,7 +30,7 @@ jobs:
3030
run: |
3131
make print-go-version >> "$GITHUB_OUTPUT"
3232
33-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
33+
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
3434
with:
3535
go-version: ${{ steps.go-version.outputs.result }}
3636

make/_shared/kind/00_kind_image_versions.mk

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,18 @@
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.30.0
18+
kind_image_kindversion := v0.31.0
1919

20-
kind_image_kube_1.31_amd64 := docker.io/kindest/node:v1.31.12@sha256:9b0369c99755c4201e15618015138240182efd9cf2ba21351498d2e0176e8169
21-
kind_image_kube_1.31_arm64 := docker.io/kindest/node:v1.31.12@sha256:55d14ffa8767b87ae715fbb154cf13a356e5871f2bea87532a2f911fcc5b0103
22-
kind_image_kube_1.32_amd64 := docker.io/kindest/node:v1.32.8@sha256:284cc1c33c7170ea6cbfda225ad20484157c9781691c74451c4aaddf88d34114
23-
kind_image_kube_1.32_arm64 := docker.io/kindest/node:v1.32.8@sha256:71488e3e22f1923d2f6508950a7e9121a3bcb7090e12779468f961cdc2974fc2
24-
kind_image_kube_1.33_amd64 := docker.io/kindest/node:v1.33.4@sha256:59b665b0dc14d1fed52a9e172e4877bf00da1720aa2252128f91007544b0039d
25-
kind_image_kube_1.33_arm64 := docker.io/kindest/node:v1.33.4@sha256:5e665c9be32ef55fb307e16a6a8e643602bafb01363f4b34d45fa55427ee03cf
26-
kind_image_kube_1.34_amd64 := docker.io/kindest/node:v1.34.0@sha256:ede5bb6984830375d264e41b7169d03643f586d3e35316bf5229eaeb12bb18e0
27-
kind_image_kube_1.34_arm64 := docker.io/kindest/node:v1.34.0@sha256:3229b411042d457a44ea8807e90520e4b7da8700a8617ed20f0c4cb799bebe2b
20+
kind_image_kube_1.31_amd64 := docker.io/kindest/node:v1.31.14@sha256:e360318c07a2bb22ced43884c6884208a82d3da24828c9f1329222dd517adc06
21+
kind_image_kube_1.31_arm64 := docker.io/kindest/node:v1.31.14@sha256:cb9072fa3db2b4aaa4fa146193064cd1ddd3fe00666c12c5189e80d3735027b5
22+
kind_image_kube_1.32_amd64 := docker.io/kindest/node:v1.32.11@sha256:831a3aa45e399a20b3aef41d6d8572cc6ff07b1f76cac1242ce26be0ccf86402
23+
kind_image_kube_1.32_arm64 := docker.io/kindest/node:v1.32.11@sha256:6c3e552f3046d9e4b3602f642a54797ebe8bfcd18f3720cac129ae90bf802365
24+
kind_image_kube_1.33_amd64 := docker.io/kindest/node:v1.33.7@sha256:eb929cd8aca88dd03836180c65f3892ba8ccc79d80de1cc6666bcb9a35c1334e
25+
kind_image_kube_1.33_arm64 := docker.io/kindest/node:v1.33.7@sha256:09d327961491ceb25a987350e34c5335246f1e28aa48189d815f1905dea66079
26+
kind_image_kube_1.34_amd64 := docker.io/kindest/node:v1.34.3@sha256:babda82416d417f720a4d6dbd35deec5263af2a6c164c81c08cde0044c2b9f78
27+
kind_image_kube_1.34_arm64 := docker.io/kindest/node:v1.34.3@sha256:55cc745d5da0ef8c7a24a9f25f2df7cc6af0fadf85cf24bd639d2c2f02bacfab
28+
kind_image_kube_1.35_amd64 := docker.io/kindest/node:v1.35.0@sha256:b7f5e1f621afb1156eb0f27f26c804e5265c07d8e9c55516d25d66400043629b
29+
kind_image_kube_1.35_arm64 := docker.io/kindest/node:v1.35.0@sha256:0aa5e1a411b2c3197184286d7699424a123cd4d18c04c24317173dc5256c6110
2830

29-
kind_image_latest_amd64 := $(kind_image_kube_1.34_amd64)
30-
kind_image_latest_arm64 := $(kind_image_kube_1.34_arm64)
31+
kind_image_latest_amd64 := $(kind_image_kube_1.35_amd64)
32+
kind_image_latest_arm64 := $(kind_image_kube_1.35_arm64)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
scope: '{{REPLACE:GH-REPOSITORY}}'
3939
identity: make-self-upgrade
4040

41-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
41+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4242
# Adding `fetch-depth: 0` makes sure tags are also fetched. We need
4343
# the tags so `git describe` returns a valid version.
4444
# see https://github.com/actions/checkout/issues/701 for extra info about this option
@@ -50,7 +50,7 @@ jobs:
5050
run: |
5151
make print-go-version >> "$GITHUB_OUTPUT"
5252
53-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
53+
- uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
5454
with:
5555
go-version: ${{ steps.go-version.outputs.result }}
5656

0 commit comments

Comments
 (0)