Skip to content

Commit fa32fb0

Browse files
author
Amye Scavarda Perrin
authored
Update code-of-conduct.md
Submitted as an easy way to be able to see what's changed. Not to be merged until TOC + GB approvals are complete! Signed-off-by: Amye Scavarda Perrin <[email protected]>
1 parent 88ac73d commit fa32fb0

File tree

1 file changed

+35
-22
lines changed

1 file changed

+35
-22
lines changed

code-of-conduct.md

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
## CNCF Community Code of Conduct v1.2
1+
## CNCF Community Code of Conduct v1.3
22

33
Other languages available:
44
- [Arabic/العربية](code-of-conduct-languages/ar.md)
5-
- [Bengali/বাংলা](code-of-conduct-languages/bn.md)
65
- [Bulgarian/Български](code-of-conduct-languages/bg.md)
76
- [Chinese/中文](code-of-conduct-languages/zh.md)
87
- [Czech/Česky](code-of-conduct-languages/cs.md)
@@ -21,28 +20,30 @@ Other languages available:
2120
- [Ukrainian/Українська](code-of-conduct-languages/uk.md)
2221
- [Vietnamese/Tiếng Việt](code-of-conduct-languages/vi.md)
2322

24-
### Contributor Code of Conduct
23+
### Community Code of Conduct
2524

26-
As contributors and maintainers in the CNCF community, and in the interest of fostering
27-
an open and welcoming community, we pledge to respect all people who contribute
25+
As contributors, maintainers, and participants in the CNCF community, and in the interest of fostering
26+
an open and welcoming community, we pledge to respect all people who participate or contribute
2827
through reporting issues, posting feature requests, updating documentation,
29-
submitting pull requests or patches, and other activities.
28+
submitting pull requests or patches, attending conferences or events, or engaging in other community or project activities.
3029

31-
We are committed to making participation in the CNCF community a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression,
32-
sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
33-
religion, or nationality.
30+
We are committed to making participation in the CNCF community a harassment-free experience for everyone, regardless of age, body size, caste, disability, ethnicity, level of experience, family status, gender, gender identity and expression, marital status, military or veteran status, nationality, personal appearance, race, religion, sexual orientation, socieconomic status, tribe, or any other dimension of diversity.
3431

3532
## Scope
3633

37-
This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
34+
This code of conduct applies:
35+
* within project and community spaces,
36+
* in other spaces when an individual CNCF community participant's words or actions are directed at or are about a CNCF project, the CNCF community, or another CNCF community participant.
3837

3938
### CNCF Events
4039

41-
CNCF events, or events run by the Linux Foundation with professional events staff, are governed by the Linux Foundation [Events Code of Conduct](https://events.linuxfoundation.org/code-of-conduct/) available on the event page. This is designed to be used in conjunction with the CNCF Code of Conduct.
40+
CNCF events that are produced by the Linux Foundation with professional events staff are governed by the Linux Foundation [Events Code of Conduct](https://events.linuxfoundation.org/code-of-conduct/) available on the event page. This is designed to be used in conjunction with the CNCF Code of Conduct.
4241

4342
## Our Standards
4443

45-
Examples of behavior that contributes to a positive environment include:
44+
The CNCF Community is open, inclusive and respectful. Every member of our community has the right to have their identity respected.
45+
46+
Examples of behavior that contributes to a positive environment include but are not limited to:
4647

4748
* Demonstrating empathy and kindness toward other people
4849
* Being respectful of differing opinions, viewpoints, and experiences
@@ -51,37 +52,49 @@ Examples of behavior that contributes to a positive environment include:
5152
and learning from the experience
5253
* Focusing on what is best not just for us as individuals, but for the
5354
overall community
55+
* Using welcoming and inclusive language
56+
5457

55-
Examples of unacceptable behavior include:
58+
Examples of unacceptable behavior include but are not limited to:
5659

57-
* The use of sexualized language or imagery, and sexual attention or
58-
advances of any kind
60+
* The use of sexualized language or imagery
5961
* Trolling, insulting or derogatory comments, and personal or political attacks
60-
* Public or private harassment
62+
* Public or private harassment in any form
6163
* Publishing others' private information, such as a physical or email
6264
address, without their explicit permission
65+
* Violence, threatening violence, or encouraging others to engage in violent behavior
66+
* Stalking or following someone without their consent
67+
* Unwelcome physical contact
68+
* Unwelcome sexual or romantic attention or advances
6369
* Other conduct which could reasonably be considered inappropriate in a
6470
professional setting
71+
72+
The following behaviors are also prohibited:
73+
* Providing knowingly false or misleading information in connection with a Code of Conduct investigation or otherwise intentionally tampering with an investigation.
74+
* Retaliating against a person because they reported an incident or provided information about an incident as a witness.
6575

6676
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct.
6777
By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect
68-
of managing this project.
69-
Project maintainers who do not follow or enforce the Code of
70-
Conduct may be permanently removed from the project team.
78+
of managing a CNCF project.
79+
Project maintainers who do not follow or enforce the Code of Conduct may be temporarily or permanently removed from the project team.
7180

7281
## Reporting
7382

7483
For incidents occurring in the Kubernetes community, contact the [Kubernetes Code of Conduct Committee](https://git.k8s.io/community/committee-code-of-conduct) via <[email protected]>. You can expect a response within three business days.
7584

7685
For other projects, or for incidents that are project-agnostic or impact multiple CNCF projects, please contact the [CNCF Code of Conduct Committee](https://www.cncf.io/conduct/committee/) via [email protected]. Alternatively, you can contact any of the individual members of the [CNCF Code of Conduct Committee](https://www.cncf.io/conduct/committee/) to submit your report. For more detailed instructions on how to submit a report, including how to submit a report anonymously, please see our [Incident Resolution Procedures](https://www.cncf.io/conduct/procedures/). You can expect a response within three business days.
7786

87+
For incidents ocurring at CNCF event that is produced by the Linux Foundation, please contact [email protected].
88+
7889
## Enforcement
7990

80-
The Kubernetes project's [Code of Conduct Committee](https://github.com/kubernetes/community/tree/master/committee-code-of-conduct) enforces code of conduct issues for the Kubernetes project.
91+
Upon review and investigation of a reported incident, the CoC response team that has jurisdiction will determine what action is appropriate based on this Code of Conduct and its related documentation.
92+
93+
For information about which Code of Conduct incidents are handled by project leadership, which incidents are handled by the CNCF Code of Conduct Committee, and which incidents are handled by the Linux Foundation (including its events team), see our [Jurisdiction Policy](https://www.cncf.io/conduct/jurisdiction/).
8194

82-
For all projects that do not have their own Code of Conduct Committee or other Code of Conduct incident responders, and for incidents that are project-agnostic or impact multiple projects, the [CNCF Code of Conduct Committee](https://www.cncf.io/conduct/committee/) enforces code of conduct issues. For more information, see our [Jurisdiction and Escalation Policy](https://www.cncf.io/conduct/jurisdiction/)
95+
## Amendments
8396

84-
Both bodies try to resolve incidents without punishment, but may remove people from the project or CNCF communities at their discretion.
97+
Consistent with the CNCF Charter, any substantive changes to this Code of Conduct must be approved by the Technical Oversight Committee.
8598

8699
## Acknowledgements
87100

0 commit comments

Comments
 (0)