From: Guo Ruijing Date: Wed, 18 Oct 2017 23:59:55 +0000 (-0400) Subject: seperate k8s basic installation and ovsdpdk installation X-Git-Tag: opnfv-6.0.0~74^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=eecc28839b7088f6bd6be9538db7ddc1986b369f;p=container4nfv.git seperate k8s basic installation and ovsdpdk installation Change-Id: I9ba3b52feebb7be6037d88f07f8c861ddbfe9bdf Signed-off-by: Guo Ruijing --- diff --git a/src/vagrant/k8s_kubeadm/README.md b/src/vagrant/README.md similarity index 100% rename from src/vagrant/k8s_kubeadm/README.md rename to src/vagrant/README.md diff --git a/src/vagrant/k8s_kubeadm/examples/yardstick.sh b/src/vagrant/k8s_kubeadm/examples/yardstick.sh deleted file mode 100755 index bc1eecf..0000000 --- a/src/vagrant/k8s_kubeadm/examples/yardstick.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -sudo docker run -tid -v /etc/kubernetes/admin.conf:/etc/yardstick/admin.conf --name yardstick opnfv/yardstick:latest -sudo docker exec -ti yardstick yardstick task start yardstick/samples/ping_k8s.yaml diff --git a/src/vagrant/k8s_kubeadm/Vagrantfile b/src/vagrant/kubeadm_basic/Vagrantfile similarity index 100% rename from src/vagrant/k8s_kubeadm/Vagrantfile rename to src/vagrant/kubeadm_basic/Vagrantfile diff --git a/src/vagrant/k8s_kubeadm/examples/nginx-app.sh b/src/vagrant/kubeadm_basic/examples/nginx-app.sh similarity index 100% rename from src/vagrant/k8s_kubeadm/examples/nginx-app.sh rename to src/vagrant/kubeadm_basic/examples/nginx-app.sh diff --git a/src/vagrant/k8s_kubeadm/examples/nginx-app.yaml b/src/vagrant/kubeadm_basic/examples/nginx-app.yaml similarity index 100% rename from src/vagrant/k8s_kubeadm/examples/nginx-app.yaml rename to src/vagrant/kubeadm_basic/examples/nginx-app.yaml diff --git a/src/vagrant/k8s_kubeadm/host_setup.sh b/src/vagrant/kubeadm_basic/host_setup.sh similarity index 100% rename from src/vagrant/k8s_kubeadm/host_setup.sh rename to src/vagrant/kubeadm_basic/host_setup.sh diff --git a/src/vagrant/k8s_kubeadm/master_setup.sh b/src/vagrant/kubeadm_basic/master_setup.sh similarity index 79% rename from src/vagrant/k8s_kubeadm/master_setup.sh rename to src/vagrant/kubeadm_basic/master_setup.sh index 2e56bee..34c5923 100644 --- a/src/vagrant/k8s_kubeadm/master_setup.sh +++ b/src/vagrant/kubeadm_basic/master_setup.sh @@ -6,8 +6,6 @@ sudo chown $(id -u):$(id -g) $HOME/admin.conf export KUBECONFIG=$HOME/admin.conf echo "export KUBECONFIG=$HOME/admin.conf" >> $HOME/.bash_profile -#kubectl apply -f http://git.io/weave-kube-1.6 +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 -kubectl apply -f /vagrant/ovsdpdk/kube_ovsdpdk.yml -kubectl apply -f /src/cni/ovsdpdk/kube_cniovsdpdk.yml diff --git a/src/vagrant/k8s_kubeadm/worker_setup.sh b/src/vagrant/kubeadm_basic/worker_setup.sh similarity index 100% rename from src/vagrant/k8s_kubeadm/worker_setup.sh rename to src/vagrant/kubeadm_basic/worker_setup.sh diff --git a/src/vagrant/kubeadm_ovsdpdk/Vagrantfile b/src/vagrant/kubeadm_ovsdpdk/Vagrantfile new file mode 100644 index 0000000..f1e7aac --- /dev/null +++ b/src/vagrant/kubeadm_ovsdpdk/Vagrantfile @@ -0,0 +1,34 @@ +$num_workers=3 + +Vagrant.require_version ">= 1.8.6" +Vagrant.configure("2") do |config| + + config.vm.box = "bento/ubuntu-16.04" + config.vm.synced_folder "../..", "/src" + config.vm.provision "shell", path: "host_setup.sh", privileged: false + config.vm.provider :virtualbox do |vb| + vb.customize ["modifyvm", :id, "--memory", 4096] + vb.customize ["modifyvm", :id, "--cpus", 4] + vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"] + vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.1", "1"] + vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.2", "1"] + vb.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"] + end + + config.vm.define "master" do |config| + config.vm.hostname = "master" + config.vm.provision "shell", path: "master_setup.sh", privileged: false + config.vm.network :private_network, ip: "192.168.1.10" + config.vm.network :private_network, ip: "10.244.0.10" + end + + (1 .. $num_workers).each do |i| + config.vm.define vm_name = "worker%d" % [i] do |config| + config.vm.hostname = vm_name + config.vm.provision "shell", path: "worker_setup.sh", privileged: false + config.vm.network :private_network, ip: "192.168.1.#{i+20}" + config.vm.network :private_network, ip: "10.244.0.#{i+20}" + end + end + +end diff --git a/src/vagrant/k8s_kubeadm/examples/virtio-user.yaml b/src/vagrant/kubeadm_ovsdpdk/examples/virtio-user.yaml similarity index 100% rename from src/vagrant/k8s_kubeadm/examples/virtio-user.yaml rename to src/vagrant/kubeadm_ovsdpdk/examples/virtio-user.yaml diff --git a/src/vagrant/kubeadm_ovsdpdk/host_setup.sh b/src/vagrant/kubeadm_ovsdpdk/host_setup.sh new file mode 100644 index 0000000..990df7f --- /dev/null +++ b/src/vagrant/kubeadm_ovsdpdk/host_setup.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +set -ex + +cat << EOF | sudo tee /etc/hosts +127.0.0.1 localhost +192.168.1.10 master +192.168.1.21 worker1 +192.168.1.22 worker2 +192.168.1.23 worker3 +EOF + +curl -s http://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - +cat <> $HOME/.bash_profile + +kubectl apply -f /vagrant/ovsdpdk/kube_ovsdpdk.yml +kubectl apply -f /src/cni/ovsdpdk/kube_cniovsdpdk.yml diff --git a/src/vagrant/k8s_kubeadm/ovsdpdk/Dockerfile b/src/vagrant/kubeadm_ovsdpdk/ovsdpdk/Dockerfile similarity index 100% rename from src/vagrant/k8s_kubeadm/ovsdpdk/Dockerfile rename to src/vagrant/kubeadm_ovsdpdk/ovsdpdk/Dockerfile diff --git a/src/vagrant/k8s_kubeadm/ovsdpdk/install.sh b/src/vagrant/kubeadm_ovsdpdk/ovsdpdk/install.sh similarity index 100% rename from src/vagrant/k8s_kubeadm/ovsdpdk/install.sh rename to src/vagrant/kubeadm_ovsdpdk/ovsdpdk/install.sh diff --git a/src/vagrant/k8s_kubeadm/ovsdpdk/kube_ovsdpdk.yml b/src/vagrant/kubeadm_ovsdpdk/ovsdpdk/kube_ovsdpdk.yml similarity index 100% rename from src/vagrant/k8s_kubeadm/ovsdpdk/kube_ovsdpdk.yml rename to src/vagrant/kubeadm_ovsdpdk/ovsdpdk/kube_ovsdpdk.yml diff --git a/src/vagrant/k8s_kubeadm/ovsdpdk/start.sh b/src/vagrant/kubeadm_ovsdpdk/ovsdpdk/start.sh similarity index 100% rename from src/vagrant/k8s_kubeadm/ovsdpdk/start.sh rename to src/vagrant/kubeadm_ovsdpdk/ovsdpdk/start.sh diff --git a/src/vagrant/kubeadm_ovsdpdk/worker_setup.sh b/src/vagrant/kubeadm_ovsdpdk/worker_setup.sh new file mode 100644 index 0000000..b68d800 --- /dev/null +++ b/src/vagrant/kubeadm_ovsdpdk/worker_setup.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +set -ex +sudo kubeadm join --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true