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

donation: CLA/DCO setup #585

Closed
clux opened this issue Jul 8, 2021 · 10 comments · Fixed by #602
Closed

donation: CLA/DCO setup #585

clux opened this issue Jul 8, 2021 · 10 comments · Fixed by #602
Labels
cncf cncf requirements or donation related

Comments

@clux
Copy link
Member

clux commented Jul 8, 2021

discussions about the potential process to get a CLA/DCO and how to do that IF we decide to donate the repo to CNCF (#584).

Quite a lot of work if it requires retroactive approval from past contributors.

One project that relicensed through github issue checkmarks: gfx-rs/wgpu#1473
Wonder if that approach would be sufficient? People can delete issue comments.

CNCF individual CLA certainly seems like it has more clauses than to just allow re-licensing.

The https://github.com/cla-assistant/cla-assistant from Sönke's comment below seems the most promising.

@clux clux mentioned this issue Jul 8, 2021
7 tasks
@clux clux changed the title need to adopt cncf cla and get retroactive approval from 40+ contributors donation: CLA/DCO + retroactive approval from past contributors Jul 8, 2021
@clux clux added the cncf cncf requirements or donation related label Jul 8, 2021
@soenkeliebau
Copy link
Contributor

The easiest way might be to activate a cla assistant on the repo (for example [1]) - this usually generates a link which you could post under this issue, tag all contributors and ask them to sign the CLA.
That would hopefully gather a sizeable initial batch (I hesitate to guess a percentage here).

Give that a week or two and then we can get to work on trying to contact the missing people directly and talking to them.

The number of contributors is not extremely large, so hopefully that should get us across the line or at least very close to it ..

[1] https://github.com/cla-assistant/cla-assistant

@clux
Copy link
Member Author

clux commented Jul 19, 2021

I see the CLA-Assistant is actually used by Deislabs. Setup is easy, 2 clicks to authorise with github (read perms on user), then accept with name (might have to fill in if missing in user details) as a user/corp.

(I also see that helm started out with the CNCF CLA but moved on to a DCO (because apparently not needed after handover) - maybe something to keep in mind)

Presumably, the most important aspects of the CLA is that we retroactively get rights as required by the CNCF CLA;

  • (2,3) grant of copyright license + patent license for all past contributions
  • (4,5) verification that contributors were legally entitled to grant these licenses, and made by them (but with indemnification for them in clause 6)

The last clause (7; method to submit on behalf of 3rd party) is probably not needed unless someone says so in the big issue. But I guess we can include it in the document.

I think we can take these important bits from CNCF's CLAs, swap out the definitions of "The Foundation" for kube-rs owners and point ownership to us. That way, we still have something out of this after all this is done if kubernetes end up being less cooperative than we thought (in which case we will consider using this new organisation as a home instead)

Interestingly, CLA-Assistant seems to have a drop-down for corp/invididual (at least for Deislabs), whereas CNCF has two documents, so not sure if this is easy to reconcile (haven't checked fully yet). But this is probably at the point where I have to ask them.

I don't know if you have any experience with these particular aspects @soenkeliebau? Does this seem like a sensible course of action to you?

@soenkeliebau
Copy link
Contributor

I don't think CLA assistant supports serving different versions of the CLA for individuals and legal entities tbh. We tried solving this by defining "you" based on the selection in the dropdown you mentioned in our CLA [1].

That dropdown is something that can be freely defined when setting up the CLA assistant and also used to gather additional information besides that.

For our case, I think so far we have only gathered individual CLAs via the assistant, all corporate CLAs have been discussed and signed via mail and not the assistant.

Regarding your questions about the content of the CLA while ianal that sounds sensible to me, however my suggestion would be to discuss this with the relevant people up front who need to accept the donation to ensure you don't have to gather consent twice :)
I believe @brendandburns mentioned this in a comment as well, maybe he can put you in contact with the right people?

[1] https://gist.github.com/eff20055a7b40e1a9932e0b4cbd62f78
[2] https://github.com/cla-assistant/cla-assistant#request-more-information-from-the-cla-signer

@clux
Copy link
Member Author

clux commented Aug 1, 2021

In the interest of not delaying this any further, and not hearing anything official from CNCF. I am planning on adding this early next week with CLA-Assistant using CNCF's individual CLA, but with the following non-legal modifications:

  • removal of mail form starting at paragraph 2, and ending at the E-Mail: _____ line. Because we only let people sign electronically via CLA-assistant. Stackable does a similar modification (although they make other modifications and elaborate that you are electronically signing). Regardless, this is in the header of the document.
  • replace CNCF with kube-rs (Only used in the header).
  • replace The Cloud Native Computing Foundation (the "Foundation") with The kube-rs organisation (the "Organisation")
  • replace The Foundation with The Organisation (used everywhere as shorthands unfortunately - accounts for all of the diff in the main clauses).

(really feels like github ought to standardise something like this in the future, so that people can just read a name like "CNCF CLA")

Full Planned CLA
Thank you for your interest in the kube-rs project (“kube-rs”) of The kube-rs organisation (the "Organisation"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Organisation must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of kube-rs, the Organisation and its users; it does not change your rights to use your own Contributions for any other purpose.

You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the Organisation. In return, the Organisation shall not use Your Contributions in a way that is contrary to the public benefit or inconsistent with its nonprofit status and bylaws in effect at the time of the Contribution. Except for the license granted herein to the Organisation and recipients of software distributed by the Organisation, You reserve all right, title, and interest in and to Your Contributions.

  1. Definitions.

"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with the Organisation. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.

"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to the Organisation for inclusion in, or documentation of, any of the products owned or managed by the Organisation (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Organisation or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Organisation for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."

  1. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to the Organisation and to recipients of software distributed by the Organisation a perpetual, worldwide, non­exclusive, no­charge, royalty­free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.

  2. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to the Organisation and to recipients of software distributed by the Organisation a perpetual, worldwide, non­exclusive, no­charge, royalty­free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross­claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.

  3. You represent that you are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for your Contributions to the Organisation, or that your employer has executed a separate Corporate CLA with the Organisation.

  4. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third­party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions.

  5. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON­INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.

  6. Should You wish to submit work that is not Your original creation, You may submit it to the Organisation separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third­party: [named here]".

  7. You agree to notify the Organisation of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.

and

Markdown diff with CNCF CLA
diff --git cla-individual.md cla-individual.md
index 8f00ff8..005e5af 100644
--- cla-individual.md
+++ cla-individual.md
@@ -1,23 +1,23 @@
-Thank you for your interest in the Cloud Native Computing Foundation project (“CNCF”) of The Linux Foundation (the "Foundation"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Foundation must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of CNCF, the Foundation and its users; it does not change your rights to use your own Contributions for any other purpose.
+Thank you for your interest in the kube-rs project (“kube-rs”) of The kube-rs organisation (the "Organisation"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Organisation must have a Contributor License Agreement ("CLA") on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of kube-rs, the Organisation and its users; it does not change your rights to use your own Contributions for any other purpose.
 
-You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the Foundation. In return, the Foundation shall not use Your Contributions in a way that is contrary to the public benefit or inconsistent with its nonprofit status and bylaws in effect at the time of the Contribution. Except for the license granted herein to the Foundation and recipients of software distributed by the Foundation, You reserve all right, title, and interest in and to Your Contributions.
+You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the Organisation. In return, the Organisation shall not use Your Contributions in a way that is contrary to the public benefit or inconsistent with its nonprofit status and bylaws in effect at the time of the Contribution. Except for the license granted herein to the Organisation and recipients of software distributed by the Organisation, You reserve all right, title, and interest in and to Your Contributions.
 
 1. Definitions.
 
-"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with the Foundation. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+"You" (or "Your") shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with the Organisation. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
 
-"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to the Foundation for inclusion in, or documentation of, any of the products owned or managed by the Foundation (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Foundation or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Foundation for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
+"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to the Organisation for inclusion in, or documentation of, any of the products owned or managed by the Organisation (the "Work"). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Organisation or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Organisation for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
 
-2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to the Foundation and to recipients of software distributed by the Foundation a perpetual, worldwide, non­exclusive, no­charge, royalty­free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
+2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to the Organisation and to recipients of software distributed by the Organisation a perpetual, worldwide, non­exclusive, no­charge, royalty­free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works.
 
-3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to the Foundation and to recipients of software distributed by the Foundation a perpetual, worldwide, non­exclusive, no­charge, royalty­free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross­claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
+3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to the Organisation and to recipients of software distributed by the Organisation a perpetual, worldwide, non­exclusive, no­charge, royalty­free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross­claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed.
 
-4. You represent that you are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for your Contributions to the Foundation, or that your employer has executed a separate Corporate CLA with the Foundation.
+4. You represent that you are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for your Contributions to the Organisation, or that your employer has executed a separate Corporate CLA with the Organisation.
 
 5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third­party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions.
 
 6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON­INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
 
-7. Should You wish to submit work that is not Your original creation, You may submit it to the Foundation separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third­party: [named here]".
+7. Should You wish to submit work that is not Your original creation, You may submit it to the Organisation separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third­party: [named here]".
 
-8. You agree to notify the Foundation of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.
+8. You agree to notify the Organisation of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect.

@clux
Copy link
Member Author

clux commented Aug 1, 2021

Although might also need to make a similar change to @soenkeliebau 's suggestion on the CLA-assistant to define "You" based on a dropdown selection. Might have to try it out on a test project first.

@clux
Copy link
Member Author

clux commented Aug 2, 2021

CLA gist here: https://gist.github.com/clux/a4e349e729af96faff044c753edbbdb7

  • Converted text to have markdown headers like stackable's one and used their metadata.
  • Listed CNCF CLA clause 4,5 and 7 under a ## 4. Representations header (didn't know what else to summarise them as, and stackable rewrites those bits).

@nightkr
Copy link
Member

nightkr commented Aug 2, 2021

One thing I'm a bit worried about is that kube-rs is not a legal person (natural person, corporation, non-profit, and so on). It might be easier if it's addressed to you (@clux) personally instead?

@clux
Copy link
Member Author

clux commented Aug 2, 2021

Yeah, that's a fair point. It looks legally easier to pin it on me temporarily, although the legalese feels pretty heavy handed with that template though :D

Thank you for your interest in the kube-rs project (“kube-rs”) by Eirik clux Albrigtsen (the "Owner").

@clux
Copy link
Member Author

clux commented Aug 2, 2021

Updated with me as the legal pin. Also removed the corresponding guarantee that I will "adhere to non-profit bylaws at the time of the contribution" because it doesn't make sense for an individual. Left the "good faith" sentence though:

in return, the Owner shall not use Your Contributions in a way that is contrary to the public benefit

@clux
Copy link
Member Author

clux commented Aug 3, 2021

In an unexpected turn of events, we can probably drop our CLA idea for a simple DCO based on CNCF Chris's comments (plus a few comments above) because we use Apache2 out of the box. (A DCO is still necessary)

The guidelines in the official doucment on CNCF are a lot more lightweight:

  • no copyright headers anywhere, just a generic Copyright The Kube-rs Authors (i need to typo fix that from the license file)
  • original authors keep their copyrights

AFAIKT the only thing we lose out on is the ability to relicense our code, and if i never have to deal with the legal aspect again, then i'm good :-)

PLAN:

  • write a contributors guide
  • install the DCO app in the org
  • write a file for CERTIFICATE_OF_ORIGIN (if it is required with the DCO app) seems not!
  • update LICENSE line with authors to match req and set the year correctly to 2018 (when we actually started)

@clux clux changed the title donation: CLA/DCO + retroactive approval from past contributors donation: CLA/DCO setup Aug 3, 2021
clux added a commit that referenced this issue Aug 3, 2021
@clux clux linked a pull request Aug 3, 2021 that will close this issue
@clux clux closed this as completed in #602 Aug 3, 2021
clux added a commit that referenced this issue Aug 3, 2021
* add a contributing guide with dco requirement - closes #585

Signed-off-by: clux <[email protected]>

* correct author + start year

Signed-off-by: clux <[email protected]>

* link to core maintainers team

Signed-off-by: clux <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf cncf requirements or donation related
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants