Skip to content

Commit 5a44686

Browse files
erikgberikgb
authored
Merge pull request #1750 from erikgb/manual-self-upgrade
Manual self-upgrade
2 parents 15b5e98 + d268f89 commit 5a44686

File tree

6 files changed

+63
-44
lines changed

6 files changed

+63
-44
lines changed

‎.github/renovate.json5‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
enabledManagers: [
88
'gomod',
99
],
10-
separateMajorMinor: false,
1110
extends: [
1211
'config:best-practices',
1312
':gitSignOff',

‎.github/workflows/renovate.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
go-version: ${{ steps.go-version.outputs.result }}
4545

4646
- name: Self-hosted Renovate
47-
uses: renovatebot/github-action@b11417b9eaac3145fe9a8544cee66503724e32b6 # v43.0.8
47+
uses: renovatebot/github-action@a447f09147d00e00ae2a82ad5ef51ca89352da80 # v43.0.9
4848
with:
4949
configurationFile: .github/renovate.json5
5050
token: ${{ secrets.GITHUB_TOKEN }}
@@ -53,4 +53,4 @@ jobs:
5353
RENOVATE_ONBOARDING: "false"
5454
RENOVATE_PLATFORM: "github"
5555
LOG_LEVEL: "debug"
56-
RENOVATE_ALLOWED_COMMANDS: '["make generate"]'
56+
RENOVATE_ALLOWED_COMMANDS: '[".*"]'

‎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: 63051131d09a2665195d8a045b1a07034468fe20
13+
repo_hash: 15b0f37155c85f6d0daa503761c5ccff96456ae2
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: 63051131d09a2665195d8a045b1a07034468fe20
18+
repo_hash: 15b0f37155c85f6d0daa503761c5ccff96456ae2
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: 63051131d09a2665195d8a045b1a07034468fe20
23+
repo_hash: 15b0f37155c85f6d0daa503761c5ccff96456ae2
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: 63051131d09a2665195d8a045b1a07034468fe20
28+
repo_hash: 15b0f37155c85f6d0daa503761c5ccff96456ae2
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: 63051131d09a2665195d8a045b1a07034468fe20
33+
repo_hash: 15b0f37155c85f6d0daa503761c5ccff96456ae2
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: 63051131d09a2665195d8a045b1a07034468fe20
38+
repo_hash: 15b0f37155c85f6d0daa503761c5ccff96456ae2
3939
repo_path: modules/tools

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
enabledManagers: [
88
'gomod',
99
],
10-
separateMajorMinor: false,
1110
extends: [
1211
'config:best-practices',
1312
':gitSignOff',

‎make/_shared/repository-base/base-dependabot/.github/workflows/renovate.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
go-version: ${{ steps.go-version.outputs.result }}
4545

4646
- name: Self-hosted Renovate
47-
uses: renovatebot/github-action@b11417b9eaac3145fe9a8544cee66503724e32b6 # v43.0.8
47+
uses: renovatebot/github-action@a447f09147d00e00ae2a82ad5ef51ca89352da80 # v43.0.9
4848
with:
4949
configurationFile: .github/renovate.json5
5050
token: ${{ secrets.GITHUB_TOKEN }}
@@ -53,4 +53,4 @@ jobs:
5353
RENOVATE_ONBOARDING: "false"
5454
RENOVATE_PLATFORM: "github"
5555
LOG_LEVEL: "debug"
56-
RENOVATE_ALLOWED_COMMANDS: '["make generate"]'
56+
RENOVATE_ALLOWED_COMMANDS: '[".*"]'

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

Lines changed: 53 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -61,35 +61,47 @@ NEEDS_CTR = __require-ctr
6161

6262
tools :=
6363
# https://github.com/helm/helm/releases
64-
tools += helm=v3.18.4
64+
# renovate: datasource=github-releases packageName=helm/helm
65+
tools += helm=v3.18.6
6566
# https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
6667
tools += kubectl=v1.33.3
6768
# https://github.com/kubernetes-sigs/kind/releases
68-
tools += kind=v0.29.0
69+
# renovate: datasource=github-releases packageName=kubernetes-sigs/kind
70+
tools += kind=v0.30.0
6971
# https://www.vaultproject.io/downloads
7072
tools += vault=1.20.2
7173
# https://github.com/Azure/azure-workload-identity/releases
74+
# renovate: datasource=github-releases packageName=Azure/azure-workload-identity
7275
tools += azwi=v1.5.1
7376
# https://github.com/kyverno/kyverno/releases
74-
tools += kyverno=v1.15.0
77+
# renovate: datasource=github-releases packageName=kyverno/kyverno
78+
tools += kyverno=v1.15.1
7579
# https://github.com/mikefarah/yq/releases
80+
# renovate: datasource=github-releases packageName=mikefarah/yq
7681
tools += yq=v4.47.1
7782
# https://github.com/ko-build/ko/releases
83+
# renovate: datasource=github-releases packageName=ko-build/ko
7884
tools += ko=0.18.0
7985
# https://github.com/protocolbuffers/protobuf/releases
86+
# renovate: datasource=github-releases packageName=protocolbuffers/protobuf
8087
tools += protoc=31.1
8188
# https://github.com/aquasecurity/trivy/releases
89+
# renovate: datasource=github-releases packageName=aquasecurity/trivy
8290
tools += trivy=v0.65.0
8391
# https://github.com/vmware-tanzu/carvel-ytt/releases
92+
# renovate: datasource=github-releases packageName=vmware-tanzu/carvel-ytt
8493
tools += ytt=v0.52.0
8594
# https://github.com/rclone/rclone/releases
86-
tools += rclone=v1.70.3
95+
# renovate: datasource=github-releases packageName=rclone/rclone
96+
tools += rclone=v1.71.0
8797
# https://github.com/istio/istio/releases
88-
tools += istioctl=1.26.3
98+
# renovate: datasource=github-releases packageName=istio/istio
99+
tools += istioctl=1.27.0
89100

90101
### go packages
91102
# https://pkg.go.dev/sigs.k8s.io/controller-tools/cmd/controller-gen?tab=versions
92-
tools += controller-gen=v0.18.0
103+
# renovate: datasource=go packageName=sigs.k8s.io/controller-tools
104+
tools += controller-gen=v0.19.0
93105
# https://pkg.go.dev/golang.org/x/tools/cmd/goimports?tab=versions
94106
tools += goimports=v0.35.0
95107
# https://pkg.go.dev/github.com/google/go-licenses/v2?tab=versions
@@ -126,10 +138,13 @@ tools += goreleaser=v2.11.2
126138
# https://pkg.go.dev/github.com/anchore/syft/cmd/syft?tab=versions
127139
tools += syft=v1.30.0
128140
# https://github.com/cert-manager/helm-tool/releases
141+
# renovate: datasource=github-releases packageName=cert-manager/helm-tool
129142
tools += helm-tool=v0.5.3
130143
# https://github.com/cert-manager/image-tool/releases
144+
# renovate: datasource=github-releases packageName=cert-manager/image-tool
131145
tools += image-tool=v0.1.0
132146
# https://github.com/cert-manager/cmctl/releases
147+
# renovate: datasource=github-releases packageName=cert-manager/cmctl
133148
tools += cmctl=v2.3.0
134149
# https://pkg.go.dev/github.com/cert-manager/release/cmd/cmrel?tab=versions
135150
tools += cmrel=e3cbe5171488deda000145003e22567bdce622ea
@@ -138,20 +153,26 @@ tools += golangci-lint=v2.3.0
138153
# https://pkg.go.dev/golang.org/x/vuln?tab=versions
139154
tools += govulncheck=v1.1.4
140155
# https://github.com/operator-framework/operator-sdk/releases
156+
# renovate: datasource=github-releases packageName=operator-framework/operator-sdk
141157
tools += operator-sdk=v1.41.1
142158
# https://pkg.go.dev/github.com/cli/cli/v2?tab=versions
143159
tools += gh=v2.76.2
144160
# https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases
145-
tools += preflight=1.14.0
161+
# renovate: datasource=github-releases packageName=redhat-openshift-ecosystem/openshift-preflight
162+
tools += preflight=1.14.1
146163
# https://github.com/daixiang0/gci/releases
164+
# renovate: datasource=github-releases packageName=daixiang0/gci
147165
tools += gci=v0.13.7
148166
# https://github.com/google/yamlfmt/releases
167+
# renovate: datasource=github-releases packageName=google/yamlfmt
149168
tools += yamlfmt=v0.17.2
150169
# https://github.com/yannh/kubeconform/releases
170+
# renovate: datasource=github-releases packageName=yannh/kubeconform
151171
tools += kubeconform=v0.7.0
152172

153173
# https://pkg.go.dev/k8s.io/code-generator/cmd?tab=versions
154-
K8S_CODEGEN_VERSION := v0.33.3
174+
# renovate: datasource=go packageName=k8s.io/code-generator
175+
K8S_CODEGEN_VERSION := v0.34.0
155176
tools += client-gen=$(K8S_CODEGEN_VERSION)
156177
tools += deepcopy-gen=$(K8S_CODEGEN_VERSION)
157178
tools += informer-gen=$(K8S_CODEGEN_VERSION)
@@ -405,10 +426,10 @@ $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz:
405426
$(CURL) https://go.dev/dl/go$(VENDORED_GO_VERSION).$(HOST_OS)-$(HOST_ARCH).tar.gz -o $(outfile); \
406427
$(checkhash_script) $(outfile) $(go_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM)
407428

408-
helm_linux_amd64_SHA256SUM=f8180838c23d7c7d797b208861fecb591d9ce1690d8704ed1e4cb8e2add966c1
409-
helm_linux_arm64_SHA256SUM=c0a45e67eef0c7416a8a8c9e9d5d2d30d70e4f4d3f7bea5de28241fffa8f3b89
410-
helm_darwin_amd64_SHA256SUM=860a7238285b44b5dc7b3c4dad6194316885d7015d77c34e23177e0e9554af8f
411-
helm_darwin_arm64_SHA256SUM=041849741550b20710d7ad0956e805ebd960b483fe978864f8e7fdd03ca84ec8
429+
helm_linux_amd64_SHA256SUM=3f43c0aa57243852dd542493a0f54f1396c0bc8ec7296bbb2c01e802010819ce
430+
helm_linux_arm64_SHA256SUM=5b8e00b6709caab466cbbb0bc29ee09059b8dc9417991dd04b497530e49b1737
431+
helm_darwin_amd64_SHA256SUM=80cad0470e38cf25731cdead7c32dfbeb887bc177bd6fa01e31b065722f8f06b
432+
helm_darwin_arm64_SHA256SUM=48e30d236a1f334c6acb78501be5a851eaa2a267fefeb1131b6484eb2f9f30d7
412433

413434
.PRECIOUS: $(DOWNLOAD_DIR)/tools/helm@$(HELM_VERSION)_$(HOST_OS)_$(HOST_ARCH)
414435
$(DOWNLOAD_DIR)/tools/helm@$(HELM_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools
@@ -431,10 +452,10 @@ $(DOWNLOAD_DIR)/tools/kubectl@$(KUBECTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DO
431452
$(checkhash_script) $(outfile) $(kubectl_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
432453
chmod +x $(outfile)
433454

434-
kind_linux_amd64_SHA256SUM=c72eda46430f065fb45c5f70e7c957cc9209402ef309294821978677c8fb3284
435-
kind_linux_arm64_SHA256SUM=03d45095dbd9cc1689f179a3e5e5da24b77c2d1b257d7645abf1b4174bebcf2a
436-
kind_darwin_amd64_SHA256SUM=3eb0d4de25b854f34ea8ce8a3cbe15054fc03bc962b03e96fd10664b829fb6ed
437-
kind_darwin_arm64_SHA256SUM=314d8f1428842fd1ba2110fd0052a0f0b3ab5773ab1bdcdad1ff036e913310c9
455+
kind_linux_amd64_SHA256SUM=517ab7fc89ddeed5fa65abf71530d90648d9638ef0c4cde22c2c11f8097b8889
456+
kind_linux_arm64_SHA256SUM=7ea2de9d2d190022ed4a8a4e3ac0636c8a455e460b9a13ccf19f15d07f4f00eb
457+
kind_darwin_amd64_SHA256SUM=4f0b6e3b88bdc66d922c08469f05ef507d4903dd236e6319199bb9c868eed274
458+
kind_darwin_arm64_SHA256SUM=ceaf40df1d1551c481fb50e3deb5c3deecad5fd599df5469626b70ddf52a1518
438459

439460
.PRECIOUS: $(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH)
440461
$(DOWNLOAD_DIR)/tools/kind@$(KIND_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools
@@ -489,10 +510,10 @@ $(DOWNLOAD_DIR)/tools/kube-apiserver@$(KUBEBUILDER_ASSETS_VERSION)_$(HOST_OS)_$(
489510
@source $(lock_script) $@; \
490511
tar xfO $< controller-tools/envtest/kube-apiserver > $(outfile) && chmod 775 $(outfile)
491512

492-
kyverno_linux_amd64_SHA256SUM=d5173342a6e3500f3fb1b9232ecaa8138b07663fd37c9aaa665c1d5cd2368a2b
493-
kyverno_linux_arm64_SHA256SUM=9f326e9cb0c42d3c5a8da268b02db7f3105c86aac4c410bbf60cb8c66c9e85e1
494-
kyverno_darwin_amd64_SHA256SUM=2eeb00d0a6878474bb15eff3f3fa3c9cd03edd8891aa93e7d155057bd6e08fa4
495-
kyverno_darwin_arm64_SHA256SUM=f43ee81b03fe261c09f07d5a4c3e1d196b73df895e6520ebb491adc34862b5ad
513+
kyverno_linux_amd64_SHA256SUM=6b252750af3063e698f4d72cbf7599e8b292bd710248e23d0b1c8935e88aee67
514+
kyverno_linux_arm64_SHA256SUM=de2a9398cd9d75747e0fd50ce824a31389663a0e50e62481ddf8f52a40172d24
515+
kyverno_darwin_amd64_SHA256SUM=6875b5836f188b089fe4af6d3be8709a61ccad46d7e39febf06472df19d171f5
516+
kyverno_darwin_arm64_SHA256SUM=a6a2a25b1d0ee1ea564cc3303434096f0313f45fdac1ec453b5f63586b2ebdfb
496517

497518
.PRECIOUS: $(DOWNLOAD_DIR)/tools/kyverno@$(KYVERNO_VERSION)_$(HOST_OS)_$(HOST_ARCH)
498519
$(DOWNLOAD_DIR)/tools/kyverno@$(KYVERNO_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools
@@ -580,10 +601,10 @@ $(DOWNLOAD_DIR)/tools/ytt@$(YTT_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_D
580601
$(checkhash_script) $(outfile) $(ytt_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
581602
chmod +x $(outfile)
582603

583-
rclone_linux_amd64_SHA256SUM=7d69057e69385f6514a9684c7eaa424d972096b130284bb34dd967c4ed4f9dad
584-
rclone_linux_arm64_SHA256SUM=1b08be34622f1f9bb9b069a85d036bba822b690790215c18a9418dbaf19505fe
585-
rclone_darwin_amd64_SHA256SUM=1616b25d5c5fd07a52498d09480a4fdbeb42e0d21cd3246d2d7df5dddd5ce35a
586-
rclone_darwin_arm64_SHA256SUM=14a9c5eb9f699a749470c898974412092eee204d74d3395486e3307c255021f7
604+
rclone_linux_amd64_SHA256SUM=3ddbcfd535ef2e6eb00cd006831766537f1fef1c8baeed1ee4632e7bcc699e93
605+
rclone_linux_arm64_SHA256SUM=b710ac2ded37261d2cc6ab046dcd644828944524cf1ee7c2b17dd746f0fd8684
606+
rclone_darwin_amd64_SHA256SUM=858fcdb96597776672c38416a4cdf72b87f5ed8e05353374c894b38ae381b965
607+
rclone_darwin_arm64_SHA256SUM=ee9964d24f1aed3f0a2183f5a93eeec29526782240435d4b3f302b45f6f34b61
587608

588609
.PRECIOUS: $(DOWNLOAD_DIR)/tools/rclone@$(RCLONE_VERSION)_$(HOST_OS)_$(HOST_ARCH)
589610
$(DOWNLOAD_DIR)/tools/rclone@$(RCLONE_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools
@@ -596,10 +617,10 @@ $(DOWNLOAD_DIR)/tools/rclone@$(RCLONE_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWN
596617
chmod +x $(outfile); \
597618
rm -f $(outfile).zip
598619

599-
istioctl_linux_amd64_SHA256SUM=3922c1f3a05ed471d3f75dc549a1f278ff2af30655077b814482ecda3dcbba4a
600-
istioctl_linux_arm64_SHA256SUM=84fec03a29872eace3c1279f09772e93d30796a1b74e90a24e8aebd113e9b002
601-
istioctl_darwin_amd64_SHA256SUM=84ba9e2d3912164d43700b26919c50c500046df0da846d3d2d16dcc291415d63
602-
istioctl_darwin_arm64_SHA256SUM=e225ab90c20b7bfecfc4ebc21afdab34a9e8e329d931b9d161a9f68f7aa03e85
620+
istioctl_linux_amd64_SHA256SUM=6a53887fefe82696832d5d51b43fca053cbdd88b4a1f7bc361e9c950aa538132
621+
istioctl_linux_arm64_SHA256SUM=fe9c307b28bac7f01efed40ef4fdfd342ace5db8920c7025a618c5418c9ab1df
622+
istioctl_darwin_amd64_SHA256SUM=4b65d618f1b4709bb9e5676ac08326c3a8f18d0570efa4aed5be1a08763707cc
623+
istioctl_darwin_arm64_SHA256SUM=df21f431f0c5c9e52ef2b56a5ebc822934b443c38bda7f93a5b1011d7750376a
603624

604625
.PRECIOUS: $(DOWNLOAD_DIR)/tools/istioctl@$(ISTIOCTL_VERSION)_$(HOST_OS)_$(HOST_ARCH)
605626
$(DOWNLOAD_DIR)/tools/istioctl@$(ISTIOCTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools
@@ -612,10 +633,10 @@ $(DOWNLOAD_DIR)/tools/istioctl@$(ISTIOCTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(
612633
chmod +x $(outfile); \
613634
rm $(outfile).tar.gz
614635

615-
preflight_linux_amd64_SHA256SUM=69f8b249538adf0edcfcfcc82eea5d5aae44e4d2171ced581cd75a220624d25e
616-
preflight_linux_arm64_SHA256SUM=d71bea7bc540d93268e361d8480b9c370a715ffc69db5dadd44bd90fd461d9ee
617-
preflight_darwin_amd64_SHA256SUM=7a47d614fe5cfaf7181005a7eda38ed9c1aca89145bf41fbcd067e9377ef03d7
618-
preflight_darwin_arm64_SHA256SUM=d662d466491bef31b973e73779cbd387cc848610e9b945667c38ee3e93ca2fdc
636+
preflight_linux_amd64_SHA256SUM=cd1b6143fb511433d07f29075b4840b712933d7d4d4fc6353b079b59c1cb06cd
637+
preflight_linux_arm64_SHA256SUM=cd29e198bd54cec46b219fc151b1b9c8fe71c33e7fdab7814862736a309a2a7c
638+
preflight_darwin_amd64_SHA256SUM=7e03a564cfb1697a6a3179c5d2f6f0a861a14bf4443f553d946f92ac06376b98
639+
preflight_darwin_arm64_SHA256SUM=216b5f8846b6d3292bb798765a63f935627c36285fcba649ddab535973e70914
619640

620641
.PRECIOUS: $(DOWNLOAD_DIR)/tools/preflight@$(PREFLIGHT_VERSION)_$(HOST_OS)_$(HOST_ARCH)
621642
$(DOWNLOAD_DIR)/tools/preflight@$(PREFLIGHT_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools

0 commit comments

Comments
 (0)