From ff97fcf4379820143e00522dd0b0aace96737fb6 Mon Sep 17 00:00:00 2001
From: Mergify <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 16 Jan 2025 11:18:16 +0000
Subject: [PATCH] ci(mergify): upgrade configuration to current format

---
 .github/mergify.yml | 59 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 51 insertions(+), 8 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 1b7fd3350..9657559e3 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,14 +1,43 @@
----
 defaults:
   actions:
     queue:
       name: default
-      method: rebase
-      update_method: rebase
-
 queue_rules:
-  - name: default
-    conditions:
+  - name: duplicated default from merge after two approvals (no API changes)
+    queue_conditions:
+      - base~=^(main)|(release-.+)$
+      - label!=DNM
+      - label!=api
+      - "#approved-reviews-by>=2"
+      - "#changes-requested-reviews-by=0"
+      - "status-success=codespell"
+      - "status-success=build_bundle"
+      - "status-success=build_controller"
+      - "status-success=build_sidecar"
+      - "status-success=go_mod_verify"
+      - "status-success=go_mod_vendor"
+      - "status-success=kind_deploy"
+      - "status-success=make_test"
+    merge_conditions:
+      - "status-success=codespell"
+      - "status-success=build_bundle"
+      - "status-success=build_controller"
+      - "status-success=build_sidecar"
+      - "status-success=go_mod_verify"
+      - "status-success=go_mod_vendor"
+      - "status-success=kind_deploy"
+    merge_method: rebase
+    update_method: rebase
+  - name: duplicated default from API changes needs approval from a contributor and
+      a reviewer
+    queue_conditions:
+      - base~=^(main)|(release-.+)$
+      - label!=DNM
+      - label=api
+      - "#approved-reviews-by>=2"
+      - "#changes-requested-reviews-by=0"
+      - "approved-reviews-by=@csi-addons/kubernetes-csi-addons-contributors"
+      - "approved-reviews-by=@csi-addons/kubernetes-csi-addons-reviewers"
       - "status-success=codespell"
       - "status-success=build_bundle"
       - "status-success=build_controller"
@@ -16,6 +45,17 @@ queue_rules:
       - "status-success=go_mod_verify"
       - "status-success=go_mod_vendor"
       - "status-success=kind_deploy"
+      - "status-success=make_test"
+    merge_conditions:
+      - "status-success=codespell"
+      - "status-success=build_bundle"
+      - "status-success=build_controller"
+      - "status-success=build_sidecar"
+      - "status-success=go_mod_verify"
+      - "status-success=go_mod_vendor"
+      - "status-success=kind_deploy"
+    merge_method: rebase
+    update_method: rebase
 
 pull_request_rules:
   - name: remove outdated approvals
@@ -41,7 +81,6 @@ pull_request_rules:
       - "status-success=kind_deploy"
       - "status-success=make_test"
     actions:
-      queue: {}
       dismiss_reviews: {}
       delete_head_branch: {}
   - name: API changes needs approval from a contributor and a reviewer
@@ -62,7 +101,6 @@ pull_request_rules:
       - "status-success=kind_deploy"
       - "status-success=make_test"
     actions:
-      queue: {}
       dismiss_reviews: {}
       delete_head_branch: {}
   - name: pr title contains DNM
@@ -103,3 +141,8 @@ pull_request_rules:
       request_reviews:
         users_from_teams:
           - "@csi-addons/kubernetes-csi-addons-contributors"
+  - name: API changes needs approval from a contributor and a reviewer + merge after
+      two approvals (no API changes)
+    conditions: []
+    actions:
+      queue: