From bbb23b1c121548141c60ba5d8a40bf72d15e6f83 Mon Sep 17 00:00:00 2001
From: Devin Wong <wongsiosun@outlook.com>
Date: Wed, 19 Feb 2025 12:26:32 -0800
Subject: [PATCH 1/2] cleaning up more renovate configs

---
 .github/renovate.json | 53 ++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 33 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index d4894818a50..7f857fddae8 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -117,14 +117,15 @@
     {
       "matchPackageNames": [
         "moby-runc",
-        "moby-containerd"
+        "moby-containerd",
+        "aks/aks-node-ca-watcher"
       ],
       "matchUpdateTypes": [
         "patch"
       ],
       "automerge": true,
       "enabled": true,
-      "groupName": "runc-containerd",
+      "groupName": "runc-containerd-ca_watcher",
       "assignees": [
         "devinwong",
         "anujmaheshwari1",
@@ -159,10 +160,13 @@
       ],
       "groupName": "azure-cni-cilium-ipam",
       "assignees": [
-        "team:Azure/acn-cni-reviewers"
+        "team:acn-cni-reviewers"
       ],
       "reviewers": [
-        "team:Azure/acn-cni-reviewers"
+        "rbtr",
+        "behzad-mir",
+        "jpayne3506",
+        "QxBytes"
       ]
     },
     {
@@ -175,7 +179,10 @@
         "team:acn-cns-reviewers"
       ],
       "reviewers": [
-        "team:acn-cns-reviewers"
+        "rbtr",
+        "behzad-mir",
+        "jpayne3506",
+        "QxBytes"
       ]
     },
     {
@@ -192,21 +199,12 @@
         "huntergregory"
       ]
     },
-    {
-      "matchPackageNames": [
-        "aks/aks-node-ca-watcher"
-      ],
-      "assignees": [
-        "UtheMan"
-      ],
-      "reviewers": [
-        "UtheMan"
-      ]
-    },
     {
       "matchPackageNames": [
         "oss/kubernetes/autoscaler/addon-resizer",
-        "oss/kubernetes/autoscaler/cluster-proportional-autoscaler"
+        "oss/kubernetes/autoscaler/cluster-proportional-autoscaler",
+        "oss/kubernetes/coredns",
+        "oss/v2/kubernetes/coredns"
       ],
       "assignees": [
         "nirnaymsft",
@@ -233,19 +231,6 @@
         "nreisch"
       ]
     },
-    {
-      "matchPackageNames": [
-        "oss/kubernetes/coredns",
-        "oss/v2/kubernetes/coredns"
-      ],
-      "groupName": "coredns",
-      "assignees": [
-        "SriHarsha001"
-      ],
-      "reviewers": [
-        "SriHarsha001"
-      ]
-    },
     {
       "matchPackageNames": [
         "oss/binaries/kubernetes/azure-acr-credential-provider"
@@ -264,14 +249,16 @@
     },
     {
       "matchPackageNames": [
-        "oss/kubernetes-csi/*"
+        "oss/kubernetes-csi/**"
       ],
       "groupName": "csi",
       "assignees": [
-        "andyzhangx"
+        "andyzhangx",
+        "jiashun0011"
       ],
       "reviewers": [
-        "andyzhangx"
+        "andyzhangx",
+        "jiashun0011"
       ]
     },
     {

From f27860ad2383aca8ff6166d442d2b3250c932c76 Mon Sep 17 00:00:00 2001
From: Devin Wong <wongsiosun@outlook.com>
Date: Wed, 19 Feb 2025 12:39:11 -0800
Subject: [PATCH 2/2] fix reviewers and assignees

---
 .github/renovate.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 7f857fddae8..b07f9f37345 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -159,10 +159,10 @@
         "containernetworking/azure-ipam"
       ],
       "groupName": "azure-cni-cilium-ipam",
-      "assignees": [
+      "reviewers": [
         "team:acn-cni-reviewers"
       ],
-      "reviewers": [
+      "assignees": [
         "rbtr",
         "behzad-mir",
         "jpayne3506",
@@ -175,10 +175,10 @@
         "containernetworking/azure-cns"
       ],
       "groupName": "azure-cns",
-      "assignees": [
+      "reviewers": [
         "team:acn-cns-reviewers"
       ],
-      "reviewers": [
+      "assignees": [
         "rbtr",
         "behzad-mir",
         "jpayne3506",