From fd70ee32b8a69e0e2ca415d4904c44e000bc6c77 Mon Sep 17 00:00:00 2001 From: Ian Jarrett <68592539+ian-jarrett@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:35:07 +0100 Subject: [PATCH 1/6] Create NOTICES.txt --- NOTICES.txt | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 NOTICES.txt diff --git a/NOTICES.txt b/NOTICES.txt new file mode 100644 index 0000000..ac77100 --- /dev/null +++ b/NOTICES.txt @@ -0,0 +1,51 @@ +Name: ca-certificates +URL: https://packages.ubuntu.com/jammy/ca-certificates +License: Mozilla Public License Version 2.0 + +Name: curl +URL: https://curl.se/ +License: https://curl.se/docs/copyright.html + +Name: gnupg +URL: https://www.gnupg.org/ +License: https://www.gnu.org/licenses/gpl-3.0.html + +Name: lsb-release +URL: https://packages.ubuntu.com/jammy/lsb-release +License: https://changelogs.ubuntu.com/changelogs/pool/main/l/lsb/lsb_11.1.0ubuntu4/copyright + +Name: docker +URL: https://www.docker.com/ +License: https://www.docker.com/legal/docker-subscription-service-agreement/ + +Name: containerd +URL: https://containerd.io/ +License: https://github.com/containerd/containerd/blob/main/LICENSE + +Name: git +URL: https://git-scm.com/ +License: https://git-scm.com/about/free-and-open-source + +Name: openjdk-19-jre-headless +URL: https://packages.ubuntu.com/jammy/openjdk-19-jre-headless +License: https://changelogs.ubuntu.com/changelogs/pool/universe/o/openjdk-19/openjdk-19_19.0.2+7-0ubuntu3~22.04/copyright + +Name: socat +URL: http://www.dest-unreach.org/socat/ +License: http://www.dest-unreach.org/socat/doc/README + +Name: jq +URL: https://jqlang.github.io/jq/ +License: jq is licensed under the MIT license (code) and the CC-BY-3.0 license (docs). + +Name: unzip +URL: https://github.com/madler/unzip +Licens: https://github.com/madler/unzip/blob/master/LICENSE + +Name: kubernetes +URL: https://kubernetes.io/ +License: https://github.com/kubernetes/kubernetes/blob/master/LICENSE + +Name: Calico +URL: https://www.tigera.io/project-calico/ +License: https://github.com/projectcalico/calico/blob/master/LICENSE.md From 2a79113691ec00207b387a2568ec576724117895 Mon Sep 17 00:00:00 2001 From: Ian Jarrett <68592539+ian-jarrett@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:35:39 +0100 Subject: [PATCH 2/6] Create LICENSE.txt --- LICENSE.txt | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE.txt @@ -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 [yyyy] [name of copyright owner] + + 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. From 6b3d880230a58f89d60adbc2b99d5043807d714d Mon Sep 17 00:00:00 2001 From: Ian Jarrett <68592539+ian-jarrett@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:36:03 +0100 Subject: [PATCH 3/6] Create VERSION.txt --- VERSION.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 VERSION.txt diff --git a/VERSION.txt b/VERSION.txt new file mode 100644 index 0000000..dbc391f --- /dev/null +++ b/VERSION.txt @@ -0,0 +1 @@ +23.12 From f058e1b0c338e9bb3aed004ff0ace66df44aab1a Mon Sep 17 00:00:00 2001 From: Ian Jarrett <68592539+ian-jarrett@users.noreply.github.com> Date: Fri, 5 Apr 2024 13:40:13 +0100 Subject: [PATCH 4/6] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d1e640..c58cb6e 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ Environment Variable | Default Value | Meaning ``KEYPASS`` | ``nita123`` | Passkey used to create self-signed Jenkins keys ``KUBEROOT`` | ``/etc/kubernetes`` | System location for Kubernetes configuration ``KUBECONFIG`` | ``$KUBEROOT/admin.conf`` | Location of user's Kubernetes configuration +``DEBUG`` | unset | Set it to true in the parent shell, to see additional output # History @@ -55,7 +56,7 @@ As a platform, NITA comprises some of the best Automation tools currently availa * Ansible, for configuration change management * Jenkins, for automation and job control * Robot Framework, for test automation -* Docker, for packaging and easy deployment +* Kubernetes, for container orchestration In a nutshell, NITA can be used as a toolbox from which you can automate the deployment and testing of very complex networks. It is vendor neutral and so can be used to build and test networks from all of the leading vendors in the market. And because it is a toolbox it can be extended to include any other tool that you may need. From 7f7b3227326b9386971b9e3f76f168a9b0457380 Mon Sep 17 00:00:00 2001 From: ian-jarrett Date: Tue, 9 Apr 2024 08:02:18 +0000 Subject: [PATCH 5/6] Install docker for standalone Ansible --- install.sh | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) mode change 100644 => 100755 install.sh diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 index d580f4f..ffa6037 --- a/install.sh +++ b/install.sh @@ -9,6 +9,7 @@ ME="${0##*/}" # This scripts name HOST=`uname -n` +REALUSER="${SUDO_USER:-${USER}}" # User behind sudo bold=$(tput bold) # For echo emphasis normal=$(tput sgr0) @@ -92,7 +93,7 @@ Question "Install system dependencies" && { echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list - apt-get update + # apt-get update apt-get install -y containerd.io apt-get install -y curl gnupg2 software-properties-common apt-transport-https apt-get install -y git @@ -165,7 +166,7 @@ Question "Initialise Kubernetes cluster" && { kubeadm init --control-plane-endpoint="localhost" --ignore-preflight-errors=NumCPU - # And export config for now, before we run kubectl... + # And export kubeconfig for now, before we run kubectl... export KUBECONFIG=${KUBEROOT}/admin.conf echo "${ME}: Warning: Make sure KUBECONFIG is always set in your shell." @@ -209,6 +210,7 @@ Question "Install NITA repositories" && { # Make symbolic links for nita cli scripts... find ${NITAROOT}/${REPO}/cli_scripts -type f -name "nita-cmd*" -exec ln -s {} ${BINDIR} \; + chmod 755 ${NITAROOT}/${REPO}/cli_scripts/nita-cmd* else echo "${ME}: Warning: Directory already exists: \"${NITAROOT}/${REPO}\". Skipping." fi @@ -265,32 +267,30 @@ Question "Install NITA repositories" && { Debug "kubectl get cm" Debug "kubectl describe cm" Debug "kubectl get ns nita" -} -Question "Do you want to set up K8S config for a local user" && { + # Finally, copy the K8S admin file to the local user and set ownership etc. - VALID_USER=1 + OWNER_HOME=`egrep "^${REALUSER}" /etc/passwd | awk -F: '{print $6}'` + echo "${ME}: Creating a local ${OWNER_HOME}/.kube" + mkdir -p ${OWNER_HOME}/.kube + cp -i ${KUBEROOT}/admin.conf ${OWNER_HOME}/.kube/config + chown -R $(id -u ${REALUSER}):$(id -g ${REALUSER}) ${OWNER_HOME}/.kube/ + echo "export KUBECONFIG=${HOME}/.kube/config" >> ${OWNER_HOME}/.bashrc - # Create a local copy of the config file + echo "${ME}: Now ${bold}source your bashrc file${normal} to set KUBECONFIG in your shell" - while [ ${VALID_USER} -ne 0 ] - do - echo -n "Enter a valid local user to own the K8S config: " - read OWNER - id "${OWNER}" >/dev/null 2>&1 - VALID_USER=$? - done +} - # Copy the K8S admin file to the local user and set ownership etc. +Question "Do you want to run standalone Ansible containers" && { - OWNER_HOME=`egrep "^${OWNER}" /etc/passwd | awk -F: '{print $6}'` - echo "${ME}: OK, creating ${OWNER_HOME}/.kube" - mkdir -p ${OWNER_HOME}/.kube - cp -i ${KUBEROOT}/admin.conf ${OWNER_HOME}/.kube/config - chown -R $(id -u ${OWNER}):$(id -g ${OWNER}) ${OWNER_HOME}/.kube/ - echo "export KUBECONFIG=${HOME}/.kube/config" >> ${OWNER_HOME}/.bashrc + # Running standalone Ansible containers requires docker + + apt install -y docker-ce + + # This step will avoid the need to be a sudoer - echo "${ME}: Now source your bashrc file to set KUBECONFIG in your shell" + echo "${ME}: Adding user \"${REALUSER}\" to the docker group" + usermod -aG docker ${REALUSER} } From 4de8426ec7cd9dae1fad657747c48d3ad8fc4112 Mon Sep 17 00:00:00 2001 From: Ian Jarrett <68592539+ian-jarrett@users.noreply.github.com> Date: Tue, 9 Apr 2024 09:53:41 +0100 Subject: [PATCH 6/6] Update install.sh --- install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index ffa6037..fc768ab 100755 --- a/install.sh +++ b/install.sh @@ -93,7 +93,7 @@ Question "Install system dependencies" && { echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list - # apt-get update + apt-get update apt-get install -y containerd.io apt-get install -y curl gnupg2 software-properties-common apt-transport-https apt-get install -y git @@ -281,7 +281,7 @@ Question "Install NITA repositories" && { } -Question "Do you want to run standalone Ansible containers" && { +Question "Do you want to run Ansible as a standalone Docker container" && { # Running standalone Ansible containers requires docker @@ -298,5 +298,6 @@ Debug "ls -al ${NITAROOT}" echo "${ME}: NITA installation has finished." echo "" +echo "${ME}: Remember to ${bold}source your bashrc file${normal} to set KUBECONFIG in your shell" echo "${ME}: You can access the NITA webapp at https://${HOST}:443" echo "${ME}: You can access the Jenkins UI at https://${HOST}:8443"