From 2fcad87fae0f1f5fd78dada3b8f95dd33b00ad36 Mon Sep 17 00:00:00 2001
From: Jonathan Hess <hessjc@google.com>
Date: Fri, 22 Nov 2024 09:36:14 -0700
Subject: [PATCH] chore: Simplify renovate config so it groups dependencies
 better.

---
 .github/renovate.json | 54 +++++++++++++++----------------------------
 1 file changed, 19 insertions(+), 35 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 6522cf34..0d0870c4 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,42 +1,18 @@
 {
   "extends": [
-    "config:recommended",
-    ":semanticCommitTypeAll(chore)",
-    ":disableDependencyDashboard"
+    "config:recommended"
   ],
-  "ignorePresets": [
-    ":semanticPrefixFixDepsChoreOthers"
-  ],
-  "commitMessagePrefix": "deps: ",
-  "prConcurrentLimit": 0,
-  "rebaseWhen": "behind-base-branch",
-  "dependencyDashboard": true,
   "dependencyDashboardLabels": ["type: process"],
-  "semanticCommits": "enabled",
+  "commitMessagePrefix": "deps: ",
   "postUpdateOptions": [
     "gomodTidy"
   ],
+  "prConcurrentLimit": 5,
   "packageRules": [
-    {
-      "description": "Disable MAJOR update types",
-      "matchUpdateTypes": [
-        "major"
-      ],
-      "enabled": false
-    },
     {
       "matchManagers": ["github-actions"],
       "groupName": "Github action dependencies"
     },
-    {
-      "matchPackagePatterns": [
-        "^kubernetes",
-        "^k8s.io/client-go",
-        "^sigs.k8s.io/controller-runtime",
-        "^sigs.k8s.io/controller-tools"
-      ],
-      "groupName": "Kubernetes runtime dependencies"
-    },
     {
       "matchPackagePatterns": [
         "^cert-manager/cert-manager",
@@ -48,20 +24,28 @@
       "groupName": "Build Tools"
     },
     {
-      "groupName": "Non-major go dependency updates",
+      "matchPackagePatterns": [
+        "^kubernetes",
+        "^k8s.io/client-go",
+        "^sigs.k8s.io/controller-runtime",
+        "^sigs.k8s.io/controller-tools"
+      ],
       "matchManagers": ["gomod"],
-      "matchUpdateTypes": ["minor", "patch"]
+      "groupName": "Kubernetes runtime dependencies"
+    },
+    {
+      "matchManagers": ["dockerfile"],
+      "groupName": "Container image updates"
     },
     {
-      "groupName": "Non-major other dependency updates",
+      "groupName": "Go dependency updates",
+      "matchUpdateTypes": ["minor", "patch","pin","digest"]
+    },
+    {
+      "groupName": "Other dependency updates",
       "matchUpdateTypes": ["minor", "patch", "pin", "digest"]
     }
   ],
-  "force": {
-    "constraints": {
-      "go": "1.20"
-    }
-  },
   "regexManagers": [
     {
       "customType": "regex",