Skip to content

Commit 6b7a729

Browse files
committed
update Code of Conduct document
Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com> On-behalf-of: @SAP karol.szwaj@sap.com
1 parent a277d60 commit 6b7a729

1 file changed

Lines changed: 69 additions & 55 deletions

File tree

code-of-conduct.md

Lines changed: 69 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,89 @@
1-
# Contributor Covenant Code of Conduct
1+
This project is following the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).
22

3-
## Our Pledge
3+
# Community Code of Conduct
44

5-
In the interest of fostering an open and welcoming environment, we as
6-
contributors and maintainers pledge to making participation in our project and
7-
our community a harassment-free experience for everyone, regardless of age, body
8-
size, disability, ethnicity, gender identity and expression, level of
9-
experience, education, socio-economic status, nationality, personal appearance,
10-
race, religion, or sexual identity and orientation.
5+
As contributors, maintainers, and participants in the CNCF community, and in the interest of fostering
6+
an open and welcoming community, we pledge to respect all people who participate or contribute
7+
through reporting issues, posting feature requests, updating documentation,
8+
submitting pull requests or patches, attending conferences or events, or engaging in other community or project activities.
119

12-
## Our Standards
10+
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, socioeconomic status, tribe, or any other dimension of diversity.
11+
12+
## Scope
1313

14-
Examples of behavior that contributes to creating a positive environment
15-
include:
14+
This code of conduct applies:
15+
* within project and community spaces,
16+
* 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 in the context of a CNCF activity.
1617

17-
- Using welcoming and inclusive language
18-
- Being respectful of differing viewpoints and experiences
19-
- Gracefully accepting constructive criticism
20-
- Focusing on what is best for the community
21-
- Showing empathy towards other community members
18+
### CNCF Events
2219

23-
Examples of unacceptable behavior by participants include:
20+
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.
21+
22+
## Our Standards
2423

25-
- The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
27-
- Trolling, insulting/derogatory comments, and personal or political attacks
28-
- Public or private harassment
29-
- Publishing others' private information, such as a physical or electronic
30-
address, without explicit permission
31-
- Other conduct which could reasonably be considered inappropriate in a
24+
The CNCF Community is open, inclusive and respectful. Every member of our community has the right to have their identity respected.
25+
26+
Examples of behavior that contributes to a positive environment include but are not limited to:
27+
28+
* Demonstrating empathy and kindness toward other people
29+
* Being respectful of differing opinions, viewpoints, and experiences
30+
* Giving and gracefully accepting constructive feedback
31+
* Accepting responsibility and apologizing to those affected by our mistakes,
32+
and learning from the experience
33+
* Focusing on what is best not just for us as individuals, but for the
34+
overall community
35+
* Using welcoming and inclusive language
36+
37+
38+
Examples of unacceptable behavior include but are not limited to:
39+
40+
* The use of sexualized language or imagery
41+
* Trolling, insulting or derogatory comments, and personal or political attacks
42+
* Public or private harassment in any form
43+
* Publishing others' private information, such as a physical or email
44+
address, without their explicit permission
45+
* Violence, threatening violence, or encouraging others to engage in violent behavior
46+
* Stalking or following someone without their consent
47+
* Unwelcome physical contact
48+
* Unwelcome sexual or romantic attention or advances
49+
* Using CNCF projects or community spaces for political campaigning or promotion of political causes
50+
that are unrelated to the advancement of cloud native technology. To clarify, this policy does not restrict individuals' personal attire, including attire that expresses personal beliefs or aspects of identity.
51+
* Other conduct which could reasonably be considered inappropriate in a
3252
professional setting
3353

34-
## Our Responsibilities
54+
The following behaviors are also prohibited:
55+
* Providing knowingly false or misleading information in connection with a Code of Conduct investigation or otherwise intentionally tampering with an investigation.
56+
* Retaliating against a person because they reported an incident or provided information about an incident as a witness.
3557

36-
Project maintainers are responsible for clarifying the standards of acceptable
37-
behavior and are expected to take appropriate and fair corrective action in
38-
response to any instances of unacceptable behavior.
58+
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.
59+
By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect
60+
of managing a CNCF project.
61+
Project maintainers who do not follow or enforce the Code of Conduct may be temporarily or permanently removed from the project team.
3962

40-
Project maintainers have the right and responsibility to remove, edit, or reject
41-
comments, commits, code, wiki edits, issues, and other contributions that are
42-
not aligned to this Code of Conduct, or to ban temporarily or permanently any
43-
contributor for other behaviors that they deem inappropriate, threatening,
44-
offensive, or harmful.
63+
## Reporting
4564

46-
## Scope
65+
For incidents occurring in the Kubernetes community, contact the [Kubernetes Code of Conduct Committee](https://git.k8s.io/community/committee-code-of-conduct) via <conduct@kubernetes.io>. You can expect a response within three business days.
66+
67+
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 <conduct@cncf.io>. 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://github.com/cncf/foundation/blob/main/code-of-conduct/coc-incident-resolution-procedures.md). You can expect a response within three business days.
68+
69+
For incidents occurring at CNCF event that is produced by the Linux Foundation, please contact <eventconduct@cncf.io>.
4770

48-
This Code of Conduct applies both within project spaces and in public spaces
49-
when an individual is representing the project or its community. Examples of
50-
representing a project or community include using an official project e-mail
51-
address, posting via an official social media account, or acting as an appointed
52-
representative at an online or offline event. Representation of a project may be
53-
further defined and clarified by project maintainers.
71+
## Frequently asked questions
72+
73+
For more information about this Code of Conduct, please see the [CNCF Code of Conduct Frequently Asked Questions](https://www.cncf.io/conduct/faq/).
5474

5575
## Enforcement
5676

57-
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58-
reported by contacting the project team at
59-
kube-bind-code-of-conduct@googlegroups.com. All complaints will be reviewed and
60-
investigated and will result in a response that is deemed necessary and
61-
appropriate to the circumstances. The project team is obligated to maintain
62-
confidentiality with regard to the reporter of an incident. Further details of
63-
specific enforcement policies may be posted separately.
77+
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.
78+
79+
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://github.com/cncf/foundation/blob/main/code-of-conduct/coc-committee-jurisdiction-policy.md).
6480

65-
Project maintainers who do not follow or enforce the Code of Conduct in good
66-
faith may face temporary or permanent repercussions as determined by other
67-
members of the project's leadership.
81+
## Amendments
6882

69-
## Attribution
83+
Consistent with the CNCF Charter, any substantive changes to this Code of Conduct must be approved by the Technical Oversight Committee.
7084

71-
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
72-
version 1.4, available at
73-
https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
85+
## Acknowledgements
7486

75-
[homepage]: https://www.contributor-covenant.org
87+
This Code of Conduct is adapted from the Contributor Covenant
88+
(http://contributor-covenant.org), version 2.0 available at
89+
http://contributor-covenant.org/version/2/0/code_of_conduct/

0 commit comments

Comments
 (0)