Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add details about copyright notices and donated repos #3511

Merged
merged 3 commits into from Apr 9, 2019

Conversation

@swinslow
Copy link
Contributor

swinslow commented Mar 23, 2019

Ref: https://groups.google.com/d/topic/kubernetes-sig-architecture/TjHLgJcDF-I/discussion

Ref: #3427

/cc @dims @justaugustus @nikhita
licensing subproject members

/assign @nikhita
/hold

This is a replacement for #3427, modifying the language and adding some details about copyright transfers and copyright notices.

Agree with comment at #3427 (comment) that sig-release might be a better place to aggregate more information about copyright notices, etc. over the longer term. I'm thinking that the added details here will be useful for now as we build out the more detailed guidance.

nikhita and others added some commits Mar 14, 2019

@swinslow

This comment has been minimized.

Copy link
Contributor Author

swinslow commented Mar 23, 2019

/assign spiffxp

@@ -98,6 +98,13 @@ the developers who could not be reached
[@caniszczyk](https://github.com/caniszczyk) for review of third party deps
* Boilerplate text across all files should attribute copyright as follows:
`"Copyright <Project Authors>"` if no CLA was in place prior to donation
* Additions of [the standard Kubernetes header](https://github.com/kubernetes/kubernetes/blob/master/hack/boilerplate/boilerplate.go.txt)

This comment has been minimized.

Copy link
@nikhita

nikhita Mar 23, 2019

Member

The line above says Copyright <Project Authors>, can we modify that to point to the standard Kubernetes header as well?

donated to a Kubernetes repo should use [the standard header](https://github.com/kubernetes/kubernetes/blob/master/hack/boilerplate/boilerplate.go.txt)
referencing "The Kubernetes Authors". That doesn't mean you are transferring your
copyright. Instead, it's a general reference to the fact that the copyrights remain
owned by the authors of Kubernetes.

This comment has been minimized.

Copy link
@nikhita

nikhita Mar 23, 2019

Member

I'm a little confused 🙈 Just for my understanding:

That doesn't mean you are transferring your copyright. Instead, it's a general reference to the fact that the copyrights remain owned by the authors of Kubernetes.

Does "remain owned" mean that the ownership of the copyright is transferred from the original authors/original company to the authors of Kubernetes?

This comment has been minimized.

Copy link
@swinslow

swinslow Mar 23, 2019

Author Contributor

Hi @nikhita, no worries, if you are finding it confusing then I should reword it to make it clearer =)

The idea is that ownership for contributed code does not change. The owners of the copyrights might be individuals, or their employers, but in any case whoever owns the copyright before contribution still owns it afterwards. It’s just that a license is granted under the CLA.

Let me stare at the language a bit more and try to clarify it better.

This comment has been minimized.

Copy link
@nikhita

nikhita Mar 27, 2019

Member

I'm ok with merge and iterate-if-needed, if @dims and @justaugustus are good with this.

@justaugustus

This comment has been minimized.

Copy link
Member

justaugustus commented Mar 27, 2019

Yes, let's iterate.
/lgtm
/approve

@nikhita

This comment has been minimized.

Copy link
Member

nikhita commented Mar 30, 2019

@dims (licensing subproject owner) and @spiffxp (github-management subproject owner) - can you add explicit lgtms if you are good with this? Thanks!

@dims

This comment has been minimized.

Copy link
Member

dims commented Mar 30, 2019

/lgtm

@nikhita

This comment has been minimized.

Copy link
Member

nikhita commented Apr 9, 2019

/assign @cblecker
github-management owner

@nikhita

This comment has been minimized.

Copy link
Member

nikhita commented Apr 9, 2019

/hold cancel

@cblecker

This comment has been minimized.

Copy link
Member

cblecker commented Apr 9, 2019

This looks fine to me, if we can make the two link shortener changes to comply with our style guidelines.

Switch URLs to shortened links
Per comments in review, switching to use shortened URLs to
comply with style guidelines.

Signed-off-by: Steve Winslow <swinslow@gmail.com>

@k8s-ci-robot k8s-ci-robot removed the lgtm label Apr 9, 2019

@cblecker

This comment has been minimized.

Copy link
Member

cblecker commented Apr 9, 2019

/lgtm
/approve

Thanks @swinslow!

@k8s-ci-robot k8s-ci-robot added the lgtm label Apr 9, 2019

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Apr 9, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cblecker, justaugustus, swinslow

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 2c773e5 into kubernetes:master Apr 9, 2019

3 checks passed

cla/linuxfoundation swinslow authorized
Details
pull-community-verify Job succeeded.
Details
tide In merge pool.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.