Skip to content

Commit

Permalink
Update dataplane license for CNCF requirements (#79)
Browse files Browse the repository at this point in the history
Changes the dataplane licensing from `GPLv2` to dual-licensed `GPLv2 +
BSD-2-Clause` as per CNCF requirements as outlined in #78.

Resolves #78
  • Loading branch information
shaneutt authored Mar 6, 2023
1 parent 16253a2 commit 6c192ad
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 6 deletions.
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions dataplane/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
23 changes: 23 additions & 0 deletions dataplane/LICENSE.BSD-2-Clause
Original file line number Diff line number Diff line change
@@ -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.
File renamed without changes.

0 comments on commit 6c192ad

Please sign in to comment.