From aab5b53e2384f8cf7fd89d8070b126796b07f7a8 Mon Sep 17 00:00:00 2001
From: Michal Mamczur <89840088+mmamczur@users.noreply.github.com>
Date: Tue, 7 Jan 2025 10:16:13 +0100
Subject: [PATCH] Create team directory for provider-gcp and move
 cloud-provider-gcp-* groups there.

Also:
- remove sdmodi who left the GKE team.
- add mmamczur, member of the team that owns service controller part of cloupd-provider-gcp
- update OWNER_ALIASES, add a few people as OWNERS, remove abgworrall since he is no longer at Google
---
 OWNERS_ALIASES                            |  5 ++++-
 config/kubernetes/org.yaml                | 23 ----------------------
 config/kubernetes/provider-gcp/OWNERS     |  9 +++++++++
 config/kubernetes/provider-gcp/teams.yaml | 24 +++++++++++++++++++++++
 config/restrictions.yaml                  |  3 +++
 5 files changed, 40 insertions(+), 24 deletions(-)
 create mode 100644 config/kubernetes/provider-gcp/OWNERS
 create mode 100644 config/kubernetes/provider-gcp/teams.yaml

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index d4b64c0de2..723fbfb973 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -186,7 +186,10 @@ aliases:
     - feiskyer
     - khenidak
   provider-gcp:
-    - abgworrall
+    - aojea
+    - bowei
+    - thockin
+    - wojtek-t
   provider-ibmcloud:
     - spzala
   provider-openstack:
diff --git a/config/kubernetes/org.yaml b/config/kubernetes/org.yaml
index 610b8c67a9..8320ce68b8 100644
--- a/config/kubernetes/org.yaml
+++ b/config/kubernetes/org.yaml
@@ -1333,29 +1333,6 @@ teams:
     privacy: closed
     repos:
       client-go: write
-  cloud-provider-gcp-admins:
-    description: Admin access to cloud-provider-gcp repo
-    members:
-    - aojea
-    - bowei
-    - thockin
-    - wojtek-t
-    privacy: closed
-    repos:
-      cloud-provider-gcp: admin
-  cloud-provider-gcp-maintainers:
-    description: Write access to cloud-provider-gcp repo
-    members:
-    - aojea
-    - cheftako
-    - cici37
-    - jpbetz
-    - jprzychodzen
-    - mskrocki
-    - sdmodi
-    privacy: closed
-    repos:
-      cloud-provider-gcp: write
   cloud-provider-vsphere-admins:
     description: Admin access to cloud-provider-vsphere repo
     members:
diff --git a/config/kubernetes/provider-gcp/OWNERS b/config/kubernetes/provider-gcp/OWNERS
new file mode 100644
index 0000000000..5446b74685
--- /dev/null
+++ b/config/kubernetes/provider-gcp/OWNERS
@@ -0,0 +1,9 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+reviewers:
+  - provider-gcp
+approvers:
+  - provider-gcp
+labels:
+  - sig/cloud-provider
+  - area/provider/gcp
\ No newline at end of file
diff --git a/config/kubernetes/provider-gcp/teams.yaml b/config/kubernetes/provider-gcp/teams.yaml
new file mode 100644
index 0000000000..f361d87321
--- /dev/null
+++ b/config/kubernetes/provider-gcp/teams.yaml
@@ -0,0 +1,24 @@
+teams:
+  cloud-provider-gcp-admins:
+    description: Admin access to cloud-provider-gcp repo
+    members:
+    - aojea
+    - bowei
+    - thockin
+    - wojtek-t
+    privacy: closed
+    repos:
+      cloud-provider-gcp: admin
+  cloud-provider-gcp-maintainers:
+    description: Write access to cloud-provider-gcp repo
+    members:
+    - aojea
+    - cheftako
+    - cici37
+    - jpbetz
+    - jprzychodzen
+    - mmamczur
+    - mskrocki
+    privacy: closed
+    repos:
+      cloud-provider-gcp: write
\ No newline at end of file
diff --git a/config/restrictions.yaml b/config/restrictions.yaml
index bd3f765a79..4c36b266e7 100644
--- a/config/restrictions.yaml
+++ b/config/restrictions.yaml
@@ -54,6 +54,9 @@ restrictions:
     - "^perf-tests"
     - "^steering"
     - "^utils"
+  - path: "kubernetes/provider-gcp/teams.yaml"
+    allowedRepos:
+    - "^cloud-provider-gcp"
   - path: "kubernetes/provider-openstack/teams.yaml"
     allowedRepos:
     - "^cloud-provider-openstack"