summaryrefslogtreecommitdiff
path: root/github-management
diff options
context:
space:
mode:
authorKubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com>2022-03-01 12:53:54 -0800
committerGitHub <noreply@github.com>2022-03-01 12:53:54 -0800
commit3a532f474447c2f83468f55f9794d0a154a4c384 (patch)
tree02a6d1e3dffb4b74febaa5aa2532060fab3fcc3d /github-management
parent8b37a194d502a4807c6e78e898310c3489d5ca5f (diff)
parente56f496c7b1a45e37e1b5aecc158c394e7e40c13 (diff)
Merge pull request #6502 from cblecker/licensing
Add licensing guidance to the org owners guidance
Diffstat (limited to 'github-management')
-rw-r--r--github-management/org-owners-guide.md18
1 files changed, 18 insertions, 0 deletions
diff --git a/github-management/org-owners-guide.md b/github-management/org-owners-guide.md
index fdd1f1d1..8d3ef70a 100644
--- a/github-management/org-owners-guide.md
+++ b/github-management/org-owners-guide.md
@@ -47,6 +47,21 @@ code in.
It is easier to start new code in a Kubernetes organization than it is to
transfer in existing code.
+## Licensing Guidance
+
+Section 11 of the [CNCF Charter] provides guidance on how to license code and
+documentation owned by the CNCF projects. However, it doesn't explicitly cover
+situations where a repo may have mixed content (such as repos that contain both
+code and documentation living alongside each other).
+
+For clarity, here is the guidance for Kubernetes GitHub organizations:
+- If a repo contains only code, it should be licensed under the
+ [Apache License, Version 2.0].
+- If a repo contains only documentation, it should be licensed under the
+ [Creative Commons Attribution 4.0 International License].
+- If a repo contains both code and documentation, it should be licensed under
+ the [Apache License, Version 2.0].
+
## Team Guidance
### Nomenclature
@@ -230,3 +245,6 @@ https://help.github.com/articles/archiving-a-github-repository/
[kubernetes-template-project]: https://github.com/kubernetes/kubernetes-template-project
[SIG Repository]: /github-management/kubernetes-repositories.md##sig-repositories
[template repo]: https://help.github.com/en/articles/creating-a-repository-from-a-template
+[CNCF Charter]: https://github.com/cncf/foundation/blob/main/charter.md
+[Apache License, Version 2.0]: https://www.apache.org/licenses/LICENSE-2.0
+[Creative Commons Attribution 4.0 International License]: https://creativecommons.org/licenses/by/4.0/