Skip to content

Commit

Permalink
Use static content for code of conduct (#9355)
Browse files Browse the repository at this point in the history
Move the code of conduct page under /community
Add redirect
Use text from CNCF COC and note the revision we imported it at
Add note to top of imported file not to edit it directly
  • Loading branch information
Misty Linville authored and k8s-ci-robot committed Jul 9, 2018
1 parent c9fe098 commit 85e3040
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 3 deletions.
3 changes: 0 additions & 3 deletions content/en/code-of-conduct.md

This file was deleted.

11 changes: 11 additions & 0 deletions content/en/community/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,17 @@ <h3>Events</h3>
frameborder="0" scrolling="no"></iframe>
</div>
</div> -->
<div class="content">
<h3>Code of Conduct</h3>
<p>The Kubernetes community values respect and inclusiveness, and
enforces a <a href="code-of-conduct/">Code of Conduct</a> in all
interactions. If you notice a violation of the Code of Conduct at
an event or meeting, in Slack, or in another communication
mechanism, reach out to the
<a href="mailto:[email protected]">steering committee</a>.
Your anonymity will be protected.</p>
</p>
</div>
</main>
</section>

Expand Down
28 changes: 28 additions & 0 deletions content/en/community/code-of-conduct.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
title: Community
layout: basic
cid: community
css: /css/community.css
---

<div class="community_main">
<h1>Kubernetes Community Code of Conduct</h1>

Kubernetes follows the
<a href="https://github.com/cncf/foundation/blob/master/code-of-conduct.md">CNCF Code of Conduct</a>.
The text of the CNCF CoC is replicated below, as of
<a href="https://github.com/cncf/foundation/blob/0ce4694e5103c0c24ca90c189da81e5408a46632/code-of-conduct.md">commit 0ce4694</a>.
If you notice that this is out of date, please
<a href="https://github.com/kubernetes/website/issues/new">file an issue</a>.

If you notice a violation of the Code of Conduct at an event or meeting, in
Slack, or in another communication mechanism, reach out to the
<a href="mailto:[email protected]">steering committee</a>. Your
anonymity will be protected.

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


2 changes: 2 additions & 0 deletions content/en/community/static/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The files in this directory have been imported from other sources. Do not
edit them directly, except by replacing them with new versions.
45 changes: 45 additions & 0 deletions content/en/community/static/cncf-code-of-conduct.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<!-- Do not edit this file directly. Get the latest from
https://github.com/cncf/foundation/blob/master/code-of-conduct.md -->
## CNCF Community Code of Conduct v1.0

### Contributor Code of Conduct

As contributors and maintainers of this project, and in the interest of fostering
an open and welcoming community, we pledge to respect all people who contribute
through reporting issues, posting feature requests, updating documentation,
submitting pull requests or patches, and other activities.

We are committed to making participation in this project a harassment-free experience for
everyone, regardless of level of experience, gender, gender identity and expression,
sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
religion, or nationality.

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery
* Personal attacks
* Trolling or insulting/derogatory comments
* Public or private harassment
* Publishing other's private information, such as physical or electronic addresses,
without explicit permission
* Other unethical or unprofessional conduct.

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. By adopting this Code of Conduct, project maintainers
commit themselves to fairly and consistently applying these principles to every aspect
of managing this project. Project maintainers who do not follow or enforce the Code of
Conduct may be permanently removed from the project team.

This code of conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community.

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]>.

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

### CNCF Events Code of Conduct

CNCF events are governed by the Linux Foundation [Code of Conduct](http://events.linuxfoundation.org/events/cloudnativecon/attend/code-of-conduct) available on the event page. This is designed to be compatible with the above policy and also includes more details on responding to incidents.
1 change: 1 addition & 0 deletions static/_redirects
Original file line number Diff line number Diff line change
Expand Up @@ -513,3 +513,4 @@ https://kubernetes-io-v1-7.netlify.com/* https://v1-7.docs.kubernetes.io/:spl
/docs/admin/authorization/ /docs/reference/access-authn-authz/authorization/ 301

/docs/admin/high-availability/building/ /docs/setup/independent/high-availability/ 301
/code-of-conduct/ /community/code-of-conduct/ 301
19 changes: 19 additions & 0 deletions static/css/community.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
div.community_main h1, h2, h3 {
border-bottom: 1px solid #cccccc;
margin-bottom: 30px;
padding-bottom: 10px;
padding-top: 10px;
}

div.community_main {
padding: 50px 100px;
}

div.community_main ul,
div.community_main li {
list-style: disc;
list-style-position: inside;
padding: 10px 0;
font-size: 16px;
font-weight: 400;
}

0 comments on commit 85e3040

Please sign in to comment.