Merge pull request kubernetes#1457 from chrislovecnm/code-of-conduct-…

…file Automatic merge from submit-queue. adding code-of-conduct.md closes kubernetes#1414 We do not have this file in this repo. /assign @cblecker
filmil · Dec 1, 2017 · d398f99 · d398f99
2 parents 228f03f + d07935f
commit d398f99
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -0,0 +1,3 @@
+# Kubernetes Community Code of Conduct
+
+Kubernetes follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).