Skip to content

Commit 1397584

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #462 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents ac2368e + ebc66fe commit 1397584

File tree

3 files changed

+42
-40
lines changed

3 files changed

+42
-40
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: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,70 +10,70 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
13+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
1414
repo_path: modules/boilerplate
1515
- folder_name: cert-manager
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
18+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
1919
repo_path: modules/cert-manager
2020
- folder_name: controller-gen
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
23+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
2424
repo_path: modules/controller-gen
2525
- folder_name: generate-verify
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
28+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
2929
repo_path: modules/generate-verify
3030
- folder_name: go
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
33+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
3434
repo_path: modules/go
3535
- folder_name: helm
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
38+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
3939
repo_path: modules/helm
4040
- folder_name: help
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
43+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
4444
repo_path: modules/help
4545
- folder_name: kind
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
48+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
4949
repo_path: modules/kind
5050
- folder_name: klone
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
53+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
5454
repo_path: modules/klone
5555
- folder_name: licenses
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
58+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
5959
repo_path: modules/licenses
6060
- folder_name: oci-build
6161
repo_url: https://github.com/cert-manager/makefile-modules.git
6262
repo_ref: main
63-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
63+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
6464
repo_path: modules/oci-build
6565
- folder_name: oci-publish
6666
repo_url: https://github.com/cert-manager/makefile-modules.git
6767
repo_ref: main
68-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
68+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
6969
repo_path: modules/oci-publish
7070
- folder_name: repository-base
7171
repo_url: https://github.com/cert-manager/makefile-modules.git
7272
repo_ref: main
73-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
73+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
7474
repo_path: modules/repository-base
7575
- folder_name: tools
7676
repo_url: https://github.com/cert-manager/makefile-modules.git
7777
repo_ref: main
78-
repo_hash: c4f8a8a4d10d0efc9d775d4b1e719d779bf46880
78+
repo_hash: 5396cce50602b264cf3c8d464435522ab1b763ae
7979
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)