From a16ab21c93ed6a1f19c87634b68eb90f526313e4 Mon Sep 17 00:00:00 2001 From: Evan Anderson Date: Sun, 30 Jun 2024 18:32:08 -0700 Subject: [PATCH 1/7] Combine Steering and TOC committees; merging current memberships and establishing process for future 1-election-per-year schedule. --- STEERING-COMMITTEE.md | 187 +++++++++++++++++++++++++----------- TECH-OVERSIGHT-COMMITTEE.md | 128 ------------------------ 2 files changed, 132 insertions(+), 183 deletions(-) delete mode 100644 TECH-OVERSIGHT-COMMITTEE.md diff --git a/STEERING-COMMITTEE.md b/STEERING-COMMITTEE.md index 4a95b3cd..50d3fdae 100644 --- a/STEERING-COMMITTEE.md +++ b/STEERING-COMMITTEE.md @@ -1,14 +1,16 @@ --- title: "Knative steering committee" linkTitle: "Steering committee" -weight: 40 +weight: 35 type: "docs" aliases: - /contributing/steering-committee/ + - /contributing/tech-oversight-committee/ --- -The Knative Steering Committee (KSC) is -[responsible for the general health of the Knative community](./GOVERNANCE.md). +The Knative Steering Committee (KSC) is [responsible for the general health of +the Knative community, as well as establishing and coordinating other working +groups](./GOVERNANCE.md). The governance of Knative is an open, living document, and will continue to evolve as the community and project change. @@ -38,15 +40,20 @@ evolve as the community and project change. 1. Define, evolve, and promote the vision, values, and mission of the project. 1. Define and evolve project governance structures and policies, including project roles and how collaborators become members, approvers, leads, and/or - administrators. This includes policy for the creation and administration of + administrators. This includes the creation and administration of [working groups](./working-groups/WORKING-GROUPS.md) and committees. +1. Coordinate and empower subcomponents of the Knative project, including + ensuring compatibility between components, and developing long-term vision + for the project's technical direction. 1. Steward, control access, delegate access, and establish processes regarding - all Knative project resources and has the final say in the disposition of - those resources. + all Knative project resources (including repositories and GitHub + organizations), and provide the final say in the disposition of those + resources. 1. Coordinate with the CNCF regarding usage of the Knative brand and how that brand can be used in relation to other efforts or vendors. -1. Define and evolve the scope of the Knative community and extensions, and the - process for migration of extensions projects into Knative Extensions. +1. Define and evolve the scope of the Knative community and extensions, the + lifecycle of community-maintained code and releases, and processes and + standards for accepting project contributions. 1. Receive and handle reports about [code of conduct](./CODE-OF-CONDUCT.md) violations and maintain confidentiality. 1. Receive security reports; work with the appropriate technical leads to accept @@ -60,8 +67,8 @@ evolve as the community and project change. KSC may choose to delegate its authority to other committees as-needed. The committee currently recognizes this delegated authority for: -- Technical guidance is delegated to the - [Technical Oversight Committee](./TECH-OVERSIGHT-COMMITTEE.md). +- Individual Working Groups, as described in [the working groups + document](./working-groups/WORKING-GROUPS.md). ## Committee Meetings @@ -86,7 +93,10 @@ for other options. ## Committee members Seats on the Steering Committee are held by an individual, not by their -employer. +employer. The current composition of the Steering Committee consists of members +elected to the Steering Committee in 2022 and 2023, and the members of the +Technical Oversight Committee elected in 2022; this is a temporary measure until +elections are held in 2024. The current membership of the committee is currently (listed alphabetically by first name): @@ -98,30 +108,11 @@ first name): | | Evan Anderson | VMware | [@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 | VMware | [@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 holds the End User seat -## Emeritus Committee Members - -To recognize the folks that have served in the SC in the past, below we list the previous members of the SC (sorted by their 'Term End'). - -|   | Member | Profile | Term Start | Term End | -|----------------------------------------------------------------|----------------------|------------------------------------------------------|------------|----------| -| | 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 | -| | 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 | -| | Adolfo García Veytia | [@puerco](https://github.com/puerco) | 2023 | 2024 | ## Decision process @@ -139,7 +130,7 @@ Quorum is considered reached when at least half of the members are present. ## Getting in touch -There are two ways to raise issues to the steering committee for decision: +There are three ways to raise issues to the steering committee for decision: 1. Emailing the steering committee at [steering@knative.team](mailto:steering@knative.team). @@ -147,16 +138,33 @@ There are two ways to raise issues to the steering committee for decision: access. 2. Open an issue on a knative repository and indicate that you would like attention from the steering committee. + +3. Asking a question on the + [#knative-toc-sc-questions](https://cloud-native.slack.com/archives/C04LQCW0C03) + channel on [CNCF Slack](https://cloud-native.slack.com/). ## Composition -The Steering Committee has five (5) seats. Of these five seats, four (4) are elected -Contributing seats, open to any project contributor, and one (1) is an -[End User Seat](#end-user-seat) appointed by the Steering Committee. +The Steering Committee has five (7) seats. These 7 seats are composed as follows: + +- Four (4) are elected Contributing Seats, open to any project contributor. + Contributing Seats are elected every year, and serve a two-year term. In the + event of a vacancy, the Steering Committee may select a replacement to serve + out the remainder of the term. + +- One (1) is an [End User Seat](#end-user-seat) appointed by the Steering + Committee. The End User Seat serves until the next elected Steering Committee + appoints a replacement in the two months after members are seated, as + described below. + +- Up to two Selected Seats (2) are appointed by the Steering Committee to + balance the set of skills on the Steering Committee. These seats serve a + 1-year term, until Contributing Seats for the next Steering Committee election + are seated. Steering Committee contributing members serve for 2-year terms, staggered in -order to preserve continuity. End user member serves for 1-year term. Every year -two contributor seats are elected. +order to preserve continuity. End user and selected members serve for 1-year +terms. Every year two contributor seats are elected. ## Election Procedure @@ -236,20 +244,20 @@ found in the [elections folder](./elections). ### Limitations on Company Representation -No more than two seats may be held by employees of the same organization (or -conglomerate, in the case of companies owning each other). Additionally, each +No more than two contributing seats may be held by employees of the same organization +(or conglomerate, in the case of companies owning each other). Additionally, each end user seat (when available) must belong to an employee from a different organization. If the results of an election result in greater than two employees of the same organization, the lowest vote getters from any particular employer will be removed until representation on the committee is down to two. If employers change because of job changes, acquisitions, or other events, in a -way that would yield more than 2 seats being held by employees of the same -organization, sufficient members of the committee must resign until only two -employees of the same employer are left. If it is impossible to find sufficient -members to resign, all employees of that organization will be removed and new -special elections held. In the event of a question of company membership (for -example evaluating independence of corporate subsidiaries) a majority of all +way that would yield more than 2 contributing seats being held by employees of +the same organization, sufficient members of the committee must resign until only +two employees of the same employer are left. If it is impossible to find +sufficient members to resign, all employees of that organization will be removed +and new special elections held. In the event of a question of company membership +(for example evaluating independence of corporate subsidiaries) a majority of all non-involved Steering Committee members will decide. ## End User Seat @@ -265,6 +273,24 @@ new person to the end user seat. The person filling the end user seat will take office in February. +## Selected Seats + +The Steering Committee shall have the discretion to appoint up to two additional +members to the Steering Commitee to balance out the set of skills on the +committee. (For example, if the current Steering Committee is lacking anyone +with marketing background, it might choose to appoint a community member with +thas expertise to a selected seat.) + +Selected seats serve for a 1-year term, until the next Steering Committee +Contributed Seats take office. + +When new Steering Commitee members are seated in December after the elections +for the Contributing Seats, the newly-constituted Steering Committee (consisting +of the four Contributing Seats and the End-User Seat) may appoint additional +Selected Seats. The Steering Committee is not required to fill these Selected +Seats. The persons filling the Selected Seats will take office upon accepting +the appointment. + ## Vacancies In the event of a resignation or other loss of an elected SC member, the @@ -280,7 +306,9 @@ election. Any replacement SC member will serve out the remainder of the term for the person they are replacing, regardless of the length of that remainder. In the event of a resignation or other loss of an appointed end user KSC member, -the SC will appoint a new person to fill the end user SC seat. +the SC will appoint a new person to fill the end user SC seat. In the event of +a resignation or other loss of an appointed select KSC member, the SC may choose +whether to appoint a new person to fill the seat. ## Changes to the charter @@ -294,20 +322,69 @@ one week for comments and questions before a vote will occur. ## Authority, Facilitation, and Decision Making in Knative Ideally most decisions will be made at the lowest possible level within the -project: within individual working groups. When this is not possible for -technical decisions, the TOC can help facilitate a conversation to work through -the contended issue. When facilitation by the TOC does not resolve the contended -issue, the Steering Committee can help facilitate. When facilitation by the SC -does not resolve the contention, the SC may have to make a decision. +project: within individual working groups. When this is not possible, the +Steering Committee can help facilitate a conversation to work through the +contended issue. When facilitation by the SC does not resolve the contention, +the SC may have to make a decision. Note that if the SC is called to resolve contended decisions regularly, it is a symptom of a larger problem in the community that will need to be addressed. + + +## Emeritus Committee Members + + + +### Steering Committee + +To recognize the folks that have served in the SC in the past, below we list the previous members of the SC (sorted by their 'Term End'). + +|   | Member | Profile | Term Start | Term End | +|----------------------------------------------------------------|----------------------|------------------------------------------------------|------------|----------| +| | 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 | +| | 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 | +| | Adolfo García Veytia | [@puerco](https://github.com/puerco) | 2023 | 2024 | + +### Technical Oversight Committee + +To recognize the folks that have served in the TOC in the past, below we list the previous members of the TOC (sorted by their 'Term End'). + +|   | Member | Profile | Term Start | Term End | +| -------------------------------------------------------------- | --------------- | --------------------------------------------------- | ---------- | ---------- | +| | Ville Aikas | [@vaikas](https://github.com/vaikas) | Bootstrap | 2020 | +| | Nghia Tran | [@tcnghia](https://github.com/tcnghia) | 2020 | 2021 | +| | Matt Moore | [@mattmoor](https://github.com/mattmoor) | Bootstrap | 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 | +| | Scott Nichols | [@n3wscott](https://github.com/n3wscott) | 2022-01-11 | 2022-09-27 | +| | Evan Anderson | [@evankanderson](https://github.com/evankanderson) | Bootstrap | 2023-06-01 | +| | Zbynek Roubalik | [@zroubalik](https://github.com/zroubalik) | 2022-06-01 | 2023-07-31 | +| | Krsna Mahapatra | [@krsna-m](https://github.com/krsna-m) | 2023-06-01 | 2024 | + + --- Portions of this document are adapted from the [Istio Steering Committee](https://github.com/istio/community/blob/master/STEERING-COMMITTEE.md) -documentation, and other portions are copied from the +documentation, the [CNCF Charter](https://github.com/cncf/foundation/blob/main/charter.md), and other portions are copied from the [Kubernetes Steering Committee](https://github.com/kubernetes/steering/blob/master/elections.md), both of which are licensed under the Apache License 2.0. diff --git a/TECH-OVERSIGHT-COMMITTEE.md b/TECH-OVERSIGHT-COMMITTEE.md deleted file mode 100644 index 3eae7896..00000000 --- a/TECH-OVERSIGHT-COMMITTEE.md +++ /dev/null @@ -1,128 +0,0 @@ ---- -title: "Knative technical oversight committee" -linkTitle: "Technical oversight committee" -weight: 35 -type: "docs" -aliases: - - /contributing/tech-oversight-committee/ ---- - -The Knative Technical Oversight Committee (TOC) is responsible for cross-cutting -product and design decisions. - -- [Charter](#charter) -- [Committee Mechanics](#committee-mechanics) -- [Committee Meeting](#committee-meeting) -- [Committee Members](#committee-members) - -## Charter - -- Technical Project Oversight, Direction & Delivery - - - Set the overall technical direction and roadmap of the project. - - - Resolve technical issues, technical disagreements and escalations within the - project. - - - Set the priorities of individual releases to ensure coherency and proper - sequencing. - - - Approve declaring a new long-term supported (LTS) Knative release. - - - Approve the creation and dissolution of working groups and approve - leadership changes of working groups. - - - Create proposals based on TOC discussions and bring them to the relevant - working groups for discussion. - - - Approve the creation/deletion of GitHub repositories, along with other - high-level administrative issues around GitHub and our other tools. - - - Advise the Steering Committe on conformance rules and tests that - define brand use decisions. - -- Happy Healthy Community - - - Establish and maintain the overall technical governance guidelines for the - project. - - - Decide which sub-projects are part of the Knative project, including - accepting new sub-projects and pruning existing sub-projects to maintain - community focus - - - Ensure the team adheres to our - [code of conduct](./CONTRIBUTING.md#code-of-conduct) and respects our - [values](./VALUES.md). - - - Foster an environment for a healthy and happy community of developers and - contributors. - -## Committee Mechanics - -The TOC is [elected by the community](./mechanics/TOC.md). - -The TOC’s work includes: - -- Regular committee meetings to discuss hot topics, resulting in a set of - published - [meeting notes](https://docs.google.com/document/d/1LzOUbTMkMEsCRfwjYm5TKZUWfyXpO589-r9K2rXlHfk/edit). - -- Create, review, approve and publish technical project governance documents. - -- Create proposals for consideration by individual working groups to help steer - their work towards a common project-wide objective. - -- Review/address/comment on project issues. - -- Act as a high-level sounding board for technical questions or designs bubbled - up by the working groups. - -## Committee Meeting - -Community members are encouraged to suggest topics for discussion ahead of the -TOC meetings, and are invited to observe these meetings and engage with the TOC -during the community feedback period at the end of each meeting. - -| Artifact | Link | -| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Google Group | [knative-tech-oversight@googlegroups.com](https://groups.google.com/forum/#!forum/knative-tech-oversight) | -| Community Meeting VC | See the top of the [Meeting notes](https://docs.google.com/document/d/1LzOUbTMkMEsCRfwjYm5TKZUWfyXpO589-r9K2rXlHfk/edit) | -| Community Meeting Calendar | Wednesdays at 10:00a-10:45a ET
[Calendar](https://calendar.google.com/calendar/embed?src=knative.team_9q83bg07qs5b9rrslp5jor4l6s%40group.calendar.google.com) | -| Meeting Notes | [Notes](https://docs.google.com/document/d/1LzOUbTMkMEsCRfwjYm5TKZUWfyXpO589-r9K2rXlHfk/edit) | -| Document Folder | [Folder](https://drive.google.com/drive/folders/13-h81zualjRSNkCSFItODfk-NZ7dkMut) | - -## Committee Members - -The current members of the TOC are shown below. - -|   | Member | Company | Profile | Term Start | Term End | -| -------------------------------------------------------------- | ---------------- | ---------- | ---------------------------------------------------- | ---------- | -------- -| | David Hadas | IBM | [@davidhadas](https://github.com/davidhadas) | 2023-09-12 | 2024 | -| | Dave Protasowski | VMware | [@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 | -## Emeritus Committee Members - -To recognize the folks that have served in the TOC in the past, below we list the previous members of the TOC (sorted by their 'Term End'). - -|   | Member | Profile | Term Start | Term End | -| -------------------------------------------------------------- | --------------- | --------------------------------------------------- | ---------- | ---------- | -| | Ville Aikas | [@vaikas](https://github.com/vaikas) | Bootstrap | 2020 | -| | Nghia Tran | [@tcnghia](https://github.com/tcnghia) | 2020 | 2021 | -| | Matt Moore | [@mattmoor](https://github.com/mattmoor) | Bootstrap | 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 | -| | Scott Nichols | [@n3wscott](https://github.com/n3wscott) | 2022-01-11 | 2022-09-27 | -| | Evan Anderson | [@evankanderson](https://github.com/evankanderson) | Bootstrap | 2023-06-01 | -| | Zbynek Roubalik | [@zroubalik](https://github.com/zroubalik) | 2022-06-01 | 2023-07-31 | -| | Krsna Mahapatra | [@krsna-m](https://github.com/krsna-m) | 2023-06-01 | 2024 | - ---- - -Except as otherwise noted, the content of this page is licensed under the -[Creative Commons Attribution 4.0 License](https://creativecommons.org/licenses/by/4.0/), -and code samples are licensed under the -[Apache 2.0 License](https://www.apache.org/licenses/LICENSE-2.0). From 6f96072b4c9cfd07fdeadd558b3b33ce83bf78c0 Mon Sep 17 00:00:00 2001 From: Evan Anderson Date: Tue, 16 Jul 2024 11:34:22 -0700 Subject: [PATCH 2/7] Add total company representation limits --- STEERING-COMMITTEE.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/STEERING-COMMITTEE.md b/STEERING-COMMITTEE.md index 50d3fdae..f4e98635 100644 --- a/STEERING-COMMITTEE.md +++ b/STEERING-COMMITTEE.md @@ -245,19 +245,20 @@ found in the [elections folder](./elections). ### Limitations on Company Representation No more than two contributing seats may be held by employees of the same organization -(or conglomerate, in the case of companies owning each other). Additionally, each -end user seat (when available) must belong to an employee from a different -organization. If the results of an election result in greater than two employees -of the same organization, the lowest vote getters from any particular employer -will be removed until representation on the committee is down to two. - -If employers change because of job changes, acquisitions, or other events, in a -way that would yield more than 2 contributing seats being held by employees of -the same organization, sufficient members of the committee must resign until only -two employees of the same employer are left. If it is impossible to find -sufficient members to resign, all employees of that organization will be removed -and new special elections held. In the event of a question of company membership -(for example evaluating independence of corporate subsidiaries) a majority of all +(or conglomerate, in the case of companies owning each other). Additionally, each end +user seat (when available) must belong to an employee from a different +organization. No company may hold a majority (fifty percent or more) of the total +Steering Committee seats through any combination of contributing, end-user, and +selected seats. If the results of an election result in greater than two employees of +the same organization, the lowest vote getters from any particular employer will be +removed until representation on the committee is down to two from that organization. + +If employers change because of job changes, acquisitions, or other events, in a way +that would violate the company representation rules above, sufficient members of the +committee must resign until the composition rules are met. If it is impossible to +find sufficient members to resign, all employees of that organization will be removed +and new special elections held. In the event of a question of company membership (for +example evaluating independence of corporate subsidiaries) a majority of all non-involved Steering Committee members will decide. ## End User Seat From 8a280977ff296a309eddfffe724198ea9cfe4b7b Mon Sep 17 00:00:00 2001 From: Evan Anderson Date: Tue, 16 Jul 2024 11:35:30 -0700 Subject: [PATCH 3/7] Fix my company affiliation --- STEERING-COMMITTEE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/STEERING-COMMITTEE.md b/STEERING-COMMITTEE.md index f4e98635..713c3d6b 100644 --- a/STEERING-COMMITTEE.md +++ b/STEERING-COMMITTEE.md @@ -105,7 +105,7 @@ first name): |---------------------------------------------------------------|-------------------------|--------------|----------------------------------------------------|------------|----------| | | 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 | VMware | [@evankanderson](https://github.com/evankanderson) | 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 | From a6f799d5e62c757482d03732b84495601a835d54 Mon Sep 17 00:00:00 2001 From: Evan Anderson Date: Tue, 27 Aug 2024 09:05:57 -0700 Subject: [PATCH 4/7] Update STEERING-COMMITTEE.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Roland Huß --- STEERING-COMMITTEE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/STEERING-COMMITTEE.md b/STEERING-COMMITTEE.md index 713c3d6b..7b5c3bbc 100644 --- a/STEERING-COMMITTEE.md +++ b/STEERING-COMMITTEE.md @@ -145,7 +145,7 @@ There are three ways to raise issues to the steering committee for decision: ## Composition -The Steering Committee has five (7) seats. These 7 seats are composed as follows: +The Steering Committee has seven (7) seats. These 7 seats are composed as follows: - Four (4) are elected Contributing Seats, open to any project contributor. Contributing Seats are elected every year, and serve a two-year term. In the From 5bab472277034afb78773a2e5ebe05ddf0e781e7 Mon Sep 17 00:00:00 2001 From: Evan Anderson Date: Tue, 27 Aug 2024 10:00:17 -0700 Subject: [PATCH 5/7] Clarify and correct a bunch of inconsistencies pointed out by rhuss and aliok --- STEERING-COMMITTEE.md | 77 +++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/STEERING-COMMITTEE.md b/STEERING-COMMITTEE.md index 7b5c3bbc..dbb9b653 100644 --- a/STEERING-COMMITTEE.md +++ b/STEERING-COMMITTEE.md @@ -145,12 +145,13 @@ There are three ways to raise issues to the steering committee for decision: ## Composition -The Steering Committee has seven (7) seats. These 7 seats are composed as follows: +The Steering Committee has between five (5) and seven (7) members. These seats are +composed as follows: - Four (4) are elected Contributing Seats, open to any project contributor. - Contributing Seats are elected every year, and serve a two-year term. In the - event of a vacancy, the Steering Committee may select a replacement to serve - out the remainder of the term. + Two (2) Contributing Seats are elected every year, and serve a two-year term. + In the event of a vacancy, the Steering Committee may select a replacement to + serve out the remainder of the term. - One (1) is an [End User Seat](#end-user-seat) appointed by the Steering Committee. The End User Seat serves until the next elected Steering Committee @@ -166,6 +167,25 @@ Steering Committee contributing members serve for 2-year terms, staggered in order to preserve continuity. End user and selected members serve for 1-year terms. Every year two contributor seats are elected. +### Limitations on Company Representation + +No more than two contributing seats may be held by employees of the same organization +(or conglomerate, in the case of companies owning each other). Additionally, the end +user seat must belong to an employee from a different organization. No company may +hold a majority (fifty percent or more) of the total Steering Committee seats through +any combination of contributing, end-user, and selected seats. If the results of an +election result in greater than two employees of the same organization, the lowest +vote getters from any particular employer will be removed until representation on +the committee is down to two from that organization. + +If employers change because of job changes, acquisitions, or other events, in a way +that would violate the company representation rules above, sufficient members of the +committee must resign until the composition rules are met. If it is impossible to +find sufficient members to resign, all employees of that organization will be removed +and new special elections held. In the event of a question of company membership (for +example evaluating independence of corporate subsidiaries) a majority of all +non-involved Steering Committee members will decide. + ## Election Procedure ### Timeline @@ -229,8 +249,7 @@ requirements based on community feedback. Community members must be eligible to vote in order to stand for election (this includes voters who qualify for an exception). Candidates may self-nominate or be nominated by another eligible member. There are no term limits for KSC -members. Nothing prevents a qualified member from serving on both the TOC and SC -simultaneously. +members. To run for a Contributing seat, a candidate must additionally be at least a project Member as defined in @@ -242,25 +261,6 @@ Elections will be held using [Elekto](https://elekto.dev/), an online voting too created by CNCF intern Manish Sahani. The details for previous KSC elections can be found in the [elections folder](./elections). -### Limitations on Company Representation - -No more than two contributing seats may be held by employees of the same organization -(or conglomerate, in the case of companies owning each other). Additionally, each end -user seat (when available) must belong to an employee from a different -organization. No company may hold a majority (fifty percent or more) of the total -Steering Committee seats through any combination of contributing, end-user, and -selected seats. If the results of an election result in greater than two employees of -the same organization, the lowest vote getters from any particular employer will be -removed until representation on the committee is down to two from that organization. - -If employers change because of job changes, acquisitions, or other events, in a way -that would violate the company representation rules above, sufficient members of the -committee must resign until the composition rules are met. If it is impossible to -find sufficient members to resign, all employees of that organization will be removed -and new special elections held. In the event of a question of company membership (for -example evaluating independence of corporate subsidiaries) a majority of all -non-involved Steering Committee members will decide. - ## End User Seat A person is eligible to serve in the end user seat if their organization is listed in the @@ -283,7 +283,7 @@ with marketing background, it might choose to appoint a community member with thas expertise to a selected seat.) Selected seats serve for a 1-year term, until the next Steering Committee -Contributed Seats take office. +Contributing Seats take office. When new Steering Commitee members are seated in December after the elections for the Contributing Seats, the newly-constituted Steering Committee (consisting @@ -294,21 +294,21 @@ the appointment. ## Vacancies -In the event of a resignation or other loss of an elected SC member, the +In the event of a resignation or other loss of an elected KSC member, the candidate with the next most votes from the previous election will be offered -the seat, provided that person otherwise qualifies to join the SC. This process +the seat, provided that person otherwise qualifies to join the KSC. This process will continue until the seat is filled. In case this fails to fill the seat, a special election for that position will -be held as soon as possible, unless the regular SC election is less than 7 weeks +be held as soon as possible, unless the regular KSC election is less than 7 weeks away. Eligible voters from the most recent election will vote in the special election. Eligibility will not be redetermined at the time of the special -election. Any replacement SC member will serve out the remainder of the term for +election. Any replacement KSC member will serve out the remainder of the term for the person they are replacing, regardless of the length of that remainder. In the event of a resignation or other loss of an appointed end user KSC member, -the SC will appoint a new person to fill the end user SC seat. In the event of -a resignation or other loss of an appointed select KSC member, the SC may choose +the KSC will appoint a new person to fill the end user KSC seat. In the event of +a resignation or other loss of an appointed select KSC member, the KSC may choose whether to appoint a new person to fill the seat. ## Changes to the charter @@ -325,10 +325,10 @@ one week for comments and questions before a vote will occur. Ideally most decisions will be made at the lowest possible level within the project: within individual working groups. When this is not possible, the Steering Committee can help facilitate a conversation to work through the -contended issue. When facilitation by the SC does not resolve the contention, -the SC may have to make a decision. +contended issue. When facilitation by the KSC does not resolve the contention, +the KSC may have to make a decision. -Note that if the SC is called to resolve contended decisions regularly, it is a +Note that if the KSC is called to resolve contended decisions regularly, it is a symptom of a larger problem in the community that will need to be addressed. @@ -339,7 +339,7 @@ symptom of a larger problem in the community that will need to be addressed. ### Steering Committee -To recognize the folks that have served in the SC in the past, below we list the previous members of the SC (sorted by their 'Term End'). +To recognize the folks that have served in the KSC in the past, below we list the previous members of the KSC (sorted by their 'Term End'). |   | Member | Profile | Term Start | Term End | |----------------------------------------------------------------|----------------------|------------------------------------------------------|------------|----------| @@ -365,6 +365,11 @@ To recognize the folks that have served in the SC in the past, below we list the To recognize the folks that have served in the TOC in the past, below we list the previous members of the TOC (sorted by their 'Term End'). +The _Technical Oversight Committee (TOC)_ was a separate committee responsible +for setting the overall technical direction and roadmap of the project before +2024. In 2024, SC and TOC [were merged](https://github.com/knative/community/issues/1549) into a single governance body. + + |   | Member | Profile | Term Start | Term End | | -------------------------------------------------------------- | --------------- | --------------------------------------------------- | ---------- | ---------- | | | Ville Aikas | [@vaikas](https://github.com/vaikas) | Bootstrap | 2020 | From efc75af5ce8b019e11ad098fc5dbc348447777e8 Mon Sep 17 00:00:00 2001 From: David Hadas Date: Mon, 9 Sep 2024 21:08:13 +0300 Subject: [PATCH 6/7] Update STEERING-COMMITTEE.md --- STEERING-COMMITTEE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/STEERING-COMMITTEE.md b/STEERING-COMMITTEE.md index dbb9b653..ee94a8b4 100644 --- a/STEERING-COMMITTEE.md +++ b/STEERING-COMMITTEE.md @@ -173,7 +173,7 @@ No more than two contributing seats may be held by employees of the same organiz (or conglomerate, in the case of companies owning each other). Additionally, the end user seat must belong to an employee from a different organization. No company may hold a majority (fifty percent or more) of the total Steering Committee seats through -any combination of contributing, end-user, and selected seats. If the results of an +any combination of seats. If the results of an election result in greater than two employees of the same organization, the lowest vote getters from any particular employer will be removed until representation on the committee is down to two from that organization. From 8bd92fea43b26f5521941fcc168e29517532b2e4 Mon Sep 17 00:00:00 2001 From: Evan Anderson Date: Tue, 10 Sep 2024 10:36:08 -0700 Subject: [PATCH 7/7] Updates from Paul and David Hadas, including an explicit waiver of company diversity for the 2024 combined committee. --- GOVERNANCE.md | 34 ---------------------------------- STEERING-COMMITTEE.md | 14 ++++++++++---- TECH-OVERSIGHT-COMMITTEE.md | 3 +++ 3 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 GOVERNANCE.md create mode 100644 TECH-OVERSIGHT-COMMITTEE.md diff --git a/GOVERNANCE.md b/GOVERNANCE.md deleted file mode 100644 index be62c06c..00000000 --- a/GOVERNANCE.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -title: "Knative Governance Framework" -linkTitle: "Governance" -weight: 20 -type: "docs" -aliases: - - /contributing/governance/ ---- - -Knative Governance is broken into two components. At a high level, the Knative -Steering Committee (KSC) is the "root" level governance body. -The Tech Oversight Committee (TOC) operates -entirely within the governance definitions delineated by the KSC. - -## Community and Operations - -The [Knative Steering Committee](./STEERING-COMMITTEE.md) is responsible for the -general health of the Knative community. Responsibilities include maintaining -the governance framework, code of conduct, community meetings, communication -platforms, and test resources. - -## Trademarks - -The [Knative Steering Committee](./STEERING-COMMITTEE.md) is responsible for -management, licensing, and conformance verification of Knative logos, names, and -trademarks, including the definition of what "Knative" is and the definition and -rules for usage of derived marks. - -## Technology and Software Implementation - -The [Knative Technical Oversight Committee](./TECH-OVERSIGHT-COMMITTEE.md) is -responsible for the technical oversight, release process, and integration of the -technology components of the Knative project. Most day-to-day work is delegated -by the TOC to various subject-specific working groups. diff --git a/STEERING-COMMITTEE.md b/STEERING-COMMITTEE.md index ee94a8b4..8b7db2bf 100644 --- a/STEERING-COMMITTEE.md +++ b/STEERING-COMMITTEE.md @@ -1,9 +1,10 @@ --- title: "Knative steering committee" linkTitle: "Steering committee" -weight: 35 +weight: 20 type: "docs" aliases: + - /contributing/governance/ - /contributing/steering-committee/ - /contributing/tech-oversight-committee/ --- @@ -109,7 +110,7 @@ first name): | | 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 | VMware | [@dprotaso](https://github.com/dprotaso) | 2021-05-26 | 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 holds the End User seat @@ -186,6 +187,12 @@ and new special elections held. In the event of a question of company membership example evaluating independence of corporate subsidiaries) a majority of all non-involved Steering Committee members will decide. +The above limits shall be relaxed for the temporary combination of the 2024 Steering +and Technical Oversight Committees, with the limitation that the so-constituted +committee may not pass any governance changes except by the abstention of Red Hat or +IBM members such that the remaining voting member do not constitute a majority of +the committee. + ## Election Procedure ### Timeline @@ -363,12 +370,11 @@ To recognize the folks that have served in the KSC in the past, below we list th ### Technical Oversight Committee -To recognize the folks that have served in the TOC in the past, below we list the previous members of the TOC (sorted by their 'Term End'). - The _Technical Oversight Committee (TOC)_ was a separate committee responsible for setting the overall technical direction and roadmap of the project before 2024. In 2024, SC and TOC [were merged](https://github.com/knative/community/issues/1549) into a single governance body. +To recognize the folks that have served in the TOC in the past, below we list the previous members of the TOC (sorted by their 'Term End'). |   | Member | Profile | Term Start | Term End | | -------------------------------------------------------------- | --------------- | --------------------------------------------------- | ---------- | ---------- | diff --git a/TECH-OVERSIGHT-COMMITTEE.md b/TECH-OVERSIGHT-COMMITTEE.md new file mode 100644 index 00000000..83cfe726 --- /dev/null +++ b/TECH-OVERSIGHT-COMMITTEE.md @@ -0,0 +1,3 @@ +# See [Steering Committee documentation](./STEERING-COMMITTEE.md) + +The Technical Oversight Committee [has been merged with the Steering Committee](https://github.com/knative/community/pull/1587).