diff options
| -rw-r--r-- | deployments/.env | 6 | ||||
| -rwxr-xr-x | deployments/_functions.sh | 36 | ||||
| -rw-r--r-- | deployments/docker-compose.yml | 31 | ||||
| -rwxr-xr-x | deployments/start-dev.sh | 31 | ||||
| -rwxr-xr-x | deployments/start.sh | 35 | ||||
| -rw-r--r-- | docs/bare_metal_provisioning.rst | 49 | ||||
| -rw-r--r-- | docs/index.rst | 6 | ||||
| -rw-r--r-- | docs/kud_architecture.rst (renamed from docs/krd_architecture.rst) | 20 | ||||
| -rwxr-xr-x | kud/hosting_providers/baremetal/aio.sh (renamed from kud/hosting_providers/vagrant/aio.sh) | 18 | ||||
| -rwxr-xr-x | kud/hosting_providers/vagrant/installer.sh | 5 |
10 files changed, 116 insertions, 121 deletions
diff --git a/deployments/.env b/deployments/.env index c2630b85..b4740f9b 100644 --- a/deployments/.env +++ b/deployments/.env @@ -1,7 +1 @@ IMAGE_NAME=nexus3.onap.org:10003/onap/multicloud/k8s -CSAR_DIR=/opt/csar -KUBE_CONFIG_DIR=/opt/kubeconfig -DATABASE_TYPE=mongo -DATABASE_IP=172.19.0.2 -PLUGIN_IP=172.19.0.3 -PLUGINS_DIR=/opt/multicloud/k8s diff --git a/deployments/_functions.sh b/deployments/_functions.sh new file mode 100755 index 00000000..7942aed0 --- /dev/null +++ b/deployments/_functions.sh @@ -0,0 +1,36 @@ +#!/bin/bash +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright 2019 © Samsung Electronics Co., Ltd. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +function stop_all { + docker-compose kill + docker-compose down +} + +function start_mongo { + docker-compose up -d mongo + export DATABASE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aqf "name=mongo")) + export no_proxy=${no_proxy:-},${DATABASE_IP} + export NO_PROXY=${NO_PROXY:-},${DATABASE_IP} +} + +function generate_k8sconfig { +cat << EOF > k8sconfig.json +{ + "database-address": "${DATABASE_IP}", + "database-type": "mongo", + "plugin-dir": "plugins", + "service-port": "9015" +} +EOF +} + +function start_all { + docker-compose up -d +} diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml index c4faa537..3fa82fe5 100644 --- a/deployments/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -9,53 +9,30 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2' +version: '3' services: multicloud-k8s: image: ${IMAGE_NAME} - networks: - multicloud_net: - ipv4_address: ${PLUGIN_IP} build: context: ./ args: - HTTP_PROXY=${HTTP_PROXY} - HTTPS_PROXY=${HTTPS_PROXY} - NO_PROXY=${NO_PROXY} - ports: - - "8081:8081" environment: - - CSAR_DIR=${CSAR_DIR} - - KUBE_CONFIG_DIR=${KUBE_CONFIG_DIR} - - DATABASE_TYPE=${DATABASE_TYPE} - - DATABASE_IP=${DATABASE_IP} - - PLUGINS_DIR=${PLUGINS_DIR} - HTTP_PROXY=${HTTP_PROXY} - HTTPS_PROXY=${HTTPS_PROXY} - - NO_PROXY=${NO_PROXY},${DATABASE_IP} + - NO_PROXY=${NO_PROXY},mongo depends_on: - mongo - links: - - mongo + network_mode: host volumes: - /opt/csar:/opt/csar - - /opt/kubeconfig:/opt/kubeconfig + - ${PWD}/k8sconfig.json:/opt/multicloud/k8splugin/k8sconfig.json:ro mongo: image: mongo - networks: - multicloud_net: - ipv4_address: ${DATABASE_IP} environment: - HTTP_PROXY=${HTTP_PROXY} - HTTPS_PROXY=${HTTPS_PROXY} - NO_PROXY=${NO_PROXY} - -networks: - multicloud_net: - driver: bridge - ipam: - driver: default - config: - - - subnet: 172.19.0.0/27 diff --git a/deployments/start-dev.sh b/deployments/start-dev.sh new file mode 100755 index 00000000..c4b0cbc4 --- /dev/null +++ b/deployments/start-dev.sh @@ -0,0 +1,31 @@ +#!/bin/bash +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright 2019 © Samsung Electronics Co., Ltd. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +set -o errexit +set -o nounset +set -o pipefail + +source _functions.sh + +# +# Start k8splugin from compiled binaries to foreground. This is usable for development use. +# +source /etc/environment +k8s_path="$(git rev-parse --show-toplevel)" + +stop_all +start_mongo + +echo "Compiling source code" +pushd $k8s_path/src/k8splugin/ +generate_k8sconfig +make all +./k8plugin +popd diff --git a/deployments/start.sh b/deployments/start.sh index a57a6377..e7ff1334 100755 --- a/deployments/start.sh +++ b/deployments/start.sh @@ -8,33 +8,16 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +set -o errexit set -o nounset set -o pipefail -source /etc/environment +source _functions.sh -k8s_path="$(git rev-parse --show-toplevel)" -export GOPATH=$k8s_path -export GO111MODULE=on - -echo "Starting mongo services" -docker-compose kill -docker-compose up -d mongo -export DATABASE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aqf "name=mongo")) -export no_proxy=${no_proxy:-},$DATABASE_IP -export NO_PROXY=${NO_PROXY:-},$DATABASE_IP - -echo "Compiling source code" -pushd $k8s_path/src/k8splugin/ -cat << EOF > k8sconfig.json -{ - "database-address": "$DATABASE_IP", - "database-type": "mongo", - "plugin-dir": "$(pwd)/plugins", - "service-port": "9015", - "kube-config-dir": "$(pwd)/kubeconfigs" -} -EOF -make all -./k8plugin -popd +# +# Start k8splugin from containers. build.sh should be run prior this script. +# +stop_all +start_mongo +generate_k8sconfig +start_all diff --git a/docs/bare_metal_provisioning.rst b/docs/bare_metal_provisioning.rst index 2cb74afe..885ffea3 100644 --- a/docs/bare_metal_provisioning.rst +++ b/docs/bare_metal_provisioning.rst @@ -13,11 +13,11 @@ Bare-Metal Provisioning *********************** -The Kubernetes Reference Deployment, aka KRD, has been designed to be consumed -by Virtual Machines as well as Bare-Metal servers. The *vagrant/aio.sh* +The Kubernetes Deployment, aka KUD, has been designed to be consumed +by Virtual Machines as well as Bare-Metal servers. The *baremetal/aio.sh* script contains the bash instructions for provisioning an All-in-One Kubernetes deployment in a Bare-Metal server. This document lists the Hardware & Software -requirements and walkthrough the instructions that *vagrant/aio.sh* contains. +requirements and walkthrough the instructions that *baremetal/aio.sh* contains. Hardware Requirements ##################### @@ -37,36 +37,28 @@ Software Requirements - Ubuntu Server 16.04 LTS -vagrant/aio.sh -############## +baremetal/aio.sh +################ This bash script provides an automated process for deploying an All-in-One -Kubernetes cluster. Given that the ansible inventory file created by this -script doesn't specify any information about user and password, it's necessary -to execute this script as root user. +Kubernetes cluster. The following two instructions start the provisioning process. .. code-block:: bash $ sudo su - # wget -O - https://git.onap.org/multicloud/k8s/plain/vagrant/aio.sh | bash + # git clone https://git.onap.org/multicloud/k8s/ + # cd k8s/kud/hosting_providers/baremetal/ + # ./aio.sh In overall, this script can be summarized in three general phases: -1. Cloning and configuring the KRD project. +1. Generating Inventory. 2. Enabiling Nested-Virtualization. -3. Deploying KRD services. +3. Deploying KUD services. -**Cloning and configuring the KRD project** - -KRD requires multiple files(bash scripts and ansible playbooks) to operate. -Therefore, it's necessary to clone the *ONAP multicloud/k8s* project to get -access to the *vagrant* folder. - -.. code-block:: bash - - git clone https://git.onap.org/multicloud/k8s/ +**Inventory** Ansible works agains multiple systems, the way for selecting them is through the usage of the inventory. The inventory file is a static source for determining the @@ -102,17 +94,10 @@ an inventory file for addressing those tasks to localhost. kube-master EOL -KRD consumes kubespray_ for provisioning a Kubernetes base deployment. As part -of the deployment process, this tool downloads and configures *kubectl* binary. -This action conflicts with *andrewrothstein.kubectl* ansible role. Therefore is -necessary to remove those instructions from all the ansible playbooks. +KUD consumes kubespray_ for provisioning a Kubernetes base deployment. .. _kubespray: https://github.com/kubernetes-incubator/kubespray -.. code-block:: bash - - # sed -i '/andrewrothstein.kubectl/d' playbooks/configure-*.yml - Ansible uses SSH protocol for executing remote instructions. The following instructions create and register ssh keys which avoid the usage of passwords. @@ -124,7 +109,7 @@ instructions create and register ssh keys which avoid the usage of passwords. **Enabling Nested-Virtualization** -KRD installs Virtlet_ Kubernetes CRI for running Virtual Machine workloads. +KUD installs Virtlet_ Kubernetes CRI for running Virtual Machine workloads. Nested-virtualization gives the ability of running a Virtual Machine within another. The *node.sh* bash script contains the instructions for enabling Nested-Virtualization. @@ -135,14 +120,14 @@ Nested-Virtualization. # ./node.sh -**Deploying KRD services** +**Deploying KUD services** Finally, the KRD provisioning process can be started through the use of *installer.sh* bash script. The output of this script is collected in the -*krd_installer.log* file for future reference. +*kud_installer.log* file for future reference. .. code-block:: bash - # ./installer.sh | tee krd_installer.log + # ./installer.sh | tee kud_installer.log .. image:: ./img/installer_workflow.png diff --git a/docs/index.rst b/docs/index.rst index 173076b4..7a49b6d1 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -8,7 +8,7 @@ over cloud regions that support Kubernetes as the orchestrator. Kubernetes Reference Deployment =============================== -The Kubernetes Reference Deployment(KRD) provides an +The Kubernetes Reference Deployment(KUD) provides an automated mechanism to install and configure the Kubernetes services required for the MultiCloud Kubernetes plugin. @@ -18,6 +18,6 @@ Table of contents .. toctree:: :maxdepth: 3 - KRD Project Architecture <krd_architecture> - Bare Metal All-in-One KRD deployment<bare_metal_provisioning> + KUD Project Architecture <kud_architecture> + Bare Metal All-in-One KUD deployment<bare_metal_provisioning> Kubernetes MultiCloud API sample ommands <sampleCommands> diff --git a/docs/krd_architecture.rst b/docs/kud_architecture.rst index f188135e..f56b72a5 100644 --- a/docs/krd_architecture.rst +++ b/docs/kud_architecture.rst @@ -10,7 +10,7 @@ limitations under the License. **************** -KRD Architecture +KUD Architecture **************** This document explains the different components of the Kubernetes @@ -78,13 +78,7 @@ installer.sh ############ Main bash script that installs dependencies and executes ansible -playbooks for provisioning KRD components on external nodes. This -script uses some arguments for the additional installation of -components. For more information about its usage: - -.. code-block:: bash - - ./installer.sh -h +playbooks for provisioning KUD components on external nodes. inventory/ ########## @@ -116,17 +110,17 @@ This folder contains a set of Ansible playbooks which perform the tasks required for configuring services like Multus, Virtlet and/or OVN. -playbooks/configure-krd.yml +playbooks/configure-kud.yml *************************** This ansible playbook collects the common actions among all the -Kubernetes AddOns offered by the KRD. +Kubernetes AddOns offered by the KUD. -playbooks/krd-vars.yml +playbooks/kud-vars.yml ************************ This file centralizes the version numbers and source URLs used for -different components offered by the KRD. Bumping a version requires +different components offered by the KUD. Bumping a version requires extensive testing to ensure compatibility. setup.sh @@ -158,5 +152,5 @@ tests/ This folder contains the health check scripts that guarantee the proper installation/configuration of Kubernetes AddOns. Its execution is disabled by default. In order to enable it, it's -necessary to pass the *-t* argument to the **installer.sh** bash +necessary to export KUD_ENABLE_TESTS=true environment variable before calling the **installer.sh** bash script, usually through changing the arguments in the *Vagrantfile*. diff --git a/kud/hosting_providers/vagrant/aio.sh b/kud/hosting_providers/baremetal/aio.sh index 0d06cc65..416a1fef 100755 --- a/kud/hosting_providers/vagrant/aio.sh +++ b/kud/hosting_providers/baremetal/aio.sh @@ -12,15 +12,9 @@ set -o errexit set -o nounset set -o pipefail -if [[ $(whoami) != 'root' ]];then - echo "This bash script must be executed as root user" - exit 1 -fi - -echo "Cloning and configuring KUD project..." -rm -rf k8s -git clone https://git.onap.org/multicloud/k8s/ -cd k8s/kud/hosting_providers/baremetal/ +aio_dir=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd) +cd ${aio_dir}/../vagrant + cat <<EOL > inventory/hosts.ini [all] localhost @@ -47,14 +41,14 @@ localhost kube-node kube-master EOL -sed -i '/andrewrothstein.kubectl/d' ../../deployment_infra/playbooks/configure-*.yml + rm -f ~/.ssh/id_rsa echo -e "\n\n\n" | ssh-keygen -t rsa -N "" cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys chmod og-wx ~/.ssh/authorized_keys echo "Enabling nested-virtualization" -./node.sh +sudo ./node.sh -echo "Deploying KRD project" +echo "Deploying KUD project" ./installer.sh | tee kud_installer.log diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh index 277ff0ce..708e51e2 100755 --- a/kud/hosting_providers/vagrant/installer.sh +++ b/kud/hosting_providers/vagrant/installer.sh @@ -171,7 +171,7 @@ function install_plugin { pushd $kud_folder/../../../deployments sudo ./build.sh if [[ "${testing_enabled}" == "true" ]]; then - docker-compose up -d + sudo ./start.sh pushd $kud_tests for functional_test in plugin plugin_edgex; do bash ${functional_test}.sh @@ -199,6 +199,7 @@ function _print_kubernetes_info { echo "Admin password: secret" >> $k8s_info_file } +sudo -k # forgot sudo password if ! sudo -n "true"; then echo "" echo "passwordless sudo is needed for '$(id -nu)' user." @@ -221,7 +222,7 @@ kud_infra_folder=$kud_folder/../../deployment_infra export kud_inventory_folder=$kud_folder/inventory kud_inventory=$kud_inventory_folder/hosts.ini kud_playbooks=$kud_infra_folder/playbooks -kud_tests=$kud_folder/tests +kud_tests=$kud_folder/../../tests k8s_info_file=$kud_folder/k8s_info.log testing_enabled=${KUD_ENABLE_TESTS:-false} |