diff options
| -rw-r--r-- | docs/release/userguide/index.rst | 1 | ||||
| -rw-r--r-- | docs/release/userguide/kata.rst | 17 | ||||
| -rw-r--r-- | src/vagrant/kubeadm_basic/host_setup.sh | 6 | ||||
| -rw-r--r-- | src/vagrant/kubeadm_basic/master_setup.sh | 9 | ||||
| -rw-r--r-- | src/vagrant/kubeadm_basic/worker_setup.sh | 2 | ||||
| -rwxr-xr-x | src/vagrant/kubeadm_onap/onap_setup.sh | 2 |
6 files changed, 26 insertions, 11 deletions
diff --git a/docs/release/userguide/index.rst b/docs/release/userguide/index.rst index b2a65ee..cf244e1 100644 --- a/docs/release/userguide/index.rst +++ b/docs/release/userguide/index.rst @@ -21,3 +21,4 @@ Container4NFV User Guide ovsdpdk.rst virlet.rst clearwater-project.rst + kata.rst diff --git a/docs/release/userguide/kata.rst b/docs/release/userguide/kata.rst new file mode 100644 index 0000000..c7e6340 --- /dev/null +++ b/docs/release/userguide/kata.rst @@ -0,0 +1,17 @@ +Kata Containers implementation for OPNFV +======================================== + +Kata Containers is a new open source project building extremely lightweight virtual machines that seamlessly plug into the containers ecosystem. + +CONTAINER4NFV setup a Kubernetes cluster on VMs running with Vagrant and kubeadm. + +kubeadm assumes you have a set of machines (virtual or bare metal) that are up and running. In this way we can get a cluster with one master node and 2 workers (default). If you want to increase the number of workers nodes, please check the Vagrantfile inside the project. + +About Kata Containers +--------------------- + +[Kata Containers](https://katacontainers.io/) is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs. + +The Kata Containers project will initially comprise six components, including the Agent, Runtime, Proxy, Shim, Kernel and packaging of QEMU 2.9. It is designed to be architecture agnostic, run on multiple hypervisors and be compatible with the OCI specification for Docker containers and CRI for Kubernetes. + +Kata Containers combines technology from Intel Clear Containers and Hyper runV. The code is hosted on Github under the Apache 2 license and the project is managed by the OpenStack Foundation. diff --git a/src/vagrant/kubeadm_basic/host_setup.sh b/src/vagrant/kubeadm_basic/host_setup.sh index b86a618..c1a23eb 100644 --- a/src/vagrant/kubeadm_basic/host_setup.sh +++ b/src/vagrant/kubeadm_basic/host_setup.sh @@ -21,9 +21,9 @@ cat <<EOF | sudo tee /etc/apt/sources.list.d/kubernetes.list deb http://apt.kubernetes.io/ kubernetes-xenial main EOF sudo apt-get update -sudo apt-get install -y --allow-downgrades docker-engine=1.12.6-0~ubuntu-xenial kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00 +sudo apt-get install -y --allow-downgrades docker-engine=1.12.6-0~ubuntu-xenial kubelet=1.9.1-00 kubeadm=1.9.1-00 kubectl=1.9.1-00 kubernetes-cni=0.6.0-00 -sudo rm -rf /var/lib/kubelet -sudo systemctl stop kubelet +sudo swapoff -a sudo systemctl daemon-reload +sudo systemctl stop kubelet sudo systemctl start kubelet diff --git a/src/vagrant/kubeadm_basic/master_setup.sh b/src/vagrant/kubeadm_basic/master_setup.sh index 7fa2ad8..b181582 100644 --- a/src/vagrant/kubeadm_basic/master_setup.sh +++ b/src/vagrant/kubeadm_basic/master_setup.sh @@ -3,11 +3,8 @@ set -ex sudo kubeadm init --apiserver-advertise-address=192.168.1.10 --service-cidr=10.96.0.0/16 --pod-network-cidr=10.32.0.0/12 --token 8c5adc.1cec8dbf339093f0 -sudo cp /etc/kubernetes/admin.conf $HOME/ -sudo chown $(id -u):$(id -g) $HOME/admin.conf -export KUBECONFIG=$HOME/admin.conf -echo "export KUBECONFIG=$HOME/admin.conf" >> $HOME/.bash_profile +mkdir ~/.kube +sudo cp /etc/kubernetes/admin.conf $HOME/.kube/config +sudo chown $(id -u):$(id -g) $HOME/.kube/config kubectl apply -f http://git.io/weave-kube-1.6 -#kubectl apply -f http://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml -#kubectl apply -f http://docs.projectcalico.org/v2.1/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml diff --git a/src/vagrant/kubeadm_basic/worker_setup.sh b/src/vagrant/kubeadm_basic/worker_setup.sh index b68d800..74e4178 100644 --- a/src/vagrant/kubeadm_basic/worker_setup.sh +++ b/src/vagrant/kubeadm_basic/worker_setup.sh @@ -1,4 +1,4 @@ #!/bin/bash set -ex -sudo kubeadm join --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true +sudo kubeadm join --discovery-token-unsafe-skip-ca-verification --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true diff --git a/src/vagrant/kubeadm_onap/onap_setup.sh b/src/vagrant/kubeadm_onap/onap_setup.sh index 3e1d9b4..b876580 100755 --- a/src/vagrant/kubeadm_onap/onap_setup.sh +++ b/src/vagrant/kubeadm_onap/onap_setup.sh @@ -14,7 +14,7 @@ done curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash git clone http://gerrit.onap.org/r/oom -cd oom; git checkout release-1.1.0 +cd oom; git checkout amsterdam source /vagrant/openstack/openrc cat <<EOF | tee ~/oom/kubernetes/config/onap-parameters.yaml OPENSTACK_UBUNTU_14_IMAGE: "ubuntu1404" |