From 7e247d2634cad8374139fe79970f16f7c5640431 Mon Sep 17 00:00:00 2001
From: Elijah Rodriguez-Beltran <elijahrb@google.com>
Date: Fri, 3 Apr 2026 18:38:53 +0000
Subject: [PATCH] Move gcp permissions to sig-cloud-provider

---
 OWNERS_ALIASES                                |  1 +
 config/kubernetes-sigs/provider-gcp/OWNERS    |  4 +
 .../kubernetes-sigs/provider-gcp/teams.yaml   | 75 ++++++++++++++++++
 config/kubernetes-sigs/sig-storage/teams.yaml | 78 -------------------
 config/restrictions.yaml                      |  4 +
 5 files changed, 84 insertions(+), 78 deletions(-)
 create mode 100644 config/kubernetes-sigs/provider-gcp/OWNERS
 create mode 100644 config/kubernetes-sigs/provider-gcp/teams.yaml

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 762abdc60d..3c5e88b78d 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -204,6 +204,7 @@ aliases:
     - bowei
     - thockin
     - wojtek-t
+    - msau42
   provider-ibmcloud:
     - spzala
   provider-openstack:
diff --git a/config/kubernetes-sigs/provider-gcp/OWNERS b/config/kubernetes-sigs/provider-gcp/OWNERS
new file mode 100644
index 0000000000..c8b24455da
--- /dev/null
+++ b/config/kubernetes-sigs/provider-gcp/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+  - provider-gcp
+approvers:
+  - provider-gcp
\ No newline at end of file
diff --git a/config/kubernetes-sigs/provider-gcp/teams.yaml b/config/kubernetes-sigs/provider-gcp/teams.yaml
new file mode 100644
index 0000000000..129e2f0f22
--- /dev/null
+++ b/config/kubernetes-sigs/provider-gcp/teams.yaml
@@ -0,0 +1,75 @@
+teams:
+  gcp-compute-persistent-disk-csi-driver-admins:
+    description: Admin access to the gcp-compute-persistent-disk-csi-driver repo
+    members:
+    - amacaskill
+    - dannawang0221
+    - hajiler 
+    - hime
+    - leiyiz
+    - mattcary
+    - msau42
+    - pwschuurman
+    - saad-ali
+    - saikat-royc
+    - songjiaxun
+    - tyuchn
+    privacy: closed
+    repos:
+      gcp-compute-persistent-disk-csi-driver: admin
+  gcp-compute-persistent-disk-csi-driver-maintainers:
+    description: Write access to the gcp-compute-persistent-disk-csi-driver repo
+    members:
+    - amacaskill
+    - cemakd
+    - dannawang0221
+    - hajiler    
+    - hime
+    - leiyiz
+    - mattcary
+    - msau42
+    - saad-ali
+    - saikat-royc
+    - sneha-at
+    - songjiaxun
+    - sunnylovestiramisu
+    - tyuchn
+    privacy: closed
+    repos:
+      gcp-compute-persistent-disk-csi-driver: write
+  gcp-filestore-csi-driver-admins:
+    description: Admin access to the gcp-filestore-csi-driver repo
+    members:
+    - dannawang0221
+    - hime
+    - leiyiz
+    - mattcary
+    - msau42
+    - saad-ali
+    - saikat-royc
+    - songjiaxun
+    - tyuchn
+    privacy: closed
+    repos:
+      gcp-filestore-csi-driver: admin
+  gcp-filestore-csi-driver-maintainers:
+    description: Write access to the gcp-filestore-csi-driver repo
+    members:
+    - amacaskill
+    - dannawang0221
+    - hime
+    - leiyiz
+    - mattcary
+    - msau42
+    - pwschuurman
+    - riteshghorse
+    - saad-ali
+    - saikat-royc
+    - savirg
+    - sneha-at
+    - songjiaxun
+    - sunnylovestiramisu
+    - tyuchn
+    privacy: closed
+    repos:
+      gcp-filestore-csi-driver: write
\ No newline at end of file
diff --git a/config/kubernetes-sigs/sig-storage/teams.yaml b/config/kubernetes-sigs/sig-storage/teams.yaml
index 1d7394edac..95d78c654a 100644
--- a/config/kubernetes-sigs/sig-storage/teams.yaml
+++ b/config/kubernetes-sigs/sig-storage/teams.yaml
@@ -43,84 +43,6 @@ teams:
     privacy: closed
     repos:
       cosi-driver-sample: write
-  gcp-compute-persistent-disk-csi-driver-admins:
-    description: Admin access to the gcp-compute-persistent-disk-csi-driver repo
-    members:
-    - amacaskill
-    - dannawang0221
-    - hajiler 
-    - hime
-    - juliankatz
-    - leiyiz
-    - mattcary
-    - msau42
-    - pwschuurman
-    - saad-ali
-    - saikat-royc
-    - songjiaxun
-    - tonyzhc
-    - tyuchn
-    privacy: closed
-    repos:
-      gcp-compute-persistent-disk-csi-driver: admin
-  gcp-compute-persistent-disk-csi-driver-maintainers:
-    description: Write access to the gcp-compute-persistent-disk-csi-driver repo
-    members:
-    - amacaskill
-    - cemakd
-    - dannawang0221
-    - hajiler    
-    - hime
-    - juliankatz
-    - leiyiz
-    - mattcary
-    - msau42
-    - saad-ali
-    - saikat-royc
-    - sneha-at
-    - songjiaxun
-    - sunnylovestiramisu
-    - tonyzhc
-    - tyuchn
-    privacy: closed
-    repos:
-      gcp-compute-persistent-disk-csi-driver: write
-  gcp-filestore-csi-driver-admins:
-    description: Admin access to the gcp-filestore-csi-driver repo
-    members:
-    - dannawang0221
-    - hime
-    - leiyiz
-    - mattcary
-    - msau42
-    - saad-ali
-    - saikat-royc
-    - songjiaxun
-    - tyuchn
-    privacy: closed
-    repos:
-      gcp-filestore-csi-driver: admin
-  gcp-filestore-csi-driver-maintainers:
-    description: Write access to the gcp-filestore-csi-driver repo
-    members:
-    - amacaskill
-    - dannawang0221
-    - hime
-    - leiyiz
-    - mattcary
-    - msau42
-    - pwschuurman
-    - riteshghorse
-    - saad-ali
-    - saikat-royc
-    - savirg
-    - sneha-at
-    - songjiaxun
-    - sunnylovestiramisu
-    - tyuchn
-    privacy: closed
-    repos:
-      gcp-filestore-csi-driver: write
   gluster-block-external-provisioner-admins:
     description: Admin access to gluster-block-external-provisioner
     members:
diff --git a/config/restrictions.yaml b/config/restrictions.yaml
index 9e2c2a1048..f20da44773 100644
--- a/config/restrictions.yaml
+++ b/config/restrictions.yaml
@@ -138,6 +138,10 @@ restrictions:
   - path: "kubernetes-sigs/provider-vmware/teams.yaml"
     allowedRepos:
     - "^vsphere-csi-driver"
+  - path: "kubernetes-sigs/provider-gcp/teams.yaml"
+    allowedRepos:
+    - "^gcp-compute-persistent-disk-csi-driver"
+    - "^gcp-filestore-csi-driver"
   - path: "kubernetes-sigs/sig-api-machinery/teams.yaml"
     allowedRepos:
     - "^apiserver-builder-alpha"