diff --git a/content/en/code-of-conduct.md b/content/en/code-of-conduct.md deleted file mode 100644 index 0d15c00cf3..0000000000 --- a/content/en/code-of-conduct.md +++ /dev/null @@ -1,3 +0,0 @@ -# Kubernetes Community Code of Conduct - -Please refer to our [Kubernetes Community Code of Conduct](https://git.k8s.io/community/code-of-conduct.md) diff --git a/content/en/community/_index.html b/content/en/community/_index.html index ad8829affb..807faa6565 100644 --- a/content/en/community/_index.html +++ b/content/en/community/_index.html @@ -38,6 +38,17 @@ cid: community frameborder="0" scrolling="no"> --> +
+

Code of Conduct

+

The Kubernetes community values respect and inclusiveness, and + enforces a Code of Conduct 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 + steering committee. + Your anonymity will be protected.

+

+
diff --git a/content/en/community/code-of-conduct.md b/content/en/community/code-of-conduct.md new file mode 100644 index 0000000000..3defdd4b72 --- /dev/null +++ b/content/en/community/code-of-conduct.md @@ -0,0 +1,28 @@ +--- +title: Community +layout: basic +cid: community +css: /css/community.css +--- + +
+

Kubernetes Community Code of Conduct

+ +Kubernetes follows the +CNCF Code of Conduct. +The text of the CNCF CoC is replicated below, as of +commit 0ce4694. +If you notice that this is out of date, please +file an issue. + +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 +steering committee. Your +anonymity will be protected. + +
+{{< include "/static/cncf-code-of-conduct.md" >}} +
+
+ + diff --git a/content/en/community/static/README.md b/content/en/community/static/README.md new file mode 100644 index 0000000000..ef8e8d5a3e --- /dev/null +++ b/content/en/community/static/README.md @@ -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. \ No newline at end of file diff --git a/content/en/community/static/cncf-code-of-conduct.md b/content/en/community/static/cncf-code-of-conduct.md new file mode 100644 index 0000000000..e332919bca --- /dev/null +++ b/content/en/community/static/cncf-code-of-conduct.md @@ -0,0 +1,45 @@ + +## 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 , and/or Dan Kohn . + +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. diff --git a/static/_redirects b/static/_redirects index b0ee124435..7ad757c00d 100644 --- a/static/_redirects +++ b/static/_redirects @@ -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 diff --git a/static/css/community.css b/static/css/community.css new file mode 100644 index 0000000000..9bd94d3dab --- /dev/null +++ b/static/css/community.css @@ -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; +}