diff --git a/projects/kubernetes/README.md b/projects/kubernetes/README.md index 0b8835b42..1d5c57b21 100644 --- a/projects/kubernetes/README.md +++ b/projects/kubernetes/README.md @@ -13,7 +13,7 @@ make build-vm-images Boot Kubernetes master OS image using `hyperkit` on macOS: ``` -./boot-master.sh +./boot.sh ``` Get IP address of the master: @@ -36,12 +36,12 @@ and try `kubectl get nodes` from within the master. To boot a node use: ``` -./boot-node.sh [ ...] +./boot.sh [ ...] ``` More specifically, to start 3 nodes use 3 separate shells and run this: ``` -shell1> ./boot-node.sh 1 --token bb38c6.117e66eabbbce07d 192.168.65.22:6443 -shell2> ./boot-node.sh 2 --token bb38c6.117e66eabbbce07d 192.168.65.22:6443 -shell3> ./boot-node.sh 3 --token bb38c6.117e66eabbbce07d 192.168.65.22:6443 +shell1> ./boot.sh 1 --token bb38c6.117e66eabbbce07d 192.168.65.22:6443 +shell2> ./boot.sh 2 --token bb38c6.117e66eabbbce07d 192.168.65.22:6443 +shell3> ./boot.sh 3 --token bb38c6.117e66eabbbce07d 192.168.65.22:6443 ``` diff --git a/projects/kubernetes/boot-master.sh b/projects/kubernetes/boot-master.sh deleted file mode 100755 index 067c87fce..000000000 --- a/projects/kubernetes/boot-master.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eu -disk="kube-master-disk.img" -set -x -rm -f "${disk}" -../../bin/linuxkit run -cpus 2 -mem 4096 -disk "${disk}",size=4G kube-master diff --git a/projects/kubernetes/boot-node.sh b/projects/kubernetes/boot-node.sh deleted file mode 100755 index 80f2cc7ac..000000000 --- a/projects/kubernetes/boot-node.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -eu -[ "${#@}" -gt 1 ] || (echo "Usage: ${0} " ; exit 1) -name="node-${1}" -shift -disk="kube-${name}-disk.img" -set -x -rm -f "${disk}" -../../bin/linuxkit run -cpus 2 -mem 4096 -disk "${disk}",size=4G -data "${*}" kube-node diff --git a/projects/kubernetes/boot.sh b/projects/kubernetes/boot.sh new file mode 100755 index 000000000..f76f9b3de --- /dev/null +++ b/projects/kubernetes/boot.sh @@ -0,0 +1,22 @@ +#!/bin/bash -eu +if [ $# -eq 0 ] ; then + img="kube-master" + disk="kube-master-disk.img" + data="" +elif [ $# -gt 1 ] ; then + img="kube-node" + name="node-${1}" + shift + disk="kube-${name}-disk.img" + data="${*}" +else + echo "Usage:" + echo " - Boot master:" + echo " ${0}" + echo " - Boot node:" + echo " ${0} " + exit 1 +fi +set -x +rm -f "${disk}" +../../bin/linuxkit run -cpus 2 -mem 4096 -disk "${disk}",size=4G -data "${data}" "${img}"