From bc599aef947b59e6ff7d87df95bc5aa1a30465cd Mon Sep 17 00:00:00 2001 From: Shane Utt Date: Mon, 6 Mar 2023 11:51:33 -0500 Subject: [PATCH] Update dataplane license for CNCF requirements (#79) Changes the dataplane licensing from `GPLv2` to dual-licensed `GPLv2 + BSD-2-Clause` as per CNCF requirements as outlined in #78. Resolves #78 --- README.md | 9 +++++---- dataplane/Dockerfile | 5 +++-- dataplane/LICENSE.BSD-2-Clause | 23 +++++++++++++++++++++++ dataplane/{LICENSE => LICENSE.GPL-2.0} | 0 4 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 dataplane/LICENSE.BSD-2-Clause rename dataplane/{LICENSE => LICENSE.GPL-2.0} (100%) diff --git a/README.md b/README.md index f22cdb5f..944bab09 100644 --- a/README.md +++ b/README.md @@ -113,9 +113,10 @@ on [Kubernetes Slack][kslack] on the `#sig-network-gateway-api` channel. The Blixt control-plane components are licensed under [Apache License, Version 2.0][apache2], which is everything _outside_ of the `dataplane/` directory. The -data-plane components are licensed under the [General Public License, Version -2.0 (only)][gplv2], which includes everything _inside_ the `dataplane/` -directory. +data-plane components are dual-licensed under the [General Public License, +Version 2.0 (only)][gplv2] and the [2-Clause BSD License][bsd2c] (at your +option) including everything _inside_ the `dataplane/` directory. [apache2]:https://github.com/Kong/blixt/blob/main/LICENSE -[gplv2]:https://github.com/Kong/blixt/blob/main/dataplane/LICENSE +[gplv2]:https://github.com/Kong/blixt/blob/main/dataplane/LICENSE.GPL-2.0 +[bsd2c]:https://github.com/Kong/blixt/blob/main/dataplane/LICENSE.BSD-2-Clause diff --git a/dataplane/Dockerfile b/dataplane/Dockerfile index e744ffc8..23de48d3 100644 --- a/dataplane/Dockerfile +++ b/dataplane/Dockerfile @@ -25,12 +25,13 @@ RUN --mount=type=cache,target=/workspace/target/ \ FROM alpine LABEL org.opencontainers.image.source=https://github.com/kong/blixt -LABEL org.opencontainers.image.licenses=GPL-2.0-only +LABEL org.opencontainers.image.licenses=GPL-2.0-only,BSD-2-Clause WORKDIR /opt/blixt/ COPY --from=builder /workspace/dataplane /opt/blixt/dataplane -COPY LICENSE /opt/blixt/LICENSE +COPY LICENSE.GPL-2.0 /opt/blixt/LICENSE.GPL-2.0 +COPY LICENSE.BSD-2-Clause /opt/blixt/LICENSE.BSD-2-Clause ENTRYPOINT ["/opt/blixt/dataplane"] diff --git a/dataplane/LICENSE.BSD-2-Clause b/dataplane/LICENSE.BSD-2-Clause new file mode 100644 index 00000000..33cb1bc1 --- /dev/null +++ b/dataplane/LICENSE.BSD-2-Clause @@ -0,0 +1,23 @@ +Copyright Kong. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/dataplane/LICENSE b/dataplane/LICENSE.GPL-2.0 similarity index 100% rename from dataplane/LICENSE rename to dataplane/LICENSE.GPL-2.0