From d89c5c1b944e1b1e3f5df1296100c2464d671af6 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Thu, 9 Jan 2025 20:45:25 -0500
Subject: [PATCH] chore: update renovate config

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .github/renovate.json5               |  6 ++----
 .github/renovate/commitMessage.json5 | 16 ----------------
 .github/renovate/groups.json5        | 24 ++++++++++++++----------
 .github/renovate/packageRules.json5  | 13 -------------
 4 files changed, 16 insertions(+), 43 deletions(-)
 delete mode 100644 .github/renovate/commitMessage.json5

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index a5ecd47a6a380..7bed30a516637 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -3,16 +3,15 @@
   "extends": [
     "config:recommended",
     "docker:enableMajor",
-    "replacements:k8s-registry-move",
     ":automergeBranch",
     ":disableRateLimiting",
     ":dependencyDashboard",
     ":semanticCommits",
+    ":separatePatchReleases",
     ":skipStatusChecks",
     ":timezone(America/New_York)",
     "github>onedr0p/home-ops//.github/renovate/autoMerge.json5",
     "github>onedr0p/home-ops//.github/renovate/clusters.json5",
-    "github>onedr0p/home-ops//.github/renovate/commitMessage.json5",
     "github>onedr0p/home-ops//.github/renovate/customManagers.json5",
     "github>onedr0p/home-ops//.github/renovate/grafanaDashboards.json5",
     "github>onedr0p/home-ops//.github/renovate/groups.json5",
@@ -24,7 +23,7 @@
   "suppressNotifications": ["prEditedNotification", "prIgnoreNotification"],
   "onboarding": false,
   "requireConfig": "ignored",
-  "ignorePaths": ["**/*.sops.*", "**/.archive/**", "**/resources/**"],
+  "ignorePaths": ["**/*.sops.*", "**/resources/**"],
   "flux": {
     "fileMatch": [
       "(^|/)kubernetes/.+\\.ya?ml$"
@@ -37,7 +36,6 @@
   },
   "kubernetes": {
     "fileMatch": [
-      "(^|/)\\.taskfiles/.+\\.ya?ml$",
       "(^|/)kubernetes/.+\\.ya?ml$"
     ]
   }
diff --git a/.github/renovate/commitMessage.json5 b/.github/renovate/commitMessage.json5
deleted file mode 100644
index 3fea628721bd0..0000000000000
--- 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 eb75788a37671..9912345c36f3d 100644
--- a/.github/renovate/groups.json5
+++ b/.github/renovate/groups.json5
@@ -8,8 +8,7 @@
       "matchDatasources": ["docker"],
       "group": {
         "commitMessageTopic": "{{{groupName}}} group"
-      },
-      "separateMinorPatch": true
+      }
     },
     {
       "description": ["Actions Runner Controller Group"],
@@ -18,8 +17,16 @@
       "matchDatasources": ["docker", "helm"],
       "group": {
         "commitMessageTopic": "{{{groupName}}} group"
-      },
-      "separateMinorPatch": true
+      }
+    },
+    {
+      "description": ["Flux Operator Group"],
+      "groupName": "Flux Operator",
+      "matchPackagePatterns": ["flux-operator", "flux-instance"],
+      "matchDatasources": ["docker"],
+      "group": {
+        "commitMessageTopic": "{{{groupName}}} group"
+      }
     },
     {
       "description": ["Intel Device Plugins Group"],
@@ -28,8 +35,7 @@
       "matchDatasources": ["helm"],
       "group": {
         "commitMessageTopic": "{{{groupName}}} group"
-      },
-      "separateMinorPatch": true
+      }
     },
     {
       "description": ["Rook-Ceph Group"],
@@ -38,8 +44,7 @@
       "matchDatasources": ["helm"],
       "group": {
         "commitMessageTopic": "{{{groupName}}} group"
-      },
-      "separateMinorPatch": true
+      }
     },
     {
       "description": ["Talos Group"],
@@ -48,8 +53,7 @@
       "matchDatasources": ["docker"],
       "group": {
         "commitMessageTopic": "{{{groupName}}} group"
-      },
-      "separateMinorPatch": true
+      }
     }
   ]
 }
diff --git a/.github/renovate/packageRules.json5 b/.github/renovate/packageRules.json5
index 51b2a376559a5..611533ddbe131 100644
--- a/.github/renovate/packageRules.json5
+++ b/.github/renovate/packageRules.json5
@@ -1,19 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "packageRules": [
-    {
-      "description": ["Allowed postgresql major release"],
-      "matchDatasources": ["docker"],
-      "matchPackagePatterns": ["postgresql"],
-      "allowedVersions": "<17"
-    },
-    {
-      "description": ["Custom schedule for frequently updated container digests"],
-      "matchDataSources": ["docker"],
-      "matchPackagePatterns": ["postgresql"],
-      "matchUpdateTypes": ["digest"],
-      "schedule": ["every 3 months on the first day of the month"]
-    },
     {
       "description": ["Loose versioning for non-semver containers"],
       "matchDatasources": ["docker"],