From 92389fc30de90668b443a44ebe34544da5e59767 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 27 Apr 2021 21:08:39 -0400 Subject: [PATCH 1/7] slack/sig-release: Update guidance on release-team-leads membership Signed-off-by: Stephen Augustus --- communication/slack-config/sig-release/usergroups.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/communication/slack-config/sig-release/usergroups.yaml b/communication/slack-config/sig-release/usergroups.yaml index b577abb50..948186943 100644 --- a/communication/slack-config/sig-release/usergroups.yaml +++ b/communication/slack-config/sig-release/usergroups.yaml @@ -30,8 +30,13 @@ usergroups: - Verolop # Release Manager Associate - xmudrii # Release Manager - # Should match the Release Team Leads of the current cycle and SIG Chairs at all times - # Current release cycle: https://git.k8s.io/sig-release/releases/release-1.20/release_team.md + # Should match the membership of the following groups at all times: + # - Release Team Lead + # - Release Team Lead shadows + # - Emeritus Adviser + # - SIG Release leads + # + # Current release cycle: https://git.k8s.io/sig-release/releases/release-1.22/release_team.md - name: release-team-leads long_name: Release Team Leads description: >- From a409b464078d823d6e9018d000b9011d810046e5 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 27 Apr 2021 21:09:52 -0400 Subject: [PATCH 2/7] slack: Alpha-sort Anna's username Signed-off-by: Stephen Augustus --- communication/slack-config/users.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/communication/slack-config/users.yaml b/communication/slack-config/users.yaml index 352b03f25..2d7d743c6 100644 --- a/communication/slack-config/users.yaml +++ b/communication/slack-config/users.yaml @@ -7,8 +7,8 @@ users: AlexB138: U3JA3MDGV alisondy: U9CBCBLCV ameukam: U68KPQ448 - annajung: U8SLB1P2Q ankeesler: UBAA1KQ4A + annajung: U8SLB1P2Q aravindputrevu: U1G27SDU6 ashish-amarnath: U65JLLS0J asmacdo: UNVH7RY9J From 7f6caf8aa0c63c534efd3c4c2284931952fa32a4 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 27 Apr 2021 21:10:46 -0400 Subject: [PATCH 3/7] slack/sig-release: Offboard Jorge from sig-release-leads Signed-off-by: Stephen Augustus --- communication/slack-config/sig-release/usergroups.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/communication/slack-config/sig-release/usergroups.yaml b/communication/slack-config/sig-release/usergroups.yaml index 948186943..b811afd93 100644 --- a/communication/slack-config/sig-release/usergroups.yaml +++ b/communication/slack-config/sig-release/usergroups.yaml @@ -75,7 +75,6 @@ usergroups: - release-management - sig-release members: - - alejandrox1 # SIG Release Technical Lead - hasheddan # SIG Release Technical Lead - jeremyrickard # SIG Release Technical Lead - justaugustus # SIG Release Chair From d42e3981b7dc28378fe224a66cece733ce7a83a2 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 27 Apr 2021 21:13:38 -0400 Subject: [PATCH 4/7] slack/sig-release: Add Wilson Husin to release-managers Signed-off-by: Stephen Augustus --- communication/slack-config/sig-release/usergroups.yaml | 1 + communication/slack-config/users.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/communication/slack-config/sig-release/usergroups.yaml b/communication/slack-config/sig-release/usergroups.yaml index b811afd93..38db31743 100644 --- a/communication/slack-config/sig-release/usergroups.yaml +++ b/communication/slack-config/sig-release/usergroups.yaml @@ -28,6 +28,7 @@ usergroups: - saschagrunert # subproject owner / Release Manager - sethmccombs # Release Manager Associate - Verolop # Release Manager Associate + - wilsonehusin # Release Manager Associate - xmudrii # Release Manager # Should match the membership of the following groups at all times: diff --git a/communication/slack-config/users.yaml b/communication/slack-config/users.yaml index 2d7d743c6..f4461531f 100644 --- a/communication/slack-config/users.yaml +++ b/communication/slack-config/users.yaml @@ -126,6 +126,7 @@ users: varshaprasad96: UK59YP2DA Verolop: U7NNE57PU vladimirmukhin: UHVSCSD4G + wilsonehusin: U0100068GF2 wurbanski: URX7CMK97 xmudrii: U4Q2TNGVD zubron: U7G0KNS86 \ No newline at end of file From 525817b713cd8bd481d0c65853cf03273823db47 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 27 Apr 2021 21:15:47 -0400 Subject: [PATCH 5/7] slack/usergroups: Alpha-sort Tabby in product-security-committee Signed-off-by: Stephen Augustus --- communication/slack-config/usergroups.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/communication/slack-config/usergroups.yaml b/communication/slack-config/usergroups.yaml index dfac52020..49ca87cad 100644 --- a/communication/slack-config/usergroups.yaml +++ b/communication/slack-config/usergroups.yaml @@ -58,8 +58,8 @@ usergroups: - lukehinds - micahhausler - swamymsft - - tallclair - tabbysable + - tallclair - name: velero-maintainers long_name: Velero Maintainers From 2d34dde7496bf89cd22e28d53bbc38460899b754 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 27 Apr 2021 21:23:31 -0400 Subject: [PATCH 6/7] slack/sig-release: Add Tabby to Security Release Team usergroup Signed-off-by: Stephen Augustus --- communication/slack-config/sig-release/usergroups.yaml | 2 +- communication/slack-config/usergroups.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/communication/slack-config/sig-release/usergroups.yaml b/communication/slack-config/sig-release/usergroups.yaml index 38db31743..fe095d087 100644 --- a/communication/slack-config/sig-release/usergroups.yaml +++ b/communication/slack-config/sig-release/usergroups.yaml @@ -95,7 +95,6 @@ usergroups: - sig-release members: - cjcullen # Product Security Committee - - cji # Product Security Committee - cpanato # Release Manager - feiskyer # Release Manager - hasheddan # subproject owner / Release Manager @@ -107,5 +106,6 @@ usergroups: - puerco # Release Manager - saschagrunert # subproject owner / Release Manager - swamymsft # Product Security Committee + - tabbysable # Product Security Committee - tallclair # Product Security Committee - xmudrii # Release Manager diff --git a/communication/slack-config/usergroups.yaml b/communication/slack-config/usergroups.yaml index 49ca87cad..8cb52b7f2 100644 --- a/communication/slack-config/usergroups.yaml +++ b/communication/slack-config/usergroups.yaml @@ -44,6 +44,9 @@ usergroups: # Should match the membership of the following teams at all times: # - https://git.k8s.io/security/#product-security-committee-psc + # + # Ensure any changes are also reflected in the Security Release Team + # usergroup (within the SIG Release config directory). - name: product-security-committee long_name: Product Security Committee description: |- From bca7b156747c4b8299d51a3006f9a327a5935db1 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 27 Apr 2021 21:25:36 -0400 Subject: [PATCH 7/7] slack/sig-release: s/security-release-team/security-rel-team When initially attempting to create this usergroup, its description was too long for Slack to accept. The original group name exists... somewhere... in Slack, but it's no longer possible to update it (despite shortening the description in previous follow-ups). Here we rename the group so it can be properly created by Tempelis. Signed-off-by: Stephen Augustus --- communication/slack-config/restrictions.yaml | 2 +- communication/slack-config/sig-release/usergroups.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/communication/slack-config/restrictions.yaml b/communication/slack-config/restrictions.yaml index 8ea7a59bd..19ba37ab6 100755 --- a/communication/slack-config/restrictions.yaml +++ b/communication/slack-config/restrictions.yaml @@ -34,7 +34,7 @@ restrictions: usergroups: - "^sig-release-" - "^release-" - - "^security-release-team$" + - "^security-rel-team$" - path: "sig-security/*.yaml" channels: - "^sig-security$" diff --git a/communication/slack-config/sig-release/usergroups.yaml b/communication/slack-config/sig-release/usergroups.yaml index fe095d087..0c60fc562 100644 --- a/communication/slack-config/sig-release/usergroups.yaml +++ b/communication/slack-config/sig-release/usergroups.yaml @@ -85,7 +85,7 @@ usergroups: # Should match the membership of the following teams at all times: # - https://git.k8s.io/security/#product-security-committee-psc # - https://git.k8s.io/sig-release/release-managers.md#release-managers - - name: security-release-team + - name: security-rel-team long_name: Security Release Team description: >- Composite of Product Security Committee members and Release Managers. Ping