Skip to content

Commit ef0d23e

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #105 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents 677e3fa + 39e4d93 commit ef0d23e

File tree

3 files changed

+39
-37
lines changed

3 files changed

+39
-37
lines changed

‎.github/renovate.json5‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
],
3030
executionMode: 'branch',
3131
},
32+
// packageRules uses globs for matchPackageNames. Some packages have a separate major version i.e. /v on them which is when we would need package**/**.
3233
packageRules: [
3334
{
3435
groupName: 'Misc Go deps',
@@ -45,9 +46,9 @@
4546
'gomod',
4647
],
4748
matchPackageNames: [
48-
'github.com/onsi/ginkgo**/**',
49-
'github.com/onsi/gomega**/**',
50-
'github.com/stretchr/testify**/**',
49+
'github.com/onsi/ginkgo/**',
50+
'github.com/onsi/gomega',
51+
'github.com/stretchr/testify',
5152
],
5253
},
5354
{
@@ -56,12 +57,12 @@
5657
'gomod',
5758
],
5859
matchPackageNames: [
59-
'github.com/akamai**/**',
60-
'github.com/aws**/**',
61-
'github.com/Azure**/**',
62-
'github.com/AzureAD**/**',
63-
'github.com/cloudflare**/**',
64-
'github.com/digitalocean**/**',
60+
'github.com/akamai/**',
61+
'github.com/aws/**',
62+
'github.com/Azure/**',
63+
'github.com/AzureAD/**',
64+
'github.com/cloudflare/**',
65+
'github.com/digitalocean/**',
6566
'google.golang.org/api',
6667
],
6768
},
@@ -71,8 +72,8 @@
7172
'gomod',
7273
],
7374
matchPackageNames: [
74-
'sigs.k8s.io**/**',
75-
'k8s.io**/**',
75+
'sigs.k8s.io/**',
76+
'k8s.io/**',
7677
],
7778
},
7879
{
@@ -81,7 +82,7 @@
8182
'gomod',
8283
],
8384
matchPackageNames: [
84-
'k8s.io**/**',
85+
'k8s.io/**',
8586
],
8687
matchUpdateTypes: [
8788
'patch',
@@ -96,7 +97,7 @@
9697
'gomod',
9798
],
9899
matchPackageNames: [
99-
'golang.org/x**/*',
100+
'golang.org/x/**',
100101
],
101102
addLabels: [
102103
'skip-review', // Adding label to allow PRs to automerge

‎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: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
12+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
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: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
17+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
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: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
22+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
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: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
27+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
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: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
32+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
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: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
37+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
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: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
42+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
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: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
47+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
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: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
52+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
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: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
57+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
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: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
62+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
6363
repo_path: modules/tools

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

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
],
3030
executionMode: 'branch',
3131
},
32+
// packageRules uses globs for matchPackageNames. Some packages have a separate major version i.e. /v on them which is when we would need package**/**.
3233
packageRules: [
3334
{
3435
groupName: 'Misc Go deps',
@@ -45,9 +46,9 @@
4546
'gomod',
4647
],
4748
matchPackageNames: [
48-
'github.com/onsi/ginkgo**/**',
49-
'github.com/onsi/gomega**/**',
50-
'github.com/stretchr/testify**/**',
49+
'github.com/onsi/ginkgo/**',
50+
'github.com/onsi/gomega',
51+
'github.com/stretchr/testify',
5152
],
5253
},
5354
{
@@ -56,12 +57,12 @@
5657
'gomod',
5758
],
5859
matchPackageNames: [
59-
'github.com/akamai**/**',
60-
'github.com/aws**/**',
61-
'github.com/Azure**/**',
62-
'github.com/AzureAD**/**',
63-
'github.com/cloudflare**/**',
64-
'github.com/digitalocean**/**',
60+
'github.com/akamai/**',
61+
'github.com/aws/**',
62+
'github.com/Azure/**',
63+
'github.com/AzureAD/**',
64+
'github.com/cloudflare/**',
65+
'github.com/digitalocean/**',
6566
'google.golang.org/api',
6667
],
6768
},
@@ -71,8 +72,8 @@
7172
'gomod',
7273
],
7374
matchPackageNames: [
74-
'sigs.k8s.io**/**',
75-
'k8s.io**/**',
75+
'sigs.k8s.io/**',
76+
'k8s.io/**',
7677
],
7778
},
7879
{
@@ -81,7 +82,7 @@
8182
'gomod',
8283
],
8384
matchPackageNames: [
84-
'k8s.io**/**',
85+
'k8s.io/**',
8586
],
8687
matchUpdateTypes: [
8788
'patch',
@@ -96,7 +97,7 @@
9697
'gomod',
9798
],
9899
matchPackageNames: [
99-
'golang.org/x**/*',
100+
'golang.org/x/**',
100101
],
101102
addLabels: [
102103
'skip-review', // Adding label to allow PRs to automerge

0 commit comments

Comments
 (0)