From 0737feb0aa28486cf18e57bb31fc4f0e08d6c04e Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Mon, 19 Nov 2018 18:16:26 +0800 Subject: [PATCH] enable multus & istio Change-Id: Ib43fa8d4b1494e0b48e295941af223647c161f92 Signed-off-by: Guo Ruijing --- ci/deploy.sh | 1 + src/vagrant/kubeadm/deploy.sh | 1 + .../{kubeadm_istio => kubeadm}/istio/bookinfo.sh | 0 .../istio/clean_bookinfo.sh | 0 .../{kubeadm_istio => kubeadm}/istio/deploy.sh | 2 +- src/vagrant/kubeadm/istio/istio.sh | 6 ++++ src/vagrant/kubeadm/worker_setup.sh | 2 +- src/vagrant/kubeadm_istio/Vagrantfile | 29 ------------------- src/vagrant/kubeadm_istio/deploy.sh | 12 -------- src/vagrant/kubeadm_istio/host_setup.sh | 29 ------------------- src/vagrant/kubeadm_istio/master_setup.sh | 33 ---------------------- src/vagrant/kubeadm_istio/worker_setup.sh | 4 --- 12 files changed, 10 insertions(+), 109 deletions(-) rename src/vagrant/{kubeadm_istio => kubeadm}/istio/bookinfo.sh (100%) rename src/vagrant/{kubeadm_istio => kubeadm}/istio/clean_bookinfo.sh (100%) rename src/vagrant/{kubeadm_istio => kubeadm}/istio/deploy.sh (98%) create mode 100755 src/vagrant/kubeadm/istio/istio.sh delete mode 100644 src/vagrant/kubeadm_istio/Vagrantfile delete mode 100755 src/vagrant/kubeadm_istio/deploy.sh delete mode 100644 src/vagrant/kubeadm_istio/host_setup.sh delete mode 100644 src/vagrant/kubeadm_istio/master_setup.sh delete mode 100644 src/vagrant/kubeadm_istio/worker_setup.sh diff --git a/ci/deploy.sh b/ci/deploy.sh index a5aec16..7ad725b 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -24,6 +24,7 @@ SCENARIOS=" kubeadm_virtlet kubeadm_ovsdpdk kubeadm_kata + kubeadm " for SCENARIO in $SCENARIOS; do diff --git a/src/vagrant/kubeadm/deploy.sh b/src/vagrant/kubeadm/deploy.sh index c727483..0a3ead2 100755 --- a/src/vagrant/kubeadm/deploy.sh +++ b/src/vagrant/kubeadm/deploy.sh @@ -7,3 +7,4 @@ cd $DIR ../cleanup.sh vagrant up vagrant ssh master -c "/vagrant/multus/multus.sh" +vagrant ssh master -c "/vagrant/istio/istio.sh" diff --git a/src/vagrant/kubeadm_istio/istio/bookinfo.sh b/src/vagrant/kubeadm/istio/bookinfo.sh similarity index 100% rename from src/vagrant/kubeadm_istio/istio/bookinfo.sh rename to src/vagrant/kubeadm/istio/bookinfo.sh diff --git a/src/vagrant/kubeadm_istio/istio/clean_bookinfo.sh b/src/vagrant/kubeadm/istio/clean_bookinfo.sh similarity index 100% rename from src/vagrant/kubeadm_istio/istio/clean_bookinfo.sh rename to src/vagrant/kubeadm/istio/clean_bookinfo.sh diff --git a/src/vagrant/kubeadm_istio/istio/deploy.sh b/src/vagrant/kubeadm/istio/deploy.sh similarity index 98% rename from src/vagrant/kubeadm_istio/istio/deploy.sh rename to src/vagrant/kubeadm/istio/deploy.sh index 4217807..e896580 100755 --- a/src/vagrant/kubeadm_istio/istio/deploy.sh +++ b/src/vagrant/kubeadm/istio/deploy.sh @@ -53,6 +53,6 @@ while [ $r -ne "0" ] do sleep 30 kubectl get pods -n istio-system - r=$(kubectl get pods -n istio-system | egrep -v 'NAME|Running' | wc -l) + r=$(kubectl get pods -n istio-system | egrep -v 'NAME|Running|Completed' | wc -l) done diff --git a/src/vagrant/kubeadm/istio/istio.sh b/src/vagrant/kubeadm/istio/istio.sh new file mode 100755 index 0000000..9c2caf6 --- /dev/null +++ b/src/vagrant/kubeadm/istio/istio.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +/vagrant/istio/deploy.sh +/vagrant/istio/bookinfo.sh +/vagrant/istio/clean_bookinfo.sh + diff --git a/src/vagrant/kubeadm/worker_setup.sh b/src/vagrant/kubeadm/worker_setup.sh index 858cafd..ac24698 100644 --- a/src/vagrant/kubeadm/worker_setup.sh +++ b/src/vagrant/kubeadm/worker_setup.sh @@ -2,5 +2,5 @@ set -ex -sleep 120 +sleep 300 sudo kubeadm join --discovery-token-unsafe-skip-ca-verification --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 diff --git a/src/vagrant/kubeadm_istio/Vagrantfile b/src/vagrant/kubeadm_istio/Vagrantfile deleted file mode 100644 index 9320074..0000000 --- a/src/vagrant/kubeadm_istio/Vagrantfile +++ /dev/null @@ -1,29 +0,0 @@ -$num_workers=2 - -Vagrant.require_version ">= 1.8.6" -Vagrant.configure("2") do |config| - - config.vm.box = "ceph/ubuntu-xenial" - config.vm.provider :libvirt do |libvirt| - libvirt.memory = 4096 - libvirt.cpus = 4 - end - - config.vm.synced_folder "../..", "/src" - config.vm.provision "shell", path: "host_setup.sh", privileged: false - - 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" - 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}" - end - end - -end diff --git a/src/vagrant/kubeadm_istio/deploy.sh b/src/vagrant/kubeadm_istio/deploy.sh deleted file mode 100755 index d947645..0000000 --- a/src/vagrant/kubeadm_istio/deploy.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -ex -DIR="$(dirname `readlink -f $0`)" - -cd $DIR -../cleanup.sh -vagrant up -vagrant ssh master -c "/vagrant/istio/deploy.sh" -vagrant ssh master -c "/vagrant/istio/bookinfo.sh" -vagrant ssh master -c "/vagrant/istio/clean_bookinfo.sh" - diff --git a/src/vagrant/kubeadm_istio/host_setup.sh b/src/vagrant/kubeadm_istio/host_setup.sh deleted file mode 100644 index 524a967..0000000 --- a/src/vagrant/kubeadm_istio/host_setup.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/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 - -sudo apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D -sudo apt-key adv -k 58118E89F3A912897C070ADBF76221572C52609D -cat << EOF | sudo tee /etc/apt/sources.list.d/docker.list -deb [arch=amd64] https://apt.dockerproject.org/repo ubuntu-xenial main -EOF - -curl -s http://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - -cat < /dev/null - r=$? -done -set -e - -# check if admissionregistration.k8s.io/v1beta1 API is enabled -kubectl api-versions | grep admissionregistration - diff --git a/src/vagrant/kubeadm_istio/worker_setup.sh b/src/vagrant/kubeadm_istio/worker_setup.sh deleted file mode 100644 index 74e4178..0000000 --- a/src/vagrant/kubeadm_istio/worker_setup.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -set -ex -sudo kubeadm join --discovery-token-unsafe-skip-ca-verification --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true -- 2.16.6