Skip to content

Commit 612f9c2

Browse files
carolynvsk8s-ci-robot
authored andcommitted
Use CoCC email for reporting CoC violations (kubernetes#10621)
* Use CoCC email for reporting CoC violations * Direct CoC concerns to the new committee
1 parent 9b4acdf commit 612f9c2

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

CONTRIBUTING.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ These are just guidelines, not rules. Use your best judgment, and feel free to p
99

1010
### Code of Conduct
1111

12-
Kubernetes follows the [Cloud Native Computing Foundation (CNCF) Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to Sarah Novotny [[email protected]](mailto:[email protected]) and/or Dan Kohn [[email protected]](mailto:[email protected]).
12+
Kubernetes follows the [Cloud Native Computing Foundation (CNCF) Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to the
13+
[Kubernetes Code of Conduct Committee](https://github.com/kubernetes/community/tree/master/committee-code-of-conduct) <[email protected]>.
1314

1415
### Documentation and Site Decisions
1516

content/en/community/_index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ <h3>Code of Conduct</h3>
4444
enforces a <a href="code-of-conduct/">Code of Conduct</a> in all
4545
interactions. If you notice a violation of the Code of Conduct at
4646
an event or meeting, in Slack, or in another communication
47-
mechanism, reach out to the
48-
<a href="mailto:steering-private@kubernetes.io">steering committee</a>.
47+
mechanism, reach out to the <a href="https://github.com/kubernetes/community/tree/master/committee-code-of-conduct">Kubernetes Code of Conduct Committee</a>
48+
<a href="mailto:conduct@kubernetes.io">[email protected]</a>.
4949
Your anonymity will be protected.</p>
5050
</p>
5151
</div>

content/en/community/code-of-conduct.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ If you notice that this is out of date, please
1616
<a href="https://github.com/kubernetes/website/issues/new">file an issue</a>.
1717

1818
If you notice a violation of the Code of Conduct at an event or meeting, in
19-
Slack, or in another communication mechanism, reach out to the
20-
<a href="mailto:steering-private@kubernetes.io">steering committee</a>. Your
21-
anonymity will be protected.
19+
Slack, or in another communication mechanism, reach out to
20+
the [Kubernetes Code of Conduct Committee](https://github.com/kubernetes/community/tree/master/committee-code-of-conduct) <conduct@kubernetes.io>.
21+
Your anonymity will be protected.
2222

2323
<div class="cncf_coc_container">
2424
{{< include "/static/cncf-code-of-conduct.md" >}}

content/en/community/static/cncf-code-of-conduct.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ Conduct may be permanently removed from the project team.
3434
This code of conduct applies both within project spaces and in public spaces
3535
when an individual is representing the project or its community.
3636

37-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a CNCF project maintainer, Sarah Novotny <[email protected]>, and/or Dan Kohn <[email protected]>.
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting
38+
the [Kubernetes Code of Conduct Committee](https://github.com/kubernetes/community/tree/master/committee-code-of-conduct) <[email protected]>.
3839

3940
This Code of Conduct is adapted from the Contributor Covenant
4041
(http://contributor-covenant.org), version 1.2.0, available at

0 commit comments

Comments
 (0)