From 27da28c3631cab2596429e2a4f41dff2d858c42a Mon Sep 17 00:00:00 2001 From: Boemeltrein <130394941+Boemeltrein@users.noreply.github.com> Date: Sun, 29 Dec 2024 14:52:57 +0100 Subject: [PATCH] [Renovate] Exceptions for Talos and Kubelet and cleanup (#29823) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [x ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [x ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning - [ ] I made sure the title starts with `feat(chart-name):`, `fix(chart-name):` or `chore(chart-name):` **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --------- Signed-off-by: Boemeltrein <130394941+Boemeltrein@users.noreply.github.com> --- .github/renovate/main.json5 | 62 +++++++++---------- .../special/customTalosClustertool.json5 | 26 ++++++++ .github/renovate/updates/calver.json5 | 2 +- .github/renovate/updates/lockfile.json5 | 6 +- .github/renovate/updates/major.json5 | 4 +- .github/renovate/updates/pin.json5 | 4 +- 6 files changed, 65 insertions(+), 39 deletions(-) create mode 100644 .github/renovate/special/customTalosClustertool.json5 diff --git a/.github/renovate/main.json5 b/.github/renovate/main.json5 index 662bc343433..b80678a9aff 100644 --- a/.github/renovate/main.json5 +++ b/.github/renovate/main.json5 @@ -1,42 +1,42 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "rebaseWhen": "conflicted", + "rebaseWhen": "conflicted", "prConcurrentLimit": 150, "automergeType": "pr", "pinDigests": true, "branchPrefix": "renovate/", - "semanticCommits": "enabled", + "semanticCommits": "enabled", "dependencyDashboard": true, "dependencyDashboardTitle": "Renovate Dashboard 🤖", - gitAuthor: "TrueCharts-Admin ", + "gitAuthor": "TrueCharts-Admin ", "separateMinorPatch": true, - prHourlyLimit: 0, - semanticCommits: 'enabled', - "suppressNotifications": ["prEditedNotification", "prIgnoreNotification"], - "extends": [ - "config:recommended", - "github>truecharts/public//.github/renovate/updates/lockfile.json5", - "github>truecharts/public//.github/renovate/updates/pin.json5", - "github>truecharts/public//.github/renovate/updates/digest.json5", - "github>truecharts/public//.github/renovate/updates/patch.json5", - "github>truecharts/public//.github/renovate/updates/minor.json5", - "github>truecharts/public//.github/renovate/updates/major.json5", - "github>truecharts/public//.github/renovate/updates/calver.json5", - "github>truecharts/public//.github/renovate/kinds/astro.json5", - "github>truecharts/public//.github/renovate/kinds/docker.json5", - "github>truecharts/public//.github/renovate/kinds/flux.json5", - "github>truecharts/public//.github/renovate/kinds/githubactions.json5", - "github>truecharts/public//.github/renovate/kinds/go.json5", - "github>truecharts/public//.github/renovate/kinds/helm-values.json5", - "github>truecharts/public//.github/renovate/kinds/helm.json5", - "github>truecharts/public//.github/renovate/special/groups.json5", - "github>truecharts/public//.github/renovate/special/schedules.json5", - "github>truecharts/public//.github/renovate/basics/commitMessage.json5", - "github>truecharts/public//.github/renovate/basics/labels.json5", - "github>truecharts/public//.github/renovate/special/customClusterManagers.json5", - "github>truecharts/public//.github/renovate/special/customRules.json5", - "github>truecharts/public//.github/renovate/special/customVersioning.json5" - ], + "prHourlyLimit": 0, + "suppressNotifications": ["prEditedNotification", "prIgnoreNotification"], + "extends": [ + "config:recommended", + "github>truecharts/public//.github/renovate/updates/lockfile.json5", + "github>truecharts/public//.github/renovate/updates/pin.json5", + "github>truecharts/public//.github/renovate/updates/digest.json5", + "github>truecharts/public//.github/renovate/updates/patch.json5", + "github>truecharts/public//.github/renovate/updates/minor.json5", + "github>truecharts/public//.github/renovate/updates/major.json5", + "github>truecharts/public//.github/renovate/updates/calver.json5", + "github>truecharts/public//.github/renovate/kinds/astro.json5", + "github>truecharts/public//.github/renovate/kinds/docker.json5", + "github>truecharts/public//.github/renovate/kinds/flux.json5", + "github>truecharts/public//.github/renovate/kinds/githubactions.json5", + "github>truecharts/public//.github/renovate/kinds/go.json5", + "github>truecharts/public//.github/renovate/kinds/helm-values.json5", + "github>truecharts/public//.github/renovate/kinds/helm.json5", + "github>truecharts/public//.github/renovate/special/groups.json5", + "github>truecharts/public//.github/renovate/special/schedules.json5", + "github>truecharts/public//.github/renovate/basics/commitMessage.json5", + "github>truecharts/public//.github/renovate/basics/labels.json5", + "github>truecharts/public//.github/renovate/special/customClusterManagers.json5", + "github>truecharts/public//.github/renovate/special/customRules.json5", + "github>truecharts/public//.github/renovate/special/customVersioning.json5", + "github>truecharts/public//.github/renovate/special/customTalosClustertool.json5" + ], // Main Renovate configuration that lists package rules for various paths "packageRules": [ ], @@ -52,5 +52,5 @@ "**/resources/**", "**common/test-chart/tests/**", "charts/library/common/test-chart/tests/**" - ], + ] } diff --git a/.github/renovate/special/customTalosClustertool.json5 b/.github/renovate/special/customTalosClustertool.json5 new file mode 100644 index 00000000000..57ca23998a1 --- /dev/null +++ b/.github/renovate/special/customTalosClustertool.json5 @@ -0,0 +1,26 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "packageRules": [ + { + "description": ["Block automerge for Kubelet and Talos version Patch"], + "matchUpdateTypes": ["patch"], + "automerge": false, + "matchPackageNames": ["ghcr.io/siderolabs/kubelet", "ghcr.io/siderolabs/installer"], + "labels": ["type/patch", "system-upgrade"] + }, + { + "description": ["Block automerge for Kubelet and Talos version Minor"], + "matchUpdateTypes": ["minor"], + "automerge": false, + "matchPackageNames": ["ghcr.io/siderolabs/kubelet", "ghcr.io/siderolabs/installer"], + "labels": ["type/minor", "system-upgrade"] + }, + { + "description": ["Block automerge for Kubelet and Talos version Major"], + "matchUpdateTypes": ["major"], + "dependencyDashboardApproval": true, + "matchPackageNames": ["ghcr.io/siderolabs/kubelet", "ghcr.io/siderolabs/installer"], + "labels": ["type/major", "system-upgrade"] + } + ] +} diff --git a/.github/renovate/updates/calver.json5 b/.github/renovate/updates/calver.json5 index 99512ad89e3..d398d38695c 100644 --- a/.github/renovate/updates/calver.json5 +++ b/.github/renovate/updates/calver.json5 @@ -7,5 +7,5 @@ "versioning": "calver", // Specify CalVer as the versioning strategy "versioningRegex": "^\\d{4}\\.\\d{1,2}(\\.\\d{1,2})?$" // Example regex for CalVer: YYYY.MM or YYYY.MM.DD } - }, + } } diff --git a/.github/renovate/updates/lockfile.json5 b/.github/renovate/updates/lockfile.json5 index b5df7afb700..697ec00a1f7 100644 --- a/.github/renovate/updates/lockfile.json5 +++ b/.github/renovate/updates/lockfile.json5 @@ -2,8 +2,8 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "packageRules": [ { - matchUpdateTypes: ["lockfile"], - automerge: true + "matchUpdateTypes": ["lockfile"], + "automerge": true } - ], + ] } diff --git a/.github/renovate/updates/major.json5 b/.github/renovate/updates/major.json5 index 71f02bd10c7..bd75bd4b761 100644 --- a/.github/renovate/updates/major.json5 +++ b/.github/renovate/updates/major.json5 @@ -2,9 +2,9 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "major": { "enabled": true, - "dependencyDashboardApproval": true, + "dependencyDashboardApproval": true }, "ignore": [ // Add any paths or patterns to ignore specific minor updates, if necessary - ], + ] } diff --git a/.github/renovate/updates/pin.json5 b/.github/renovate/updates/pin.json5 index 1ec8a4081d7..80c8970bad3 100644 --- a/.github/renovate/updates/pin.json5 +++ b/.github/renovate/updates/pin.json5 @@ -2,8 +2,8 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "packageRules": [ { - matchUpdateTypes: ["pin"], - automerge: true + "matchUpdateTypes": ["pin"], + "automerge": true } ], "ignore": [