From e8535436a21fbbbb039807a05fabc66c0853adf2 Mon Sep 17 00:00:00 2001
From: svenkitesh <svenkitesh@digitalocean.com>
Date: Fri, 10 Apr 2026 20:17:31 +0530
Subject: [PATCH 1/2] Add milestone applier rules for 1.36

---
 config/prow/plugins.yaml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/config/prow/plugins.yaml b/config/prow/plugins.yaml
index 75e2fc9d0394..3e1d677b5ae7 100644
--- a/config/prow/plugins.yaml
+++ b/config/prow/plugins.yaml
@@ -506,21 +506,21 @@ slack:
 
 milestone_applier:
   kubernetes/enhancements:
-    master: v1.36
+    master: v1.37
   kubernetes/kubernetes:
-    master: v1.36
+    master: v1.37
+    release-1.36: v1.36
     release-1.35: v1.35
     release-1.34: v1.34
     release-1.33: v1.33
-    release-1.32: v1.32
   kubernetes/org:
-    main: v1.36
+    main: v1.37
   kubernetes/release:
-    master: v1.36
+    master: v1.37
   kubernetes/sig-release:
-    master: v1.36
+    master: v1.37
   kubernetes/test-infra:
-    master: v1.36
+    master: v1.37
   kubernetes-sigs/kjob:
     main: v0.2
     release-0.1: v0.1
@@ -537,9 +537,10 @@ milestone_applier:
     release-0.9: v0.9
     release-0.8: v0.8
   kubernetes/k8s.io:
-    main: v1.36
+    main: v1.37
   kubernetes/kops:
-    master: v1.36
+    master: v1.37
+    release-1.36: v1.36
     release-1.35: v1.35
     release-1.34: v1.34
     release-1.33: v1.33

From 335b651859e38d1cff4ec6dfef29c2a15647ced1 Mon Sep 17 00:00:00 2001
From: sreeram-venkitesh <sreeramvenkitesh@gmail.com>
Date: Fri, 10 Apr 2026 20:29:03 +0530
Subject: [PATCH 2/2] 1.36 code thaw

---
 config/prow/config.yaml | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/config/prow/config.yaml b/config/prow/config.yaml
index 1d9c26742b6d..4b9afdc30e05 100644
--- a/config/prow/config.yaml
+++ b/config/prow/config.yaml
@@ -746,32 +746,6 @@ tide:
     - do-not-merge/work-in-progress
   - repos:
     - kubernetes/kubernetes
-    excludedBranches:
-    - master
-    - release-1.36
-    labels:
-    - lgtm
-    - approved
-    - "cncf-cla: yes"
-    missingLabels:
-    - do-not-merge
-    - do-not-merge/blocked-paths
-    - do-not-merge/cherry-pick-not-approved
-    - do-not-merge/contains-merge-commits
-    - do-not-merge/hold
-    - do-not-merge/invalid-commit-message
-    - do-not-merge/invalid-owners-file
-    - do-not-merge/needs-kind
-    - do-not-merge/needs-sig
-    - do-not-merge/release-note-label-needed
-    - do-not-merge/work-in-progress
-    - needs-rebase
-  - repos:
-    - kubernetes/kubernetes
-    milestone: v1.36
-    includedBranches:
-    - master
-    - release-1.36
     labels:
     - lgtm
     - approved