From e2ab66ceea3573692fdcd00b9ab68d22cb2cb94e Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Thu, 13 Mar 2025 13:19:42 -0400 Subject: [PATCH 1/7] remove group now defined in Rancher global config --- .github/renovate.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 6698b62b..68e324c0 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -18,13 +18,6 @@ "github.com/imdario/mergo" ], "packageRules": [ - { - "groupName": "GitHub Workflow Actions", - "groupSlug": "gha-deps", - "matchManagers": [ - "github-actions" - ] - }, { "groupName": "Docker File Deps", "groupSlug": "docker-bumps", From c71393f81c228e06da27d26462302b26e697aba3 Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Thu, 13 Mar 2025 13:21:11 -0400 Subject: [PATCH 2/7] WIP 4.x branch rules --- .github/renovate.json | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.github/renovate.json b/.github/renovate.json index 68e324c0..a4c5b920 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -24,6 +24,33 @@ "matchManagers": [ "dockerfile" ] + }, + { + "matchBaseBranches": ["release/v4.0"], + "matchPackageNames": [ + "golang", + "go", + "/registry.suse.com/bci/golang/" + ], + "allowedVersions": "<1.21.0" + }, + { + "matchBaseBranches": ["release/v4.0"], + "matchDatasources": [ + "golang-version" + ], + "allowedVersions": "<1.21.0" + }, + { + "matchBaseBranches": ["release/v4.0"], + "matchPackageNames": ["kubernetes/kubernetes"], + "allowedVersions": "<1.29.0" + }, + { + "matchBaseBranches": ["release/v4.0"], + "matchManagers": ["gomod"], + "matchPackageNames": ["/^k8s\\.io\\/.*/"], + "allowedVersions": "<0.29.0" } ] } \ No newline at end of file From 5719ab16c21bcabd504723255e8293b0750532d7 Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Thu, 13 Mar 2025 13:28:12 -0400 Subject: [PATCH 3/7] make test rules for 5.x branch instead --- .github/renovate.json | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index a4c5b920..c0fd9d0f 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -6,8 +6,7 @@ "baseBranches": [ "main", "release/v6.x", - "release/v5.0", - "release/v4.0" + "release/v5.0" ], "ignoreDeps": [ "github.com/rancher/hull", @@ -26,31 +25,31 @@ ] }, { - "matchBaseBranches": ["release/v4.0"], + "matchBaseBranches": ["release/v5.0"], "matchPackageNames": [ "golang", "go", "/registry.suse.com/bci/golang/" ], - "allowedVersions": "<1.21.0" + "allowedVersions": "<1.23.0" }, { - "matchBaseBranches": ["release/v4.0"], + "matchBaseBranches": ["release/v5.0"], "matchDatasources": [ "golang-version" ], - "allowedVersions": "<1.21.0" + "allowedVersions": "<1.23.0" }, { - "matchBaseBranches": ["release/v4.0"], + "matchBaseBranches": ["release/v5.0"], "matchPackageNames": ["kubernetes/kubernetes"], - "allowedVersions": "<1.29.0" + "allowedVersions": "<1.31.0" }, { - "matchBaseBranches": ["release/v4.0"], + "matchBaseBranches": ["release/v5.0"], "matchManagers": ["gomod"], "matchPackageNames": ["/^k8s\\.io\\/.*/"], - "allowedVersions": "<0.29.0" + "allowedVersions": "<0.31.0" } ] } \ No newline at end of file From 6d519347d81294d1e5b38c0f974a346a8ee9ec19 Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Thu, 13 Mar 2025 13:43:16 -0400 Subject: [PATCH 4/7] make sure 6.x is covered too --- .github/renovate.json | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index c0fd9d0f..a45bc507 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -25,7 +25,7 @@ ] }, { - "matchBaseBranches": ["release/v5.0"], + "matchBaseBranches": ["release/v6.x", "release/v5.0"], "matchPackageNames": [ "golang", "go", @@ -34,12 +34,23 @@ "allowedVersions": "<1.23.0" }, { - "matchBaseBranches": ["release/v5.0"], + "matchBaseBranches": ["release/v6.x", "release/v5.0"], "matchDatasources": [ "golang-version" ], "allowedVersions": "<1.23.0" }, + { + "matchBaseBranches": ["release/v6.x"], + "matchPackageNames": ["kubernetes/kubernetes"], + "allowedVersions": "<1.32.0" + }, + { + "matchBaseBranches": ["release/v6.x"], + "matchManagers": ["gomod"], + "matchPackageNames": ["/^k8s\\.io\\/.*/"], + "allowedVersions": "<0.32.0" + }, { "matchBaseBranches": ["release/v5.0"], "matchPackageNames": ["kubernetes/kubernetes"], From 964e65e0ebf5f14734b1c64fbd0062234251a2b0 Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Thu, 13 Mar 2025 13:47:19 -0400 Subject: [PATCH 5/7] add rules to cover main (and future release for it) --- .github/renovate.json | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.github/renovate.json b/.github/renovate.json index a45bc507..12420c71 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -24,6 +24,33 @@ "dockerfile" ] }, + { + "matchBaseBranches": ["main", "release/v7.x"], + "matchPackageNames": [ + "golang", + "go", + "/registry.suse.com/bci/golang/" + ], + "allowedVersions": "<1.24.0" + }, + { + "matchBaseBranches": ["main", "release/v7.x"], + "matchDatasources": [ + "golang-version" + ], + "allowedVersions": "<1.24.0" + }, + { + "matchBaseBranches": ["main", "release/v7.x"], + "matchPackageNames": ["kubernetes/kubernetes"], + "allowedVersions": "<1.33.0" + }, + { + "matchBaseBranches": ["main", "release/v7.x"], + "matchManagers": ["gomod"], + "matchPackageNames": ["/^k8s\\.io\\/.*/"], + "allowedVersions": "<0.33.0" + }, { "matchBaseBranches": ["release/v6.x", "release/v5.0"], "matchPackageNames": [ From 51625505e1d08577e931a330e7ef4bdb286de3da Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Thu, 13 Mar 2025 14:10:40 -0400 Subject: [PATCH 6/7] Adjust PR creation setttings --- .github/renovate.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/renovate.json b/.github/renovate.json index 12420c71..618d9563 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -3,6 +3,8 @@ "github>rancher/renovate-config#release", "group:allNonMajor" ], + "prHourlyLimit": 0, + "prConcurrentLimit": 20, "baseBranches": [ "main", "release/v6.x", From 6e887ad9f31a2d89d124bf940a69367be67943fc Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Thu, 13 Mar 2025 14:16:34 -0400 Subject: [PATCH 7/7] escape regex --- .github/renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 618d9563..1a7891d1 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -31,7 +31,7 @@ "matchPackageNames": [ "golang", "go", - "/registry.suse.com/bci/golang/" + "/registry\\.suse\\.com\\/bci\\/golang/" ], "allowedVersions": "<1.24.0" }, @@ -58,7 +58,7 @@ "matchPackageNames": [ "golang", "go", - "/registry.suse.com/bci/golang/" + "/registry\\.suse\\.com\\/bci\\/golang/" ], "allowedVersions": "<1.23.0" },