Merge pull request #4284 from justaugustus/rel-slack-teams

releng: Update release-managers Slack user group

4 files changed, 29 insertions, 18 deletions

diff --git a/communication/slack-config/restrictions.yaml b/communication/slack-config/restrictions.yaml
index ff62c99e..01dd8bde 100644
--- a/communication/slack-config/restrictions.yaml
+++ b/communication/slack-config/restrictions.yaml
@@ -17,6 +17,8 @@ restrictions:
     channels:
       - "^sig-release$"
       - "^release-"
+    usergroups:
+      - "^release-"
   - path: "sig-storage/*.yaml"
     channels:
       - "^sig-storage$"
diff --git a/communication/slack-config/sig-release/usergroups.yaml b/communication/slack-config/sig-release/usergroups.yaml
new file mode 100644
index 00000000..92f0dbd1
--- /dev/null
+++ b/communication/slack-config/sig-release/usergroups.yaml
@@ -0,0 +1,20 @@
+# This file contains a list of all Slack User Groups that are managed by SIG Release.
+
+usergroups:
+  - name: release-managers
+    long_name: Release Managers
+    description: Release Managers. Ping for questions on branch cuts and building/packaging Kubernetes.
+    channels:
+      - release-management
+      - sig-release
+    members:
+      - aleksandra-malinowska # Patch Release Team
+      - calebamiles # subproject owner
+      - cpanato # Branch Manager
+      - dougm # Patch Release Team
+      - feiskyer # Patch Release Team
+      - hoegaarden # Patch Release Team
+      - idealhack # Patch Release Team
+      - justaugustus # subproject owner / Patch Release Team
+      - saschagrunert # Branch Manager
+      - tpepper # subproject owner / Patch Release Team
diff --git a/communication/slack-config/usergroups.yaml b/communication/slack-config/usergroups.yaml
index 321320e2..1e3dc009 100644
--- a/communication/slack-config/usergroups.yaml
+++ b/communication/slack-config/usergroups.yaml
@@ -1,23 +1,9 @@
-# This file contains a list of all Slack usergroups that exist.
+# This file contains a top-level list of Slack User Groups.
+# SIG-specific User Groups may be defined within a SIG's subdirectory
+#
+# e.g., @release-managers is defined in sig-release/usergroups.yaml
 
 usergroups:
-  - name: release-managers
-    long_name: Release Managers
-    description: Release Managers. Ping for questions on branch cuts and building/packaging Kubernetes.
-    channels:
-      - release-management
-      - sig-release
-    members:
-      - aleksandra-malinowska
-      - bubblemelon
-      - calebamiles
-      - feiskyer
-      - hoegaarden
-      - idealhack
-      - justaugustus
-      - listx
-      - sumitranr
-      - tpepper
   - name: test-infra-oncall
     external: true
   - name: youtube-admins
diff --git a/communication/slack-config/users.yaml b/communication/slack-config/users.yaml
index 19d423f4..1daa0849 100644
--- a/communication/slack-config/users.yaml
+++ b/communication/slack-config/users.yaml
@@ -6,6 +6,8 @@ users:
   bubblemelon: U7K9C643G
   calebamiles: U1ZDD4CUR
   castrojo: U1W1Q6PRQ
+  cpanato: U8DFY4TTK
+  dougm: U8GG20UE9
   feiskyer: U0ASA4398
   hoegaarden: U7VA4RZS9
   idealhack: U5NJ3DQM9
@@ -19,5 +21,6 @@ users:
   mrbobbytables: U511ZSKHD
   paris: U5SB22BBQ
   sarahnovotny: U0AGW7007
+  saschagrunert: U53SUDBD4
   sumitranr: UCQN13L9H
   tpepper: U6UB5V4TX