Skip to content

[CI] Self-upgrade merging self-upgrade-main into main #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/govulncheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: |
make print-go-version >> "$GITHUB_OUTPUT"

- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
with:
go-version: ${{ steps.go-version.outputs.result }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/make-self-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
run: |
make print-go-version >> "$GITHUB_OUTPUT"

- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
with:
go-version: ${{ steps.go-version.outputs.result }}

Expand Down
24 changes: 12 additions & 12 deletions klone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@ targets:
- folder_name: boilerplate
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 25ec11345ab139986fad5fe7ffb5503069e6f81b
repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
repo_path: modules/boilerplate
- folder_name: cert-manager
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 25ec11345ab139986fad5fe7ffb5503069e6f81b
repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
repo_path: modules/cert-manager
- folder_name: controller-gen
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 25ec11345ab139986fad5fe7ffb5503069e6f81b
repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
repo_path: modules/controller-gen
- folder_name: generate-verify
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 25ec11345ab139986fad5fe7ffb5503069e6f81b
repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
repo_path: modules/generate-verify
- folder_name: go
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 25ec11345ab139986fad5fe7ffb5503069e6f81b
repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
repo_path: modules/go
- folder_name: helm
repo_url: https://github.com/cert-manager/makefile-modules.git
Expand All @@ -40,35 +40,35 @@ targets:
- folder_name: help
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 25ec11345ab139986fad5fe7ffb5503069e6f81b
repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
repo_path: modules/help
- folder_name: kind
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 25ec11345ab139986fad5fe7ffb5503069e6f81b
repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
repo_path: modules/kind
- folder_name: klone
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 25ec11345ab139986fad5fe7ffb5503069e6f81b
repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
repo_path: modules/klone
- folder_name: oci-build
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 25ec11345ab139986fad5fe7ffb5503069e6f81b
repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
repo_path: modules/oci-build
- folder_name: oci-publish
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 25ec11345ab139986fad5fe7ffb5503069e6f81b
repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
repo_path: modules/oci-publish
- folder_name: repository-base
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 25ec11345ab139986fad5fe7ffb5503069e6f81b
repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
repo_path: modules/repository-base
- folder_name: tools
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 25ec11345ab139986fad5fe7ffb5503069e6f81b
repo_hash: 124f5ace44727ff538132ca3be21259e1d48c3c3
repo_path: modules/tools
2 changes: 1 addition & 1 deletion make/_shared/go/base/.github/workflows/govulncheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: |
make print-go-version >> "$GITHUB_OUTPUT"

- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
with:
go-version: ${{ steps.go-version.outputs.result }}

Expand Down
34 changes: 17 additions & 17 deletions make/_shared/kind/00_kind_image_versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
# This file is auto-generated by the learn_kind_images.sh script in the makefile-modules repo.
# Do not edit manually.

kind_image_kindversion := v0.24.0
kind_image_kindversion := v0.25.0

kind_image_kube_1.25_amd64 := docker.io/kindest/node:v1.25.16@sha256:fedeb7ebef9794b3acbe656901f87231fb33381e0f586033ed18d2587bd9b73d
kind_image_kube_1.25_arm64 := docker.io/kindest/node:v1.25.16@sha256:f16a9c7caa65d394176ce2e628eb371d5af8b7bd913e88c826a357cadde698c7
kind_image_kube_1.26_amd64 := docker.io/kindest/node:v1.26.15@sha256:290e3765fbabbeb2ddcde36bdf3e8452166dc94a4c970a25c10290ebd480ca6e
kind_image_kube_1.26_arm64 := docker.io/kindest/node:v1.26.15@sha256:7b34bc4f381a4aa0bd81239bbc2af5f44d933c11b3510da85f13cf8b2a34c9fd
kind_image_kube_1.27_amd64 := docker.io/kindest/node:v1.27.16@sha256:84aff282b523c3943c374d95807e1e748ccd43432dce614d6c7a148a7028fb01
kind_image_kube_1.27_arm64 := docker.io/kindest/node:v1.27.16@sha256:2c6de687b6ea20b385c0b18b85d4e55e214882b3cbde857974ccfe010f4a90a9
kind_image_kube_1.28_amd64 := docker.io/kindest/node:v1.28.13@sha256:d97df9fff48099bf9a94c92fdc39adde65bec2aa1d011f84233b96172c1003c9
kind_image_kube_1.28_arm64 := docker.io/kindest/node:v1.28.13@sha256:ddef612bb93a9aa3a989f9d3d4e01c0a7c4d866a4b949264146c182cd202d738
kind_image_kube_1.29_amd64 := docker.io/kindest/node:v1.29.8@sha256:b69a150f9951ef41158ec76de381a920df2be3582fd16fc19cf4757eef0dded9
kind_image_kube_1.29_arm64 := docker.io/kindest/node:v1.29.8@sha256:0d5623800cf6290edbc1007ca8a33a5f7e2ad92b41dc7022b4d20a66447db23c
kind_image_kube_1.30_amd64 := docker.io/kindest/node:v1.30.4@sha256:34cb98a38a57a3357fde925a41d61232bbbbeb411b45a25c0d766635d6c3b975
kind_image_kube_1.30_arm64 := docker.io/kindest/node:v1.30.4@sha256:6becd630a18e77730e31f3833f0b129bbcc9c09ee49c3b88429b3c1fdc30bfc4
kind_image_kube_1.31_amd64 := docker.io/kindest/node:v1.31.0@sha256:919a65376fd11b67df05caa2e60802ad5de2fca250c9fe0c55b0dce5c9591af3
kind_image_kube_1.31_arm64 := docker.io/kindest/node:v1.31.0@sha256:0ccfb11dc66eae4abc20c30ee95687bab51de8aeb04e325e1c49af0890646548
kind_image_kube_1.26_amd64 := docker.io/kindest/node:v1.26.15@sha256:70c6ccbd3ed58116ad489691148e0437d390ae4349d6990b9aa3863b5c5cc508
kind_image_kube_1.26_arm64 := docker.io/kindest/node:v1.26.15@sha256:83d636689f447921fdf13439391b252eebf471329f3d28a565d5a1a446d73cf7
kind_image_kube_1.27_amd64 := docker.io/kindest/node:v1.27.16@sha256:9a08bfb799b90527eb58f0c3ac54252c3578d93758bae768e975f1bd7ba3bca0
kind_image_kube_1.27_arm64 := docker.io/kindest/node:v1.27.16@sha256:637860d14e28d47c3ef1fe85bed7962a89269dfe6cb0fc6984fa98d61735a54e
kind_image_kube_1.28_amd64 := docker.io/kindest/node:v1.28.15@sha256:af665d70820b816eb1384b9f715f608dca9c625014ebbfa59415dcf703860e93
kind_image_kube_1.28_arm64 := docker.io/kindest/node:v1.28.15@sha256:4659eb060ae96f79dd9f66a54671dc5a6cd3ca83c7bdd765ad13c76dae510b18
kind_image_kube_1.29_amd64 := docker.io/kindest/node:v1.29.10@sha256:f2dc4d5c4a2ccbeadbc4da7e897710ccbf89c098c534c5850fcc26f6e91af81c
kind_image_kube_1.29_arm64 := docker.io/kindest/node:v1.29.10@sha256:0b6b641e44a02f75c3b6607de82598bdb5972c9f4b01572f2e7ecb32f717b35a
kind_image_kube_1.30_amd64 := docker.io/kindest/node:v1.30.6@sha256:2f2a7cddf4080e72da3c12372e6895027c6829df83f5ba3c4c9f1b4acd132aa6
kind_image_kube_1.30_arm64 := docker.io/kindest/node:v1.30.6@sha256:211095e72afdd11964c0afca8a891a60e66e523aac9f3fff2b87ece71eedf8ba
kind_image_kube_1.31_amd64 := docker.io/kindest/node:v1.31.2@sha256:0526eb5cd8d892ed79b56feb48d17eeee1f719f55d5c35cef468f053caffad32
kind_image_kube_1.31_arm64 := docker.io/kindest/node:v1.31.2@sha256:d60ac67de1482e71ea626ac98556cf5833c5c4bdedcf92ea158df61ea9eeaf5e
kind_image_kube_1.32_amd64 := docker.io/kindest/node:v1.32.0@sha256:dbfe3fe9f25dc234af268f5ac9a945e421ac43a30df02acae8c98224523f89f1
kind_image_kube_1.32_arm64 := docker.io/kindest/node:v1.32.0@sha256:4487ecad11a7bba166ab8781c5f5e914f33fb13215c6cacf8a9ce93e33c56923

kind_image_latest_amd64 := $(kind_image_kube_1.31_amd64)
kind_image_latest_arm64 := $(kind_image_kube_1.31_arm64)
kind_image_latest_amd64 := $(kind_image_kube_1.32_amd64)
kind_image_latest_arm64 := $(kind_image_kube_1.32_arm64)
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
run: |
make print-go-version >> "$GITHUB_OUTPUT"

- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
with:
go-version: ${{ steps.go-version.outputs.result }}

Expand Down
10 changes: 5 additions & 5 deletions make/_shared/tools/00_mod.mk
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ tools += helm=v3.15.4
# https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
tools += kubectl=v1.31.0
# https://github.com/kubernetes-sigs/kind/releases
tools += kind=v0.24.0
tools += kind=v0.25.0
# https://www.vaultproject.io/downloads
tools += vault=1.17.3
# https://github.com/Azure/azure-workload-identity/releases
Expand Down Expand Up @@ -416,10 +416,10 @@ $(DOWNLOAD_DIR)/tools/kubectl@$(KUBECTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DO
$(checkhash_script) $(outfile) $(kubectl_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
chmod +x $(outfile)

kind_linux_amd64_SHA256SUM=b89aada5a39d620da3fcd16435b7f28d858927dd53f92cbac77686b0588b600d
kind_linux_arm64_SHA256SUM=2968808d916e12d0a25c56d07c9a1c987163f972513fa8a94a2125a69f9c50eb
kind_darwin_amd64_SHA256SUM=6cf7ba50b37d3446153bbfb8990f03fb8102778898c84502cdb841710b499ed5
kind_darwin_arm64_SHA256SUM=8e34f2edc7efc5c7c160487251848a954cd60ccd52b56a3fc360eaab33543fc0
kind_linux_amd64_SHA256SUM=b22ff7e5c02b8011e82cc3223d069d178b9e1543f1deb21e936d11764780a3d8
kind_linux_arm64_SHA256SUM=06e544e3f12ea54de5962ceaecd97513a25dbab4168a44f03f01833349afdda3
kind_darwin_amd64_SHA256SUM=180404ae1c0de8d333583d2958cdfac5338ec3e32cd765a158cfd6d09eb8cd7d
kind_darwin_arm64_SHA256SUM=222701bb72ff596928c57b3c64ca3e0b969d593ef24ccc790f9c17904e7b63ea

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