Skip to content

Commit 4cc839d

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #106 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents ef0d23e + 70c0212 commit 4cc839d

File tree

4 files changed

+75
-27
lines changed

4 files changed

+75
-27
lines changed

‎.github/renovate.json5‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
{
55
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
66
enabled: true,
7-
gitAuthor: 'cert-manager-bot <[email protected]>',
7+
gitAuthor: 'Renovate Bot <[email protected]>',
8+
recreateWhen: 'always', // TODO: Remove; temporary fix to force Renovate to ignore "foreign" commits
89
enabledManagers: [
910
'gomod',
1011
],
@@ -36,8 +37,9 @@
3637
matchManagers: [
3738
'gomod',
3839
],
39-
matchPackageNames: [
40-
'*',
40+
matchUpdateTypes: [
41+
'minor',
42+
'patch',
4143
],
4244
},
4345
{
@@ -50,6 +52,10 @@
5052
'github.com/onsi/gomega',
5153
'github.com/stretchr/testify',
5254
],
55+
matchUpdateTypes: [
56+
'minor',
57+
'patch',
58+
]
5359
},
5460
{
5561
groupName: 'Cloud Go deps',
@@ -65,6 +71,10 @@
6571
'github.com/digitalocean/**',
6672
'google.golang.org/api',
6773
],
74+
matchUpdateTypes: [
75+
'minor',
76+
'patch',
77+
]
6878
},
6979
{
7080
groupName: 'Kubernetes Go deps',
@@ -75,6 +85,10 @@
7585
'sigs.k8s.io/**',
7686
'k8s.io/**',
7787
],
88+
matchUpdateTypes: [
89+
'minor',
90+
'patch',
91+
]
7892
},
7993
{
8094
groupName: 'Kubernetes Go patches',
@@ -104,12 +118,22 @@
104118
],
105119
},
106120
{
107-
description: 'Disable Go pseudo-version updates',
121+
matchManagers: [
122+
'gomod',
123+
],
124+
matchUpdateTypes: [
125+
'major',
126+
'digest',
127+
],
128+
dependencyDashboardApproval: true
129+
},
130+
{
131+
description: 'Disable (internal) cert-manager pseudo-version updates',
108132
matchManagers: [
109133
'gomod',
110134
],
111135
matchPackageNames: [
112-
'*',
136+
'github.com/cert-manager/**',
113137
],
114138
matchCurrentValue: 'v0.0.0*',
115139
enabled: false,

‎klone.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,55 +9,55 @@ targets:
99
- folder_name: boilerplate
1010
repo_url: https://github.com/cert-manager/makefile-modules.git
1111
repo_ref: main
12-
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
12+
repo_hash: 63afb5c9df5725b127e132082e1c35997bd8e516
1313
repo_path: modules/boilerplate
1414
- folder_name: cert-manager
1515
repo_url: https://github.com/cert-manager/makefile-modules.git
1616
repo_ref: main
17-
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
17+
repo_hash: 63afb5c9df5725b127e132082e1c35997bd8e516
1818
repo_path: modules/cert-manager
1919
- folder_name: controller-gen
2020
repo_url: https://github.com/cert-manager/makefile-modules.git
2121
repo_ref: main
22-
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
22+
repo_hash: 63afb5c9df5725b127e132082e1c35997bd8e516
2323
repo_path: modules/controller-gen
2424
- folder_name: generate-verify
2525
repo_url: https://github.com/cert-manager/makefile-modules.git
2626
repo_ref: main
27-
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
27+
repo_hash: 63afb5c9df5725b127e132082e1c35997bd8e516
2828
repo_path: modules/generate-verify
2929
- folder_name: go
3030
repo_url: https://github.com/cert-manager/makefile-modules.git
3131
repo_ref: main
32-
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
32+
repo_hash: 63afb5c9df5725b127e132082e1c35997bd8e516
3333
repo_path: modules/go
3434
- folder_name: help
3535
repo_url: https://github.com/cert-manager/makefile-modules.git
3636
repo_ref: main
37-
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
37+
repo_hash: 63afb5c9df5725b127e132082e1c35997bd8e516
3838
repo_path: modules/help
3939
- folder_name: kind
4040
repo_url: https://github.com/cert-manager/makefile-modules.git
4141
repo_ref: main
42-
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
42+
repo_hash: 63afb5c9df5725b127e132082e1c35997bd8e516
4343
repo_path: modules/kind
4444
- folder_name: klone
4545
repo_url: https://github.com/cert-manager/makefile-modules.git
4646
repo_ref: main
47-
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
47+
repo_hash: 63afb5c9df5725b127e132082e1c35997bd8e516
4848
repo_path: modules/klone
4949
- folder_name: oci-build
5050
repo_url: https://github.com/cert-manager/makefile-modules.git
5151
repo_ref: main
52-
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
52+
repo_hash: 63afb5c9df5725b127e132082e1c35997bd8e516
5353
repo_path: modules/oci-build
5454
- folder_name: repository-base
5555
repo_url: https://github.com/cert-manager/makefile-modules.git
5656
repo_ref: main
57-
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
57+
repo_hash: 63afb5c9df5725b127e132082e1c35997bd8e516
5858
repo_path: modules/repository-base
5959
- folder_name: tools
6060
repo_url: https://github.com/cert-manager/makefile-modules.git
6161
repo_ref: main
62-
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
62+
repo_hash: 63afb5c9df5725b127e132082e1c35997bd8e516
6363
repo_path: modules/tools

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

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
{
55
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
66
enabled: true,
7-
gitAuthor: 'cert-manager-bot <[email protected]>',
7+
gitAuthor: 'Renovate Bot <[email protected]>',
8+
recreateWhen: 'always', // TODO: Remove; temporary fix to force Renovate to ignore "foreign" commits
89
enabledManagers: [
910
'gomod',
1011
],
@@ -36,8 +37,9 @@
3637
matchManagers: [
3738
'gomod',
3839
],
39-
matchPackageNames: [
40-
'*',
40+
matchUpdateTypes: [
41+
'minor',
42+
'patch',
4143
],
4244
},
4345
{
@@ -50,6 +52,10 @@
5052
'github.com/onsi/gomega',
5153
'github.com/stretchr/testify',
5254
],
55+
matchUpdateTypes: [
56+
'minor',
57+
'patch',
58+
]
5359
},
5460
{
5561
groupName: 'Cloud Go deps',
@@ -65,6 +71,10 @@
6571
'github.com/digitalocean/**',
6672
'google.golang.org/api',
6773
],
74+
matchUpdateTypes: [
75+
'minor',
76+
'patch',
77+
]
6878
},
6979
{
7080
groupName: 'Kubernetes Go deps',
@@ -75,6 +85,10 @@
7585
'sigs.k8s.io/**',
7686
'k8s.io/**',
7787
],
88+
matchUpdateTypes: [
89+
'minor',
90+
'patch',
91+
]
7892
},
7993
{
8094
groupName: 'Kubernetes Go patches',
@@ -104,12 +118,22 @@
104118
],
105119
},
106120
{
107-
description: 'Disable Go pseudo-version updates',
121+
matchManagers: [
122+
'gomod',
123+
],
124+
matchUpdateTypes: [
125+
'major',
126+
'digest',
127+
],
128+
dependencyDashboardApproval: true
129+
},
130+
{
131+
description: 'Disable (internal) cert-manager pseudo-version updates',
108132
matchManagers: [
109133
'gomod',
110134
],
111135
matchPackageNames: [
112-
'*',
136+
'github.com/cert-manager/**',
113137
],
114138
matchCurrentValue: 'v0.0.0*',
115139
enabled: false,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ tools += goimports=v0.35.0
109109
# https://pkg.go.dev/github.com/google/go-licenses/v2?tab=versions
110110
tools += go-licenses=e4be799587800ffd119a1b419f13daf4989da546
111111
# https://pkg.go.dev/gotest.tools/gotestsum?tab=versions
112-
# renovate: datasource=go packageName=gotest.tool/gotestsum
112+
# renovate: datasource=github-releases packageName=gotestyourself/gotestsum
113113
tools += gotestsum=v1.12.3
114114
# https://pkg.go.dev/sigs.k8s.io/kustomize/kustomize/v5?tab=versions
115115
# renovate: datasource=go packageName=sigs.k8s.io/kustomize/kustomize/v5
@@ -211,7 +211,7 @@ ADDITIONAL_TOOLS ?=
211211
tools += $(ADDITIONAL_TOOLS)
212212

213213
# https://go.dev/dl/
214-
VENDORED_GO_VERSION := 1.24.6
214+
VENDORED_GO_VERSION := 1.24.7
215215

216216
# Print the go version which can be used in GH actions
217217
.PHONY: print-go-version
@@ -433,10 +433,10 @@ $(call for_each_kv,go_dependency,$(go_dependencies))
433433
# File downloads #
434434
##################
435435

436-
go_linux_amd64_SHA256SUM=bbca37cc395c974ffa4893ee35819ad23ebb27426df87af92e93a9ec66ef8712
437-
go_linux_arm64_SHA256SUM=124ea6033a8bf98aa9fbab53e58d134905262d45a022af3a90b73320f3c3afd5
438-
go_darwin_amd64_SHA256SUM=4a8d7a32052f223e71faab424a69430455b27b3fff5f4e651f9d97c3e51a8746
439-
go_darwin_arm64_SHA256SUM=4e29202c49573b953be7cc3500e1f8d9e66ddd12faa8cf0939a4951411e09a2a
436+
go_linux_amd64_SHA256SUM=da18191ddb7db8a9339816f3e2b54bdded8047cdc2a5d67059478f8d1595c43f
437+
go_linux_arm64_SHA256SUM=fd2bccce882e29369f56c86487663bb78ba7ea9e02188a5b0269303a0c3d33ab
438+
go_darwin_amd64_SHA256SUM=138b6be2138e83d2c90c23d3a2cc94fcb11864d8db0706bb1d1e0dde744dc46a
439+
go_darwin_arm64_SHA256SUM=d06bad763f8820d3e29ee11f2c0c71438903c007e772a159c5760a300298302e
440440

441441
.PRECIOUS: $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz
442442
$(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools

0 commit comments

Comments
 (0)