From 062281aa05213f243e5e7bf8b7a4ca99fe235a81 Mon Sep 17 00:00:00 2001 From: Dave Protasowski Date: Wed, 22 Jan 2025 14:06:11 -0500 Subject: [PATCH] Update committee membership (#1657) * update steering - sort by term start * remove in-active group - coc goes to steering * drop members not affiliated with the wg anymore * update peribolos * remove dsimans from steering group * use steering alias for owners of a bunch of stuff --- STEERING-COMMITTEE.md | 36 ++++++++++---------- groups/committee-code-of-conduct/OWNERS | 6 ---- groups/committee-code-of-conduct/groups.yaml | 16 --------- groups/committee-steering/groups.yaml | 10 +----- groups/groups.yaml | 32 +++++------------ groups/restrictions.yaml | 3 -- groups/wg-productivity/groups.yaml | 3 -- groups/wg-security/groups.yaml | 6 +--- peribolos/knative-extensions.yaml | 33 ++++++++++-------- peribolos/knative.yaml | 31 +++++++++-------- 10 files changed, 63 insertions(+), 113 deletions(-) delete mode 100644 groups/committee-code-of-conduct/OWNERS delete mode 100644 groups/committee-code-of-conduct/groups.yaml diff --git a/STEERING-COMMITTEE.md b/STEERING-COMMITTEE.md index 90e1ced..856f5a4 100644 --- a/STEERING-COMMITTEE.md +++ b/STEERING-COMMITTEE.md @@ -104,15 +104,11 @@ first name): |   | Member | Organization | Profile | Term Start | Term End | |---------------------------------------------------------------|-------------------------|--------------|----------------------------------------------------|------------|----------| -| | Norris Sam Osarenkhoe * | SVA | [@nrrso](https://github.com/nrrso) | 2024-02-28 | 2025 | | | Ali Ok | Red Hat | [@aliok](https://github.com/aliok) | 2023-11-28 | 2025 | | | Evan Anderson | Stacklok | [@evankanderson](https://github.com/evankanderson) | 2023-11-28 | 2025 | -| | Naina Singh | Red Hat | [@nainaz](https://github.com/nainaz) | 2022-12-06 | 2024 | -| | Mauricio Salatino | Diagrid | [@salaboy](https://github.com/salaboy) | 2022-12-06 | 2024 | -| | David Hadas | IBM | [@davidhadas](https://github.com/davidhadas) | 2023-09-12 | 2024 | -| | Dave Protasowski | Independent | [@dprotaso](https://github.com/dprotaso) | 2021-05-26 | 2024 | -| | David Simansky | Red Hat | [@dsimansk](https://github.com/dsimansk) | 2022-06-01 | 2024 | -| | Paul Schweigert | IBM | [@psschwei](https://github.com/psschwei) | 2022-09-28 | 2024 | +| | Norris Sam Osarenkhoe * | SVA | [@nrrso](https://github.com/nrrso) | 2024-02-28 | 2025 | +| | Dave Protasowski | Independent | [@dprotaso](https://github.com/dprotaso) | 2024-09-17 | 2026 | +| | Matthias Wessendorf | Red Hat | [matzew](https://github.com/matzew) | 2024-12-24 | 2026 | > * Norris holds the End User seat ## Decision process @@ -352,20 +348,22 @@ To recognize the folks that have served in the KSC in the past, below we list th |----------------------------------------------------------------|----------------------|------------------------------------------------------|------------|----------| | | Dewitt Clinton | [@dewitt](https://github.com/dewitt) | Bootstrap | 2019 | | | Mark Charmny | [@mchmarny](https://github.com/mchmarny) | Bootstrap | 2019 | -| | Jaice Singer DuMars | [@jdumars](https://github.com/jdumars) | 2019 | 2020 | -| | Donna Malayeri | [@lindydonna](https://github.com/lindydonna) | 2019 | 2020 | | | Ryan Gregg | [@rgregg](https://github.com/rgregg) | Bootstrap | 2020 | | | Tomas Isdal | [@isdal](https://github.com/isdal) | Bootstrap | 2020 | -| | Alex Nicolau | [@anicolao](https://github.com/anicolao) | 2020 | 2020 | -| | Ron Avnur | [@ronavn](https://github.com/ronavn) | 2020 | 2020 | | | Brenda Chan | [@bsnchan](https://github.com/bsnchan) | Bootstrap | 2021 | | | Michael Behrendt | [@mbehrendt](https://github.com/mbehrendt) | Bootstrap | 2021 | +| | April Kyle Nassi | [@thisisnotapril](https://github.com/thisisnotapril) | Bootstrap | 2022 | +| | Jaice Singer DuMars | [@jdumars](https://github.com/jdumars) | 2019 | 2020 | +| | Donna Malayeri | [@lindydonna](https://github.com/lindydonna) | 2019 | 2020 | +| | Alex Nicolau | [@anicolao](https://github.com/anicolao) | 2020 | 2020 | +| | Ron Avnur | [@ronavn](https://github.com/ronavn) | 2020 | 2020 | | | Ville Aikas | [@vaikas](https://github.com/vaikas) | 2020 | 2022 | | | Paul Morie | [@pmorie](https://github.com/pmorie) | 2020 | 2022 | -| | April Kyle Nassi | [@thisisnotapril](https://github.com/thisisnotapril) | Bootstrap | 2022 | -| | Murugappan Chetty | [@itsmurugappan](https://github.com/itsmurugappan) | 2022 | 2023 | | | Carlos Santana | [@csantanapr](https://github.com/csantanapr) | 2021 | 2023 | | | Lance Ball | [@lance](https://github.com/lance) | 2021 | 2023 | +| | Murugappan Chetty | [@itsmurugappan](https://github.com/itsmurugappan) | 2022 | 2023 | +| | Naina Singh | [@nainaz](https://github.com/nainaz) | 2022-12-06 | 2024 | +| | Mauricio Salatino | [@salaboy](https://github.com/salaboy) | 2022-12-06 | 2024 | | | Adolfo García Veytia | [@puerco](https://github.com/puerco) | 2023 | 2024 | ### Technical Oversight Committee @@ -379,19 +377,21 @@ To recognize the folks that have served in the TOC in the past, below we list th |   | Member | Profile | Term Start | Term End | | -------------------------------------------------------------- | --------------- | --------------------------------------------------- | ---------- | ---------- | | | Ville Aikas | [@vaikas](https://github.com/vaikas) | Bootstrap | 2020 | -| | Nghia Tran | [@tcnghia](https://github.com/tcnghia) | 2020 | 2021 | +| | Evan Anderson | [@evankanderson](https://github.com/evankanderson) | Bootstrap | 2023-06-01 | | | Matt Moore | [@mattmoor](https://github.com/mattmoor) | Bootstrap | 2021 | +| | Nghia Tran | [@tcnghia](https://github.com/tcnghia) | 2020 | 2021 | | | Grant Rodgers | [@grantr](https://github.com/grantr) | 2020 | 2021 | | | Markus Thömmes | [@markusthoemmes](https://github.com/markusthoemmes) | 2020-06-09 | 2021-12-16 | | | Julian Friedman | [@julz](https://github.com/julz) | 2021-05-26 | 2022-02-07 | | | Roland Huß | [@rhuss](https://github.com/rhuss) | 2021-02-16 | 2022 | -| | Matt Moore | [@mattmoor](https://github.com/mattmoor) | 2022-02-07 | 2022 | +| | Dave Protasowski| [@dprotaso](https://github.com/dprotaso) | 2021-05-26 | 2024 | | | Scott Nichols | [@n3wscott](https://github.com/n3wscott) | 2022-01-11 | 2022-09-27 | -| | Evan Anderson | [@evankanderson](https://github.com/evankanderson) | Bootstrap | 2023-06-01 | +| | Matt Moore | [@mattmoor](https://github.com/mattmoor) | 2022-02-07 | 2022 | | | Zbynek Roubalik | [@zroubalik](https://github.com/zroubalik) | 2022-06-01 | 2023-07-31 | +| | David Simansky | [@dsimansk](https://github.com/dsimansk) | 2022-06-01 | 2024 | +| | Paul Schweigert | [@psschwei](https://github.com/psschwei) | 2022-09-28 | 2024 | | | Krsna Mahapatra | [@krsna-m](https://github.com/krsna-m) | 2023-06-01 | 2024 | - - +| | David Hadas | [@davidhadas](https://github.com/davidhadas) | 2023-09-12 | 2024 | --- Portions of this document are adapted from the diff --git a/groups/committee-code-of-conduct/OWNERS b/groups/committee-code-of-conduct/OWNERS deleted file mode 100644 index 5f73eb9..0000000 --- a/groups/committee-code-of-conduct/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -# The OWNERS file is used by prow to automatically merge approved PRs. - -approvers: -- steering-committee -reviewers: -- steering-committee diff --git a/groups/committee-code-of-conduct/groups.yaml b/groups/committee-code-of-conduct/groups.yaml deleted file mode 100644 index 1890891..0000000 --- a/groups/committee-code-of-conduct/groups.yaml +++ /dev/null @@ -1,16 +0,0 @@ -groups: - - email-id: code-of-conduct@knative.team - name: code-of-conduct - description: |- - Group for handling Code of Conduct issues. - Due to potentially sensitive nature of the issues discussed, this is a closed group. - settings: - AllowExternalMembers: "false" - ReconcileMembers: "true" - WhoCanPostMessage: "ANYONE_CAN_POST" - owners: - - pmorie@knative.team - - thisisnotapril@knative.team - - vaikas@knative.team - - lball@knative.team - - csantanapr@knative.team diff --git a/groups/committee-steering/groups.yaml b/groups/committee-steering/groups.yaml index b8649a6..4502f9f 100644 --- a/groups/committee-steering/groups.yaml +++ b/groups/committee-steering/groups.yaml @@ -10,15 +10,8 @@ groups: - aliok@redhat.com - developer@nrrso.com - evan.k.anderson@gmail.com - - naina.sng@gmail.com - - salaboy@gmail.com - - david.hadas@gmail.com - dprotaso@gmail.com - - dsimansk@redhat.com - - d.simansky@gmail.com - - paul@paulschweigert.com - - paulschw@us.ibm.com - + - mwessend@redhat.com - email-id: elections@knative.team name: elections @@ -30,4 +23,3 @@ groups: members: - dawn@dawnfoster.com - jberkus@redhat.com - - rlehmann@redhat.com diff --git a/groups/groups.yaml b/groups/groups.yaml index 5193449..0c51ee8 100644 --- a/groups/groups.yaml +++ b/groups/groups.yaml @@ -11,25 +11,13 @@ groups: MessageModerationLevel: "MODERATE_NON_MEMBERS" ReconcileMembers: "true" owners: - # SC - - aliok@redhat.com - - developer@nrrso.com - - evan.k.anderson@gmail.com - - naina.sng@gmail.com - - salaboy@gmail.com - # TOC - - david.hadas@gmail.com - - dprotaso@gmail.com - - dsimansk@redhat.com - - d.simansky@gmail.com - - paul@paulschweigert.com - - paulschw@us.ibm.com + - steering@knative.team members: # Serving # - dprotaso@gmail.com: already in the owners list # Client - # - dsimansk@knative.team: already in the owners list - # - dsimansk@redhat.com: already in the owners list + - dsimansk@knative.team + - dsimansk@redhat.com - rhuss@knative.team - rhuss@redhat.com # UX @@ -41,14 +29,14 @@ groups: - pierdipi@knative.team # Functions - lkinglan@redhat.com - # - salaboy@gmail.com: already in the owners list + - salaboy@gmail.com # Operations - houshengbo@knative.team # Productivity - cy@borg.dev - ksuszyns@redhat.com # Security - # - david.hadas@gmail.com: already in the owners list + - david.hadas@gmail.com # - evan.k.anderson@gmail.com: already in the owners list - email-id: calendar-maintainers@knative.team @@ -59,12 +47,9 @@ groups: AllowExternalMembers: "false" WhoCanPostMessage: "ANYONE_CAN_POST" owners: - - aliok@redhat.com - - developer@nrrso.com - - evan.k.anderson@gmail.com - - lkinglan@redhat.com - - naina.sng@gmail.com - - salaboy@gmail.com + - steering@knative.team + members: + - wg-leads@knative.team - email-id: admins@knative.dev name: admins @@ -74,5 +59,4 @@ groups: AllowExternalMembers: "false" WhoCanPostMessage: "ANYONE_CAN_POST" members: - - toc@knative.team - steering@knative.team diff --git a/groups/restrictions.yaml b/groups/restrictions.yaml index ccc0f95..2184d04 100644 --- a/groups/restrictions.yaml +++ b/groups/restrictions.yaml @@ -1,7 +1,4 @@ restrictions: - - path: "committee-code-of-conduct/groups.yaml" - allowedGroups: - - "^code-of-conduct@knative.team$" - path: "committee-steering/groups.yaml" allowedGroups: - "^steering@knative.team$" diff --git a/groups/wg-productivity/groups.yaml b/groups/wg-productivity/groups.yaml index 13be7dc..cbc7c5f 100644 --- a/groups/wg-productivity/groups.yaml +++ b/groups/wg-productivity/groups.yaml @@ -95,8 +95,5 @@ groups: - evana@vmware.com - evankanderson@knative.team - dprotaso@gmail.com - - paul@paulschweigert.com - - paulschw@us.ibm.com - - krsna@knative.team managers: - cy@borg.dev # Mahamed Ali diff --git a/groups/wg-security/groups.yaml b/groups/wg-security/groups.yaml index acbea52..30304ce 100644 --- a/groups/wg-security/groups.yaml +++ b/groups/wg-security/groups.yaml @@ -11,8 +11,4 @@ groups: - evan.k.anderson@gmail.com - evana@vmware.com - evankanderson@knative.team - - david.hadas@gmail.com - members: - - pablo@triggermesh.com - - vaikas@gmail.com - + - david.hadas@gmail.com \ No newline at end of file diff --git a/peribolos/knative-extensions.yaml b/peribolos/knative-extensions.yaml index ba3d8bc..fc1245b 100644 --- a/peribolos/knative-extensions.yaml +++ b/peribolos/knative-extensions.yaml @@ -9,20 +9,19 @@ orgs: members_can_create_repositories: false default_repository_permission: read admins: + # steering - aliok + - dprotaso + - evankanderson + - matzew + - nrrso + # cncf + - thelinuxfoundation - caniszczyk - cncf-ci - - davidhadas - - dprotaso - - dsimansk - - evankanderson - - knative-prow-robot - - nainaz - - nrrso - - psschwei - - salaboy - - thelinuxfoundation + # productivity - upodroid + - knative-prow-robot members: - aavarghese - alexagriffith @@ -50,10 +49,12 @@ orgs: - Cynocracy - daisy-ycguo - dan-j + - davidhadas - debasishbsws - devguyio - dilipgb - dolfolife + - dsimansk - duglin - firatbezir - gab-satchi @@ -74,6 +75,7 @@ orgs: - julz - jwcesign - k4leung4 + - kahirokunn - kauana - KauzClay - kellyaa @@ -85,21 +87,21 @@ orgs: - krithika369 - lance - lberk + - Leo6Leo - lionelvillard - liuchangyan - lkingland - - Leo6Leo - macruzbar - maschmid - matejvasek - mattmoor - - matzew - maximilien - mgencur - mkuratczyk - mmejia02 - mvinkler - nader-ziada + - nainaz - navidshaikh - norbjd - norman465 @@ -108,12 +110,14 @@ orgs: - pierDipi - pmorie - pradnyavmw + - psschwei - pymhq - RamyChaabane - ReToCode - rhuss - ricardozanini - richterdavid + - salaboy - sebgoa - senthilnathan - Shashankft9 @@ -135,20 +139,19 @@ orgs: - vdemeester - vishal-chdhry - vyasgun + - xiangpingjiang - xtreme-sameer-vohra - xtreme-vikram-yadav - xxinran - - xiangpingjiang - yanweiguo - yaron2 - yijie-04 - yuvalif - - zainabhusain227 - yuzisun + - zainabhusain227 - zhanggbj - zhaojizhuang - ZhiminXiang - - kahirokunn repos: # NOTE: If you are adding a repo here, you may also want to grant repo # permissions for one or more teams, in the next section. diff --git a/peribolos/knative.yaml b/peribolos/knative.yaml index 46139db..e0a7677 100644 --- a/peribolos/knative.yaml +++ b/peribolos/knative.yaml @@ -8,20 +8,19 @@ orgs: members_can_create_repositories: false default_repository_permission: read admins: + # steering - aliok + - dprotaso + - evankanderson + - matzew + - nrrso + # cncf + - thelinuxfoundation - caniszczyk - cncf-ci - - davidhadas - - dprotaso - - dsimansk - - evankanderson - - knative-prow-robot - - nainaz - - nrrso - - psschwei - - salaboy - - thelinuxfoundation + # productivity wg lead - upodroid + - knative-prow-robot members: - aavarghese - alexagriffith @@ -47,10 +46,12 @@ orgs: - csantanapr - Cynocracy - daisy-ycguo + - davidhadas - debasishbsws - devguyio - dilipgb - dolfolife + - dsimansk - duglin - eallred-google - firatbezir @@ -75,6 +76,7 @@ orgs: - julz - jwcesign - k4leung4 + - kahirokunn - kauana - KauzClay - kellyaa @@ -86,15 +88,14 @@ orgs: - krithika369 - lance - lberk + - Leo6Leo - lionelvillard - liuchangyan - lkingland - - Leo6Leo - macruzbar - maschmid - matejvasek - mattmoor - - matzew - maximilien - mchmarny - mgencur @@ -102,6 +103,7 @@ orgs: - mmejia02 - mvinkler - nader-ziada + - nainaz - navidshaikh - norman465 - odacremolbap @@ -110,6 +112,7 @@ orgs: - pmbanugo - pmorie - pradnyavmw + - psschwei - pymhq - quentin-cha - rahulii @@ -119,6 +122,7 @@ orgs: - RichieEscarez - richterdavid - sadath-12 + - salaboy - sebgoa - senthilnathan - Shashankft9 @@ -142,10 +146,10 @@ orgs: - vishal-chdhry - vyasgun - wlynch + - xiangpingjiang - xtreme-sameer-vohra - xtreme-vikram-yadav - xxinran - - xiangpingjiang - yanweiguo - yaron2 - yijie-04 @@ -155,7 +159,6 @@ orgs: - zhanggbj - zhaojizhuang - ZhiminXiang - - kahirokunn repos: # NOTE: If you are adding a repo here, you may also want to grant repo # permissions for one or more teams, in the next section.