Skip to content

Commit f1d25e7

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #1762 from cert-manager/self-upgrade-master
[CI] Merge self-upgrade-master into master
2 parents 309edb1 + 4556562 commit f1d25e7

File tree

6 files changed

+28
-27
lines changed

6 files changed

+28
-27
lines changed

‎.github/renovate.json5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
'Renovate Bot <[email protected]>',
1010
'cert-manager-bot <[email protected]>',
1111
],
12-
recreateWhen: 'always', // TODO: Remove; temporary fix to force Renovate to ignore "foreign" commits
1312
enabledManagers: [
1413
'github-actions',
1514
'gomod',
@@ -19,6 +18,7 @@
1918
':gitSignOff',
2019
':semanticCommits',
2120
':disableVulnerabilityAlerts',
21+
':rebaseStalePrs',
2222
':prConcurrentLimit10', // Set a limit to avoid too many PRs, at least on the first run
2323
':prHourlyLimitNone',
2424
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
exit 1
3333
3434
- name: Octo STS Token Exchange
35-
uses: octo-sts/action@e480437973a6f6ac2e9caa40ecabedc870d76395 # main
35+
uses: octo-sts/action@e480437973a6f6ac2e9caa40ecabedc870d76395 # v1.0.1
3636
id: octo-sts
3737
with:
3838
scope: 'cert-manager/website'

‎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: 98efb5b02d10ff6ec939a79e06c554a954fbc882
13+
repo_hash: 45ab2e75a4c1e74a5a37ed62b8def1e56fa4eca8
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: 98efb5b02d10ff6ec939a79e06c554a954fbc882
18+
repo_hash: 45ab2e75a4c1e74a5a37ed62b8def1e56fa4eca8
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: 98efb5b02d10ff6ec939a79e06c554a954fbc882
23+
repo_hash: 45ab2e75a4c1e74a5a37ed62b8def1e56fa4eca8
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: 98efb5b02d10ff6ec939a79e06c554a954fbc882
28+
repo_hash: 45ab2e75a4c1e74a5a37ed62b8def1e56fa4eca8
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: 98efb5b02d10ff6ec939a79e06c554a954fbc882
33+
repo_hash: 45ab2e75a4c1e74a5a37ed62b8def1e56fa4eca8
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: 98efb5b02d10ff6ec939a79e06c554a954fbc882
38+
repo_hash: 45ab2e75a4c1e74a5a37ed62b8def1e56fa4eca8
3939
repo_path: modules/tools

‎make/_shared/repository-base/base/.github/renovate.json5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
'Renovate Bot <[email protected]>',
1010
'cert-manager-bot <[email protected]>',
1111
],
12-
recreateWhen: 'always', // TODO: Remove; temporary fix to force Renovate to ignore "foreign" commits
1312
enabledManagers: [
1413
'github-actions',
1514
'gomod',
@@ -19,6 +18,7 @@
1918
':gitSignOff',
2019
':semanticCommits',
2120
':disableVulnerabilityAlerts',
21+
':rebaseStalePrs',
2222
':prConcurrentLimit10', // Set a limit to avoid too many PRs, at least on the first run
2323
':prHourlyLimitNone',
2424
],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
exit 1
3333
3434
- name: Octo STS Token Exchange
35-
uses: octo-sts/action@e480437973a6f6ac2e9caa40ecabedc870d76395 # main
35+
uses: octo-sts/action@e480437973a6f6ac2e9caa40ecabedc870d76395 # v1.0.1
3636
id: octo-sts
3737
with:
3838
scope: '{{REPLACE:GH-REPOSITORY}}'

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

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ tools :=
6565
tools += helm=v3.18.6
6666
# https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
6767
# renovate: datasource=github-releases packageName=kubernetes/kubernetes
68-
tools += kubectl=v1.33.3
68+
tools += kubectl=v1.34.0
6969
# https://github.com/kubernetes-sigs/kind/releases
7070
# renovate: datasource=github-releases packageName=kubernetes-sigs/kind
7171
tools += kind=v0.30.0
@@ -98,7 +98,7 @@ tools += ytt=v0.52.0
9898
tools += rclone=v1.71.0
9999
# https://github.com/istio/istio/releases
100100
# renovate: datasource=github-releases packageName=istio/istio
101-
tools += istioctl=1.27.0
101+
tools += istioctl=1.27.1
102102

103103
### go packages
104104
# https://pkg.go.dev/sigs.k8s.io/controller-tools/cmd/controller-gen?tab=versions
@@ -149,7 +149,7 @@ tools += ginkgo=$(detected_ginkgo_version)
149149
tools += klone=v0.2.0
150150
# https://pkg.go.dev/github.com/goreleaser/goreleaser/v2?tab=versions
151151
# renovate: datasource=go packageName=github.com/goreleaser/goreleaser/v2
152-
tools += goreleaser=v2.11.2
152+
tools += goreleaser=v2.12.0
153153
# https://pkg.go.dev/github.com/anchore/syft/cmd/syft?tab=versions
154154
# renovate: datasource=go packageName=github.com/anchore/syft
155155
tools += syft=v1.32.0
@@ -203,7 +203,7 @@ tools += defaulter-gen=$(K8S_CODEGEN_VERSION)
203203
tools += conversion-gen=$(K8S_CODEGEN_VERSION)
204204
# https://github.com/kubernetes/kube-openapi
205205
# renovate: datasource=go packageName=k8s.io/kube-openapi
206-
tools += openapi-gen=v0.0.0-20250701173324-9bd5c66d9911
206+
tools += openapi-gen=v0.0.0-20250905212525-66792eed8611
207207

208208
# https://raw.githubusercontent.com/kubernetes-sigs/controller-tools/master/envtest-releases.yaml
209209
# FIXME: Find a way to configure Renovate to suggest upgrades
@@ -216,7 +216,8 @@ ADDITIONAL_TOOLS ?=
216216
tools += $(ADDITIONAL_TOOLS)
217217

218218
# https://go.dev/dl/
219-
VENDORED_GO_VERSION := 1.24.7
219+
# renovate: datasource=golang-version packageName=go
220+
VENDORED_GO_VERSION := 1.25.1
220221

221222
# Print the go version which can be used in GH actions
222223
.PHONY: print-go-version
@@ -439,10 +440,10 @@ $(call for_each_kv,go_dependency,$(go_dependencies))
439440
# File downloads #
440441
##################
441442

442-
go_linux_amd64_SHA256SUM=da18191ddb7db8a9339816f3e2b54bdded8047cdc2a5d67059478f8d1595c43f
443-
go_linux_arm64_SHA256SUM=fd2bccce882e29369f56c86487663bb78ba7ea9e02188a5b0269303a0c3d33ab
444-
go_darwin_amd64_SHA256SUM=138b6be2138e83d2c90c23d3a2cc94fcb11864d8db0706bb1d1e0dde744dc46a
445-
go_darwin_arm64_SHA256SUM=d06bad763f8820d3e29ee11f2c0c71438903c007e772a159c5760a300298302e
443+
go_linux_amd64_SHA256SUM=7716a0d940a0f6ae8e1f3b3f4f36299dc53e31b16840dbd171254312c41ca12e
444+
go_linux_arm64_SHA256SUM=65a3e34fb2126f55b34e1edfc709121660e1be2dee6bdf405fc399a63a95a87d
445+
go_darwin_amd64_SHA256SUM=1d622468f767a1b9fe1e1e67bd6ce6744d04e0c68712adc689748bbeccb126bb
446+
go_darwin_arm64_SHA256SUM=68deebb214f39d542e518ebb0598a406ab1b5a22bba8ec9ade9f55fb4dd94a6c
446447

447448
.PRECIOUS: $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz
448449
$(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools
@@ -464,10 +465,10 @@ $(DOWNLOAD_DIR)/tools/helm@$(HELM_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD
464465
chmod +x $(outfile); \
465466
rm -f $(outfile).tar.gz
466467

467-
kubectl_linux_amd64_SHA256SUM=2fcf65c64f352742dc253a25a7c95617c2aba79843d1b74e585c69fe4884afb0
468-
kubectl_linux_arm64_SHA256SUM=3d514dbae5dc8c09f773df0ef0f5d449dfad05b3aca5c96b13565f886df345fd
469-
kubectl_darwin_amd64_SHA256SUM=9652b55a58e84454196a7b9009f6d990d3961e2bd4bd03f64111d959282b46b1
470-
kubectl_darwin_arm64_SHA256SUM=3de173356753bacb215e6dc7333f896b7f6ab70479362146c6acca6e608b3f53
468+
kubectl_linux_amd64_SHA256SUM=cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c
469+
kubectl_linux_arm64_SHA256SUM=00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0
470+
kubectl_darwin_amd64_SHA256SUM=a5904061dd5c8e57d55e52c78fa23790e76de30924b26ba31be891e75710d7a9
471+
kubectl_darwin_arm64_SHA256SUM=d491f4c47c34856188d38e87a27866bd94a66a57b8db3093a82ae43baf3bb20d
471472

472473
.PRECIOUS: $(DOWNLOAD_DIR)/tools/kubectl@$(KUBECTL_VERSION)_$(HOST_OS)_$(HOST_ARCH)
473474
$(DOWNLOAD_DIR)/tools/kubectl@$(KUBECTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools
@@ -641,10 +642,10 @@ $(DOWNLOAD_DIR)/tools/rclone@$(RCLONE_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWN
641642
chmod +x $(outfile); \
642643
rm -f $(outfile).zip
643644

644-
istioctl_linux_amd64_SHA256SUM=6a53887fefe82696832d5d51b43fca053cbdd88b4a1f7bc361e9c950aa538132
645-
istioctl_linux_arm64_SHA256SUM=fe9c307b28bac7f01efed40ef4fdfd342ace5db8920c7025a618c5418c9ab1df
646-
istioctl_darwin_amd64_SHA256SUM=4b65d618f1b4709bb9e5676ac08326c3a8f18d0570efa4aed5be1a08763707cc
647-
istioctl_darwin_arm64_SHA256SUM=df21f431f0c5c9e52ef2b56a5ebc822934b443c38bda7f93a5b1011d7750376a
645+
istioctl_linux_amd64_SHA256SUM=554bff365fda222280bc02d89a59ffc6c9c9b560a75508789a093ed0a3c4931b
646+
istioctl_linux_arm64_SHA256SUM=966bdd32a216dfcc74d7634e75e69f0ac8ca744412261d41021ddcf1c7622799
647+
istioctl_darwin_amd64_SHA256SUM=eb353c4b381ca04337a68da2f7ca3702d4f6dce9d582f576b39b1cfa7a7c49df
648+
istioctl_darwin_arm64_SHA256SUM=decd937baf43055f876a72b33a56d5ac1f366826f4023a8f4d97d023b1231937
648649

649650
.PRECIOUS: $(DOWNLOAD_DIR)/tools/istioctl@$(ISTIOCTL_VERSION)_$(HOST_OS)_$(HOST_ARCH)
650651
$(DOWNLOAD_DIR)/tools/istioctl@$(ISTIOCTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools

0 commit comments

Comments
 (0)