Skip to content

Commit d185c5f

Browse files
committed
Update the CoC readme and process docs
This updates wording in a few sections of our new incident-process docs, adds a link to our new Slack channel in the README, and adds some descriptions and a link to the incident-process doc to the README. Signed-off-by: Aeva Black <[email protected]>
1 parent e93ed5a commit d185c5f

File tree

4 files changed

+43
-22
lines changed

4 files changed

+43
-22
lines changed

committee-code-of-conduct/README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,21 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
2121
* Tim Pepper (**[@tpepper](https://github.com/tpepper)**), VMware
2222

2323
## Contact
24+
- Slack: [#code-of-conduct](https://kubernetes.slack.com/messages/code-of-conduct)
2425
- Private Mailing List: [email protected]
2526
- [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/committee%2Fcode-of-conduct)
2627
- GitHub Teams:
2728
- [@kubernetes/code-of-conduct-committee](https://github.com/orgs/kubernetes/teams/code-of-conduct-committee) - General Discussion
2829

2930
[subproject-definition]: https://github.com/kubernetes/community/blob/master/governance.md#subprojects
3031
<!-- BEGIN CUSTOM CONTENT -->
32+
33+
## Reporting An Incident
34+
35+
Please email [email protected] to initiate an incident report. **_Please do not make reports via our public slack channel._**
36+
37+
Our [Incident Report Handling Procedures](incident-process.md) describes how we handle reports while protecting the safety and confidentiality of all involved parties.
38+
3139
## Terms
3240

3341
The members and their terms are as follows:
@@ -43,7 +51,7 @@ The members and their terms are as follows:
4351
- Celeste Horgan (CNCF)
4452
- Tim Pepper (VMware)
4553

46-
Please see the [bootstrapping document](./bootstrapping-process.md) for more information on how members are picked, their responsibilities, and how the committee will initially function.
54+
Please see the [bootstrapping document](./bootstrapping-process.md) and [election process guidelines](election.md) for more information on how members are picked and their responsibilities.
4755

4856
## Emeritus Committee Members
4957

@@ -54,5 +62,4 @@ The Code of Conduct Committee sincerely thanks our emeritus committee members fo
5462
- Carolyn Van Slyck (Microsoft)
5563
- Paris Pittman (Apple)
5664

57-
_More information on conflict resolution process to come in the near future. For now, any Code of Conduct or Code of Conduct Committee concerns can be directed to <[email protected]>_.
5865
<!-- END CUSTOM CONTENT -->

committee-code-of-conduct/incident-process.md

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,20 @@ This document outlines the Code of Conduct Committee's workflow when receiving a
1313

1414
## When and Where does the Kubernetes Code of Conduct apply?
1515

16+
The Code of Conduct applies between all community members when interacting about Kubernetes. This primarily addresses official spaces, but if conduct-related issues are affecting our community in unofficial spaces in ways that are likely also affect interpersonal interactions in _official_ spaces, we may be asked to become involved.
17+
18+
### What are the boundaries of the Kubernetes community?
19+
20+
There are no hard boundaries of the community, but common places we are asked to extend guidance to are:
21+
22+
- Official Kubernetes communication channels
23+
- Kubernetes events and meetups
24+
- Media and web presences
25+
- Social media
26+
- In some cases, where individual social media messages are not related to Kubernetes but have been reported to the Code of Conduct Committee and are making project members feel unsafe or unwelcome, we might choose to act.
27+
28+
## Incident Reports
29+
1630
### What is an incident report?
1731

1832
An **incident report** is a description of an event, interaction, or public statement submitted to the Kubernetes Code of Conduct Committee, which the reporter feels violates the [Kubernetes Code of Conduct](https://kubernetes.io/community/code-of-conduct/).
@@ -29,16 +43,6 @@ The Code of Conduct Committee accepts reports from everyone who interacts with t
2943

3044
At times we encourage community members to email us if an incident is ongoing and we have not been contacted.
3145

32-
### What are the boundaries of the Kubernetes community?
33-
34-
There are no hard boundaries of the community, but common places we are asked to extend guidance to are:
35-
36-
- Official Kubernetes communication channels
37-
- Kubernetes events
38-
- Media and web presences
39-
- Social media
40-
- In some cases, where individual social media messages are not related to Kubernetes but have been reported to the Code of Conduct Committee and are making project members feel unsafe or unwelcome, we might choose to act.
41-
4246
### Where do private incident reports happen?
4347

4448
The Code of Conduct Committee's primary means of contact is our email address, [email protected].
@@ -47,6 +51,10 @@ We can also be reached via Slack direct messages to individual committee members
4751

4852
### How is the privacy of a report protected?
4953

54+
All incident-related discussions happen in private spaces between current Code of Conduct Committee members, and all members agree when joining the Committee to maintain the confidentiality of incidents to the extent permitted by law.
55+
56+
Where incidents relate to _unintentionally_ or _non-consensually_ publicly-visible content or messages, we may, or may request others to, delete that content to help preserve the privacy of involved parties.
57+
5058
### Why does this process exist?
5159

5260
The reporting process exists to provide the community with mechanisms to keep people safe, and to ensure that poor behavior, regardless of who the initator is, is not accepted.
@@ -59,17 +67,22 @@ The Code of Conduct Committee has unilateral power to address harms as needed an
5967

6068
The Code of Conduct Committee responds to all emails in a timely manner, usually within a few days.
6169

70+
When an email is received, it is reviewed for severity. Based on our training, the initial member(s) to review the report and determine severity and urgency. When necessary, we may alert other members and call for an urgent meeting, but in most cases, we discuss asynchronously and develop a response plan.
71+
72+
We maintain a triage rotation schedule so that there are at least two people watching for incoming reports. This allows us to meet our SLA to the community.
73+
6274
### Recusal
6375

64-
Before beginning investigation on an incident, members can recuse (or refuse to pass judgement on) an incident if they feel a relationship with someone in the incident may hinder impartiality or create a perception of impropriety with respect to individuals involved in the reported incident. Code of Conduct Committee Members might recuse for the following reasons:
76+
Before beginning investigation on an incident, members can recuse from (or refuse to pass judgement on) an incident if they feel a relationship with someone in the incident may hinder impartiality or create a perception of impropriety with respect to individuals involved in the reported incident. Some examples of reasons a Code of Conduct Committee member might recuse themselves are:
6577

66-
- Direct reporting relationships, or company work relationships
78+
- Direct reporting relationships, or company work relationships that would cause the investigation to appear inappropriate
6779
- Close working relationships in the Kubernetes community, for example co-leading a SIG with the reporter or someone else mentioned in the report
6880

69-
7081
If all members of the Code of Conduct Committee felt the need to recuse themselves from an incident, the incident would be handled by our thid party mediator.
7182

72-
### Reaching out to involved parties
83+
To reduce the likelihood of recusals, our [election](election.md) process stipulates that we may never have a majority of the Committee from a single employer.
84+
85+
### Building a plan
7386

7487
The Code of Conduct Committee will privately discuss the incident report, and may or may not decide that we need more information prior to determining whether to take any action.
7588

@@ -80,12 +93,12 @@ We consider the following at this stage:
8093
- Is there a public record of the incident which we can review, such as a chat log or video recording?
8194
- Are there any privacy or safety considerations that we must take into account? For example, if we reach out to an individual named in the report, could this jeapordize the safety of the reporter or other individuals?
8295

96+
### Reaching out to involved parties
97+
8398
It is our intention to put as little emotional labor on those who have been harmed as possible, and to protect the safety (both physical and emotional) of all community members. We labor to be supportive and non-judgemental and to make the reporting process as safe and low anxiety as possible.
8499

85100
In all instances these clarifying discussions are confidential.
86101

87-
88-
89102
## Incident response workflow
90103

91104
### Reconvening the Committee
@@ -110,11 +123,11 @@ In general, the committee strives for unanimous consensus before taking an actio
110123

111124
For example, we may choose to do nothing, to issue a private warning, to offer coaching, to recommend organizational changes, or to ban someone from a community platform.
112125

113-
114126
### Taking Actions and Communicating our Recommendations
115127

116128
When we have decided on a course of action, we do the following:
117129

118130
- We clearly communicate our decision to those who need to hear it, without violating the confidentiality of those who requested it during an investigative process (if one was undertaken).
119-
- If and only if it is needed, we work with other leadership bodies (e.g., Steering Committee and the Linux Foundation) to issue a public statement.
120-
131+
- If and only if it is needed, we work with other leadership bodies (e.g., Steering Committee and the Linux Foundation)
132+
- This may be necessary if the incident extends to other communities or event spaces, particularly if we feel there is elevated risk of harm to members of those communities
133+
- In rare cases, we might find it necessary to issue a public statement, either jointly or separately

sig-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
8383

8484
| Name | Label | Members | Contact |
8585
|------|--------|---------|---------|
86-
|[Code of Conduct](committee-code-of-conduct/README.md)|code-of-conduct|* [Aeva Black](https://github.com/AevaOnline), Microsoft<br>* [Celeste Horgan](https://github.com/celestehorgan), CNCF<br>* [Karen Chu](https://github.com/karenhchu), Microsoft<br>* [Tasha Drew](https://github.com/tashimi), VMware<br>* [Tim Pepper](https://github.com/tpepper), VMware<br>|* [Private Mailing List]([email protected])
86+
|[Code of Conduct](committee-code-of-conduct/README.md)|code-of-conduct|* [Aeva Black](https://github.com/AevaOnline), Microsoft<br>* [Celeste Horgan](https://github.com/celestehorgan), CNCF<br>* [Karen Chu](https://github.com/karenhchu), Microsoft<br>* [Tasha Drew](https://github.com/tashimi), VMware<br>* [Tim Pepper](https://github.com/tpepper), VMware<br>|* [Slack](https://kubernetes.slack.com/messages/code-of-conduct)<br>* [Private Mailing List]([email protected])
8787
|[Product Security](committee-product-security/README.md)|product-security|* [CJ Cullen](https://github.com/cjcullen), Google<br>* [Joel Smith](https://github.com/joelsmith), Red Hat<br>* [Luke Hinds](https://github.com/lukehinds), Red Hat<br>* [Micah Hausler](https://github.com/micahhausler), Amazon<br>* [Swamy Shivaganga Nagaraju](https://github.com/swamymsft), Microsoft<br>* [Tabitha Sable](https://github.com/tabbysable), Datadog<br>* [Tim Allclair](https://github.com/tallclair), Apple<br>|* [Private Mailing List]([email protected])
8888
|[Steering](committee-steering/README.md)|steering|* [Christoph Blecker](https://github.com/cblecker), Red Hat<br>* [Derek Carr](https://github.com/derekwaynecarr), Red Hat<br>* [Davanum Srinivas](https://github.com/dims), VMware<br>* [Jordan Liggitt](https://github.com/liggitt), Google<br>* [Bob Killen](https://github.com/mrbobbytables), Google<br>* [Nikhita Raghunath](https://github.com/nikhita), VMware<br>* [Paris Pittman](https://github.com/parispittman), Apple<br>|* [Slack](https://kubernetes.slack.com/messages/steering-committee)<br>* [Mailing List](https://groups.google.com/a/kubernetes.io/forum/#!forum/steering)<br>* [Private Mailing List]([email protected])
8989
<!-- BEGIN CUSTOM CONTENT -->

sigs.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3120,6 +3120,7 @@ committees:
31203120
name: Paris Pittman
31213121
meetings: []
31223122
contact:
3123+
slack: code-of-conduct
31233124
private_mailing_list: [email protected]
31243125
teams:
31253126
- name: code-of-conduct-committee

0 commit comments

Comments
 (0)