Skip to content

Commit 90895ac

Browse files
authored
replacing TOC references with KSC ones (#1623)
Signed-off-by: Paul S. Schweigert <[email protected]>
1 parent 5e78386 commit 90895ac

20 files changed

+53
-196
lines changed

.github/ISSUE_TEMPLATE/new-repo.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ Sponsoring WG:
2525

2626
This area is used to track the [repo creation process](https://github.com/knative/community/blob/main/mechanics/CREATING-AN-EXTENSIONS-REPO.md).
2727
The _requestor_ and _sponsoring WG lead_ should perform the steps listed below and cross out the checkmarks when done.
28-
The TOC is involved only in the **TOC Gate** steps.
28+
The Steering Committee is involved only in the **KSC Gate** steps.
2929

30-
- [ ] Add this issue to the [TOC project board](https://github.com/orgs/knative/projects/43) for review. You are responsible for moving your entry on the board to "Needs Discussion" or "In Progress" as you move forward in this checklist.
30+
- [ ] Add this issue to the [Steering Committee project board](https://github.com/orgs/knative/projects/52) for review. You are responsible for moving your entry on the board to "Needs Discussion" or "In Progress" as you move forward in this checklist.
3131

3232
_You may not be able to use the Projects quick menu on this page. In that case, go to the project board and use the **Add cards** interface._
3333

@@ -36,11 +36,11 @@ _You may not be able to use the Projects quick menu on this page. In that case,
3636
- [ ] Grant `Knative Admin` the `admin` privilege.
3737
- [ ] Grant the sponsoring WG the `write` privilege.
3838

39-
**TOC Gate**: _Once the TOC has approved the above, it will merge and Peribolos will create an empty repository._
39+
**KSC Gate**: _Once the KSC has approved the above, it will merge and Peribolos will create an empty repository._
4040

4141
- [ ] (golang) Send a PR to add aliases for `knative.dev/$REPONAME` import paths ([sample](https://github.com/knative/docs/pull/4160)).
4242

43-
- [ ] Have a lead from the sponsoring WG bootstrap the Git repository by using an
43+
- [ ] Have a lead from the sponsoring WG bootstrap the Git repository by using an
4444
appropriate "template" repository ([basic](https://github.com/knative-extensions/wg-repository),
4545
[sample-controller](https://github.com/knative-extensions/sample-controller),
4646
[sample-source](https://github.com/knative-extensions/sample-source)).

.github/ISSUE_TEMPLATE/question.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
22
name: Question
3-
about: Question for TOC or Steering Committee
3+
about: Question for Steering Committee
44
title: ""
55
---

CONSENSUS.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ When lazy consensus is used, you should:
2828
* Allow time for your colleagues to read and think about the message
2929
* Please allow an appropriate amount of time, at least 3 business days
3030
* Give healthy consideration to reasonable objections
31-
* If consensus cannot be achieved within the discussion, you should attempt to resolve it within the appropriate working group, then engage the TOC or Steering as appropriate if that fails
32-
* Record the decision in writing
31+
* If consensus cannot be achieved within the discussion, you should attempt to resolve it within the appropriate working group, then engage Steering as appropriate if that fails
32+
* Record the decision in writing
3333
* In increasing order of durability: decision announced in meeting minutes, send a mail to the mailing list, approval in Google Doc by WG lead, GitHub PR (possibly in “docs” directory or the like)
3434

3535
---

REPOSITORY-GUIDELINES.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ steps:
7575
- A proposal to remove the repository is brought to the attention of the
7676
Technical Oversight Committee through a GitHub issue posted in the
7777
[community](https://github.com/knative/community) repo.
78-
- Feedback is encouraged during a Technical Oversight Committee meeting before
78+
- Feedback is encouraged during a Steering Committee meeting before
7979
any action is taken.
80-
- Once the TOC has approved of the removal, if the repo is not moving to another
80+
- Once the Steering Committee has approved of the removal, if the repo is not moving to another
8181
actively maintained project:
8282
- The repo description is edited to start with the phrase "[EOL]"
8383
- All open issues and PRs are closed
@@ -120,7 +120,7 @@ Note: prior art here from the
120120
[Kubernetes community](https://github.com/kubernetes/community/blob/master/github-management/kubernetes-repositories.md).
121121

122122
Working groups are allowed to request repositories that meet the following
123-
requirements. The Steering Committee and TOC will maintain the process and
123+
requirements. The Steering Committee will maintain the process and
124124
perform the repository creation steps to ensure that the following requirements
125125
have been met:
126126

@@ -153,7 +153,7 @@ have been met:
153153
- Clearly document the stability and API guarantees (both in the top-level
154154
`README.md` and by using appropriate API versioning for Kubernetes apigroups).
155155

156-
- The TOC will maintain a template which will be used during the creation of
156+
- The Steering Committee will maintain a template which will be used during the creation of
157157
new repositories. Existing repositiories are encouraged to update their
158158
`README`s from time to time as the format changes.
159159

@@ -163,7 +163,7 @@ have been met:
163163
- APIs under `knative.dev` should:
164164

165165
1. Be under a subdomain managed by the owning Working Group (e.g.
166-
`sources.knative.dev`, not `knative.dev`). The TOC is considered the
166+
`sources.knative.dev`, not `knative.dev`). The Steering Committee is considered the
167167
authority for assigning subdomains to working groups.
168168

169169
1. Coordinate with the Working Group in API naming to avoid collisions or
@@ -181,8 +181,8 @@ of pluggability.
181181
The following are not required to create a working-group-owned repository:
182182

183183
- Steering approval (see ["the fine print"](#the-fine-print))
184-
- TOC approval
185-
- TOC may request certain naming patterns (e.g. `kn-plugin` for client WG)
184+
- Steering Committee approval
185+
- Steering Committee may request certain naming patterns (e.g. `kn-plugin` for client WG)
186186
- Solving an unique problem (exploring different approaches to problems outside
187187
the core is actively encouraged!)
188188

ROLES.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ The following apply to the area / component for which one would be a lead.
235235
- Roadmap. Establish and maintain a roadmap for the working group outlining
236236
the areas of focus for the working group over the next 6 months.
237237

238-
- Report. Report current status to the TOC meeting every 6 weeks.
238+
- Report. Report current status to the Steering Committee meeting every 6 weeks.
239239

240240
- Expected to work to holistically maintain the health of the project through:
241241

@@ -316,12 +316,12 @@ Approver.
316316
not fulfilling their documented responsibilities for more than 1 month.
317317
- This MAY be done through a super-majority vote of managers, or if there are
318318
not enough active managers to get a super-majority of votes cast, then
319-
removal MAY occur through exception process to the TOC. The PR removing the
319+
removal MAY occur through exception process to the Steering Committee. The PR removing the
320320
manager should be open for at least 72 hours.
321321
- Prior to voting to remove a manager, leads SHOULD reach out to the affected
322322
manager and see if they need to take a leave.
323323
- Membership disagreements MAY be escalated to the WG leads. WG lead membership
324-
disagreements MAY be escalated to the TOC.
324+
disagreements MAY be escalated to the Steering Committee.
325325
- Managers MAY decide to step down at anytime and nominate a replacement who
326326
will be approved through the regular process for that role.
327327

SLACK-GUIDELINES.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,14 @@ project, and includes all communication mediums.
4444
## Admins
4545

4646
Members of the
47-
[Technical Oversight Committee (TOC)](TECH-OVERSIGHT-COMMITTEE.md) and
4847
[Knative Steering Committee (KSC)](STEERING-COMMITTEE.md) are also the
4948
administrators for the Knative Slack instance.
5049

5150
Slack admins should make sure to mention this in the “What I do” section of
5251
their Slack profile, as well as for which time zone.
5352

5453
To connect: please reach out in the #slack-admins channel or DM (Direct Message)
55-
a member of the [KSC](STEERING-COMMITTEE.md) or
56-
[TOC](TECH-OVERSIGHT-COMMITTEE.md).
54+
a member of the [KSC](STEERING-COMMITTEE.md).
5755

5856
### Admin expectations and guidelines
5957

@@ -144,7 +142,7 @@ in the purpose or pinned docs of that channel.
144142

145143
## Threaded Conversations
146144

147-
Slack threads in public channels are extremely useful for quickly and openly collaborating with your fellow contributors.
145+
Slack threads in public channels are extremely useful for quickly and openly collaborating with your fellow contributors.
148146

149147
Unfortunately, while Slack threads are good for quick discussion, they serve as a poor record of decisions. Discoverability and searchability of threads isn't nearly as good as alternatives (see below), particularly for contributors arriving weeks or months later. For this reason it's important that Slack discussions make their way to less ephemeral and more comprehensive artifacts for sharing ideas and proposals with the wider community.
150148

elections/README.md

+4-17
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ type: "docs"
77

88
# Knative Elections
99

10-
This document outlines how to conduct Knative elections. See [TOC election process](../mechanics/TOC.md) and [Steering Committee election process](../mechanics/SC.md) for more information of how the committee decides when to have elections, eligibility for voting, eligibility for candidacy, maximal representation, etc.
10+
This document outlines how to conduct Knative elections. See [Steering Committee election process](../mechanics/SC.md) for more information of how the committee decides when to have elections, eligibility for voting, eligibility for candidacy, maximal representation, etc.
1111

1212
## Process
1313

1414
1. Steering committee selects election officers.
1515

1616
2. Prepare the election repository
1717

18-
* Make knative/community/elections/$YEAR-TOC or knative/community/elections/$YEAR-SC
18+
* Make knative/community/elections/$YEAR-SC
1919
* Create an OWNERS file in the above directory with the election officers as approvers / reviewers.
2020
* Create the README.md in the above directory, this is the voter's guide
2121
* Copy over the voter's guide from the previous year. The voter's guide is the single source of truth for the election that year! All annoucements and notices should link to this document.
@@ -36,7 +36,7 @@ This document outlines how to conduct Knative elections. See [TOC election proce
3636
4. Executing the Election in Elekto
3737

3838
* Elections will be held using [Elekto](https://elekto.dev/), an online voting tool created
39-
by CNCF intern Manish Sahani and administered by Josh Berkus.
39+
by CNCF intern Manish Sahani and administered by Josh Berkus.
4040
* It relies on GitHub Oauth for access to ballots
4141
* More details can be found in the [Elekto documentation](https://elekto.dev/docs/)
4242
* Remember to send periodic reminders about key deadlines and to encourage people to vote.
@@ -57,18 +57,6 @@ This document outlines how to conduct Knative elections. See [TOC election proce
5757

5858
## Roles and Responsibilities:
5959

60-
### Technical Oversight Committee
61-
62-
- [Recuses themselves from public election activities][election-recusal]
63-
- May vote
64-
- May answer questions about general election specifics, ie:
65-
- Where do I find the schedule?
66-
- How do I vote?
67-
- Will not answer questions about specific candidates, or anything that could be construed as endorsing, ie:
68-
- How is $candidate doing so far? (PS - we don't know anyway)
69-
- Who are your favorite candidates?
70-
71-
7260
### Steering Committee
7361

7462
- Oversees the election, including appointing election officers, approving dates, and monitoring the process
@@ -92,7 +80,7 @@ This document outlines how to conduct Knative elections. See [TOC election proce
9280
- Who are your favorite candidates?
9381
- Manage the voting process within Elekto
9482
- Generate the voter guide and list of voters according to the criteria for that year's election
95-
- Manage the exception process - Review applicants and add approved ones to the voter's list
83+
- Manage the exception process - Review applicants and add approved ones to the voter's list
9684
- Track candidates
9785
- Monitor groups for nominations
9886
- Update the community regularly
@@ -103,4 +91,3 @@ This document outlines how to conduct Knative elections. See [TOC election proce
10391
Diary for 2023 Knative TOC election can be found in this [Gist](https://gist.github.com/aliok/136be152fef14912b9a73eb753b3267b) for reference.
10492

10593
[election-recusal]: https://github.com/kubernetes/steering/blob/main/elections.md#steering-committee-and-election-officer-recusal
106-

groups/committee-oversight/OWNERS

-6
This file was deleted.

groups/committee-oversight/groups.yaml

-17
This file was deleted.

groups/committee-steering/groups.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ groups:
1212
1313
1414
15+
16+
17+
18+
19+
20+
21+
1522

1623
- email-id: [email protected]
1724
name: elections

groups/restrictions.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ restrictions:
22
- path: "committee-code-of-conduct/groups.yaml"
33
allowedGroups:
44
5-
- path: "committee-oversight/groups.yaml"
6-
allowedGroups:
7-
85
- path: "committee-steering/groups.yaml"
96
allowedGroups:
107

mechanics/CREATING-AN-EXTENSIONS-REPO.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ A Working Group Lead (either
2323
[execution](../ROLES.md#working-group-execution-lead)) may request a new repo in
2424
`knative-extensions` by filing an issue in the
2525
[knative/community](https://github.com/knative/community/issues/new?template=new-repo.md)
26-
repo. Once filed, the TOC should handle these promptly, though it should also be
26+
repo. Once filed, the Steering Committee should handle these promptly, though it should also be
2727
considered fine to ping members or the group on Slack if it hasn't been acted on
28-
in a few days. Generally, the request will be granted, though the TOC may have
28+
in a few days. Generally, the request will be granted, though the Steering Committee may have
2929
additional questions or suggest an alternate mechanism in some cases.
3030

3131
Some of the following steps may require permissions that are only available to
32-
the TOC or Steering Committee, though others are largely self-service or require
32+
the Steering Committee, though others are largely self-service or require
3333
other WGs to review and approve impacting changes.
3434

3535
### Technical requirements
@@ -46,15 +46,15 @@ other WGs to review and approve impacting changes.
4646
`knative-extensions`, but the Google CLA bot and OWNERS files/tide merge should
4747
be enforced.
4848

49-
## Process (to be executed by TOC or Steering member)
49+
## Process (to be executed by Steering member)
5050

5151
1. (Requires Org owner) Create the new repo in
5252
https://github.com/knative-extensions using the "New" button. Set the repo to
5353
public and include an "Apache License 2.0" but no `.gitignore` or `README`.
5454

5555
1. (Requires repo write/org owner) Create:
5656

57-
- `OWNERS` file listing TOC and WG members as approvers, and WG members as
57+
- `OWNERS` file listing Steering Committee and WG members as approvers, and WG members as
5858
reviewers
5959

6060
- `CODE-OF-CONDUCT.md` (that links to

mechanics/GDRIVE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ All steering committee members have “Super Admin” [privileges](https://suppo
3333

3434
#### Technical Oversight Committee
3535

36-
The technical oversight committee members each have a knative.team GSuite account. This is to allow TOC members to assist with some of the GSuite automation and GDrive migration. In addition to this, TOC members will need a knative.team account to allow people without a knative.team account into public meetings hosted on Google Hangouts.
36+
The technical oversight committee members each have a knative.team GSuite account. This is to allow Steering Committee members to assist with some of the GSuite automation and GDrive migration. In addition to this, Steering Committee members will need a knative.team account to allow people without a knative.team account into public meetings hosted on Google Hangouts.
3737

3838

3939
#### Working Group Leads
@@ -58,4 +58,4 @@ There are several mailing lists set up to manage permission groups (some could a
5858

5959
The Knative.team GSuite is a [Business Standard](https://workspace.google.com/intl/en/pricing.html) GSuite Plan. This is required so that WG meetings have the ability to record meetings. If we need changes made to the GSuite package-type on this account, [April Nassi](mailto:[email protected]) can help with this.
6060

61-
The GSuite org is currently paid by Google. [Mary Radomile](mailto:[email protected]) is the point of contact if we need help re: billing.
61+
The GSuite org is currently paid by Google. [Mary Radomile](mailto:[email protected]) is the point of contact if we need help re: billing.

mechanics/GOLANG-POLICY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Major Golang version bumps (i.e. 1.14 to 1.15) should be made deliberately and s
2424
be taken too lightly. Such a change should not happen too closely to a release of
2525
Knative. If the bump would be within two weeks of the Knative release cycle, it should be
2626
postponed until the next release to allow for thorough testing and hardening. Exceptions
27-
to this should be discussed and agreed upon through the TOC.
27+
to this should be discussed and agreed upon through the Steering Committee.
2828

2929
Since such a version bump can potentially be breaking to some repositories, the change
3030
should be announced and discussed and agreed upon between the impacted working groups.

mechanics/MATURITY-LEVELS.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ Additional requirements beyond "initiating":
9090
- Unit test automation meeting the Knative standards with respect to coverage
9191
and flakiness / test failures.
9292
- Provide at least monthly progress reports at the appropriate WG(s). WGs should
93-
roll these reports up into their TOC reports.
93+
roll these reports up into their SC reports.
9494
- User-facing documentation for the following areas: install, usage
9595
- Contributor facing documentation for: development setup
9696
- Ongoing contributions from multiple contributors and management of user
9797
issues, etc.
9898

9999
Usable projects which meet the criteria for core (i.e. developer-facing
100-
abstractions with wide utility, beta+ APIs) may apply to the TOC and SC for
100+
abstractions with wide utility, beta+ APIs) may apply to the SC for
101101
[migration to core](#migration-to-core), but approval is more likely for
102102
projects in the "Stable" category.
103103

@@ -148,7 +148,7 @@ support the project with bug and security fixes as applicable
148148

149149
## Migration to Core
150150

151-
A stable project may apply to the SC and TOC to be admitted to the Knative core.
151+
A stable project may apply to the SC to be admitted to the Knative core.
152152
Not all stable projects are suitable for "core"; this is a judgement as to the
153153
degree to which the project should be considered a part of a "expected developer
154154
experience" across Knative installations. Projects may be graded on the

0 commit comments

Comments
 (0)