From acb6ff54cd53344e3c7feeb2c11ea12aa3e94b17 Mon Sep 17 00:00:00 2001
From: Steven Kreitzer <skre@skre.me>
Date: Fri, 10 Jan 2025 05:50:55 -0600
Subject: [PATCH] chore(renovate): update config

---
 .github/renovate.json5               |  4 +---
 .github/renovate/commitMessage.json5 | 16 ----------------
 .github/renovate/groups.json5        |  6 ------
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 .github/renovate/commitMessage.json5

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index d8b1b9522e..e4a2390429 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -3,17 +3,16 @@
   extends: [
     "config:recommended",
     "docker:enableMajor",
-    "replacements:k8s-registry-move",
     ":automergeBranch",
     ":disableRateLimiting",
     ":dependencyDashboard",
     ":gitSignOff",
     ":semanticCommits",
+    ":separatePatchReleases",
     ":skipStatusChecks",
     ":timezone(America/Chicago)",
     "github>buroa/k8s-gitops//.github/renovate/allowedVersions.json5",
     "github>buroa/k8s-gitops//.github/renovate/autoMerge.json5",
-    "github>buroa/k8s-gitops//.github/renovate/commitMessage.json5",
     "github>buroa/k8s-gitops//.github/renovate/customManagers.json5",
     "github>buroa/k8s-gitops//.github/renovate/grafanaDashboards.json5",
     "github>buroa/k8s-gitops//.github/renovate/groups.json5",
@@ -35,7 +34,6 @@
   },
   kubernetes: {
     fileMatch: [
-      "(^|/).taskfiles/.+\\.ya?ml$",
       "(^|/)talos/.+\\.ya?ml$",
       "(^|/)kubernetes/.+\\.ya?ml$",
     ],
diff --git a/.github/renovate/commitMessage.json5 b/.github/renovate/commitMessage.json5
deleted file mode 100644
index 7741bdb72d..0000000000
--- a/.github/renovate/commitMessage.json5
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  $schema: "https://docs.renovatebot.com/renovate-schema.json",
-  commitMessageTopic: "{{depName}}",
-  commitMessageExtra: "to {{newVersion}}",
-  commitMessageSuffix: "",
-  packageRules: [
-    {
-      matchDatasources: ["helm"],
-      commitMessageTopic: "chart {{depName}}",
-    },
-    {
-      matchDatasources: ["docker"],
-      commitMessageTopic: "image {{depName}}",
-    },
-  ],
-}
diff --git a/.github/renovate/groups.json5 b/.github/renovate/groups.json5
index b8a9503f55..109508b846 100644
--- a/.github/renovate/groups.json5
+++ b/.github/renovate/groups.json5
@@ -9,7 +9,6 @@
       group: {
         commitMessageTopic: "{{{groupName}}} group",
       },
-      separateMinorPatch: true,
     },
     {
       description: ["Actions Runner Controller Group"],
@@ -19,7 +18,6 @@
       group: {
         commitMessageTopic: "{{{groupName}}} group",
       },
-      separateMinorPatch: true,
     },
     {
       description: ["Flux Operator Group"],
@@ -30,7 +28,6 @@
       group: {
         commitMessageTopic: "{{{groupName}}} group",
       },
-      separateMinorPatch: true,
     },
     {
       description: ["Intel-Device-Plugins Group"],
@@ -40,7 +37,6 @@
       group: {
         commitMessageTopic: "{{{groupName}}} group",
       },
-      separateMinorPatch: true,
     },
     {
       description: ["Rook-Ceph Group"],
@@ -50,7 +46,6 @@
       group: {
         commitMessageTopic: "{{{groupName}}} group",
       },
-      separateMinorPatch: true,
     },
     {
       description: ["Talos Group"],
@@ -63,7 +58,6 @@
       group: {
         commitMessageTopic: "{{{groupName}}} group",
       },
-      separateMinorPatch: true,
     },
   ],
 }