From dc490453061037099775e6eca0991e7be7b545d0 Mon Sep 17 00:00:00 2001 From: Gavin Scallon Date: Thu, 28 May 2020 16:53:05 -0600 Subject: [PATCH 1/2] Move project to version-specific repo --- Dockerfile | 32 ++++++++ Jenkinsfile | 2 + LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 22 +++++- download.yaml | 4 + 5 files changed, 261 insertions(+), 1 deletion(-) create mode 100644 Dockerfile create mode 100644 Jenkinsfile create mode 100644 LICENSE create mode 100644 download.yaml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..6e4e834 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,32 @@ +############################################################### +# Default registry variables +ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io +ARG BASE_IMAGE=redhat/ubi/ubi8 +ARG BASE_TAG=8.2 +############################################################### +FROM opensource/istio/install-cni/install-cni:1.6.0 AS base + +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} + +# label information +LABEL name="istio install-cni" \ + maintainer="gavin.scallon@parsons.com" \ + vendor="Open Source" \ + version="1.6.0" \ + release="1" \ + summary="istio install-cni" \ + description="The Istio Container Network Interface (CNI) plugin allows you to configure and use an Istio mesh." + +COPY --from=base /opt/cni/bin/istio-cni /opt/cni/bin/istio-iptables.sh /opt/cni/bin/istio-cni-repair /opt/cni/bin/ +COPY --from=base /install-cni.sh /filter.jq / +COPY --from=base /istio-cni.conf.tmp host/etc/cni/net.d/ +RUN chmod 777 /host/etc/cni/net.d/istio-cni.conf.tmp +ENV PATH=$PATH:/opt/cni/bin +VOLUME /opt/cni +WORKDIR /opt/cni/bin + +USER 1001 +############################################################### +HEALTHCHECK --interval=1m --start-period=30s CMD curl -f http://localhost:80 || exit 1 +############################################################### +CMD ["/install-cni.sh"] diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..f376c5c --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,2 @@ +@Library('DCCSCR@master') _ +dccscrPipeline( version: "1.6.0") \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..8349927 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. 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 an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor 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 + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You 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 the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You 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 such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its 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. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2016-2019 Istio Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/README.md b/README.md index dc77db1..85de3e1 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,22 @@ -# install-cni-1.6 +# install-cni +Version 1.6.0 + +``` +# Download the tarball from the Iron Bank repository and navigate to the +# download directory. Run the following commands to run the container +# (using istio-cni.tar.gz as example tarball name): +podman load -i istio-cni.tar.gz +podman container run istio-cni +``` + +Use the Istio Container Network Interface to configure and install an +Istio service mesh plugin. + +For application pods in the Istio service mesh, all traffic to/from the pods +needs to go through the sidecar proxies (istio-proxy containers). This istio-cni +Container Network Interface (CNI) plugin will set up the pods' networking to +fulfill this requirement + +In the event that you wish to implement this with a helm chart, you must ensure +that the chart is modified to utilize the install-cni image from the Iron Bank. \ No newline at end of file diff --git a/download.yaml b/download.yaml new file mode 100644 index 0000000..a643f6e --- /dev/null +++ b/download.yaml @@ -0,0 +1,4 @@ +--- +resources: + - url: "docker://docker.io/istio/install-cni@sha256:3ded1c5b447630522d71169534f8521c3194304a3c8ca050bec2a41bbe53fee8" + tag: opensource/istio/install-cni/install-cni:1.6.0 -- GitLab From 94f2ad246a2283855acdbe0ed6d8375fe4fb81b4 Mon Sep 17 00:00:00 2001 From: "gavin.scallon" Date: Thu, 11 Jun 2020 00:23:34 +0000 Subject: [PATCH 2/2] 1.6.1 update --- Dockerfile | 6 +++--- Jenkinsfile | 2 +- README.md | 8 ++++++-- download.yaml | 9 +++++++-- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6e4e834..b31221e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io ARG BASE_IMAGE=redhat/ubi/ubi8 ARG BASE_TAG=8.2 ############################################################### -FROM opensource/istio/install-cni/install-cni:1.6.0 AS base +FROM opensource/istio/install-cni/install-cni:1.6.1 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} @@ -12,11 +12,11 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} LABEL name="istio install-cni" \ maintainer="gavin.scallon@parsons.com" \ vendor="Open Source" \ - version="1.6.0" \ + version="1.6.1" \ release="1" \ summary="istio install-cni" \ description="The Istio Container Network Interface (CNI) plugin allows you to configure and use an Istio mesh." - +COPY jq-linux64 / COPY --from=base /opt/cni/bin/istio-cni /opt/cni/bin/istio-iptables.sh /opt/cni/bin/istio-cni-repair /opt/cni/bin/ COPY --from=base /install-cni.sh /filter.jq / COPY --from=base /istio-cni.conf.tmp host/etc/cni/net.d/ diff --git a/Jenkinsfile b/Jenkinsfile index f376c5c..c536db0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline( version: "1.6.0") \ No newline at end of file +dccscrPipeline( version: "1.6.1") \ No newline at end of file diff --git a/README.md b/README.md index 85de3e1..25a9805 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # install-cni -Version 1.6.0 +Version 1.6.1 ``` # Download the tarball from the Iron Bank repository and navigate to the @@ -19,4 +19,8 @@ Container Network Interface (CNI) plugin will set up the pods' networking to fulfill this requirement In the event that you wish to implement this with a helm chart, you must ensure -that the chart is modified to utilize the install-cni image from the Iron Bank. \ No newline at end of file +that the chart is modified to utilize the install-cni image from the Iron Bank. + +## Notes + +The container is configured to run as user 1001. \ No newline at end of file diff --git a/download.yaml b/download.yaml index a643f6e..09e16c5 100644 --- a/download.yaml +++ b/download.yaml @@ -1,4 +1,9 @@ --- resources: - - url: "docker://docker.io/istio/install-cni@sha256:3ded1c5b447630522d71169534f8521c3194304a3c8ca050bec2a41bbe53fee8" - tag: opensource/istio/install-cni/install-cni:1.6.0 + - url: "docker://docker.io/istio/install-cni@sha256:895d484eeb7de4cbb0dcdff754a3581570459af5b2d563d3301740843ae379b2" + tag: opensource/istio/install-cni/install-cni:1.6.1 + - url: https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 + filename: jq-linux64 + validation: + type: sha256 + value: af986793a515d500ab2d35f8d2aecd656e764504b789b66d7e1a0b727a124c44 -- GitLab