From ee3c66fd4673706f815ebb3b88379239f362e8df Mon Sep 17 00:00:00 2001 From: Thomas Fricke Date: Mon, 7 Dec 2015 10:35:21 +0100 Subject: [PATCH 1/7] fix messed up volume handling --- cluster/libvirt-coreos/util.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cluster/libvirt-coreos/util.sh b/cluster/libvirt-coreos/util.sh index e591f5ac3d2..bba4e79f61f 100644 --- a/cluster/libvirt-coreos/util.sh +++ b/cluster/libvirt-coreos/util.sh @@ -25,7 +25,7 @@ export LIBVIRT_DEFAULT_URI=qemu:///system export SERVICE_ACCOUNT_LOOKUP=${SERVICE_ACCOUNT_LOOKUP:-false} export ADMISSION_CONTROL=${ADMISSION_CONTROL:-NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota} readonly POOL=kubernetes -readonly POOL_PATH="$(cd $ROOT && pwd)/libvirt_storage_pool" +readonly POOL_PATH=/var/lib/libvirt/images/kubernetes # join # Concatenates the list elements with the delimiter passed as first parameter @@ -130,12 +130,11 @@ function initialize-pool { if [[ "$ROOT/coreos_production_qemu_image.img.bz2" -nt "$POOL_PATH/coreos_base.img" ]]; then bunzip2 -f -k "$ROOT/coreos_production_qemu_image.img.bz2" virsh vol-delete coreos_base.img --pool $POOL 2> /dev/null || true - mv "$ROOT/coreos_production_qemu_image.img" "$POOL_PATH/coreos_base.img" fi - # if ! virsh vol-list $POOL | grep -q coreos_base.img; then - # virsh vol-create-as $POOL coreos_base.img 10G --format qcow2 - # virsh vol-upload coreos_base.img "$ROOT/coreos_production_qemu_image.img" --pool $POOL - # fi + if ! virsh vol-list $POOL | grep -q coreos_base.img; then + virsh vol-create-as $POOL coreos_base.img 10G --format qcow2 + virsh vol-upload coreos_base.img "$ROOT/coreos_production_qemu_image.img" --pool $POOL + fi mkdir -p "$POOL_PATH/kubernetes" kube-push-internal From 66a5a8bc0aba5da3a2f8c167191ce6bb779ecbd1 Mon Sep 17 00:00:00 2001 From: Thomas Fricke Date: Mon, 7 Dec 2015 11:33:59 +0100 Subject: [PATCH 2/7] add debug check --- cluster/libvirt-coreos/util.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cluster/libvirt-coreos/util.sh b/cluster/libvirt-coreos/util.sh index bba4e79f61f..c4feeddd0f1 100644 --- a/cluster/libvirt-coreos/util.sh +++ b/cluster/libvirt-coreos/util.sh @@ -16,6 +16,8 @@ # A library of helper functions that each provider hosting Kubernetes must implement to use cluster/kube-*.sh scripts. +[ ! -z ${UTIL_SH_DEBUG+x} ] && set -x + KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. readonly ROOT=$(dirname "${BASH_SOURCE}") source "$ROOT/${KUBE_CONFIG_FILE:-"config-default.sh"}" From dd71deb7720a42af0e6dbee07ffb924f59cb743d Mon Sep 17 00:00:00 2001 From: Thomas Fricke Date: Mon, 7 Dec 2015 11:57:05 +0100 Subject: [PATCH 3/7] check for existing POOL_PATH --- cluster/libvirt-coreos/util.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cluster/libvirt-coreos/util.sh b/cluster/libvirt-coreos/util.sh index c4feeddd0f1..fa6a4bc7312 100644 --- a/cluster/libvirt-coreos/util.sh +++ b/cluster/libvirt-coreos/util.sh @@ -29,6 +29,8 @@ export ADMISSION_CONTROL=${ADMISSION_CONTROL:-NamespaceLifecycle,LimitRanger,Ser readonly POOL=kubernetes readonly POOL_PATH=/var/lib/libvirt/images/kubernetes +[ ! -d "${POOL_PATH}" ] && (echo "$POOL_PATH" does not exist ; exit 1 ) + # join # Concatenates the list elements with the delimiter passed as first parameter # From f1603a0213a5cbfee662cd1fdf81731ea93d44c9 Mon Sep 17 00:00:00 2001 From: Julian Strobl Date: Mon, 7 Dec 2015 16:35:02 +0100 Subject: [PATCH 4/7] take all ssh public keys into account For those of us, who do not use the default ssh naming scheme. --- cluster/libvirt-coreos/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/libvirt-coreos/util.sh b/cluster/libvirt-coreos/util.sh index fa6a4bc7312..80159a49b93 100644 --- a/cluster/libvirt-coreos/util.sh +++ b/cluster/libvirt-coreos/util.sh @@ -205,7 +205,7 @@ function kube-up { set_service_accounts initialize-network - readonly ssh_keys="$(cat ~/.ssh/id_*.pub | sed 's/^/ - /')" + readonly ssh_keys="$(cat ~/.ssh/*.pub | sed 's/^/ - /')" readonly kubernetes_dir="$POOL_PATH/kubernetes" local i From efce499bb9fd13a71c8f7a906ceea73a94c7c923 Mon Sep 17 00:00:00 2001 From: Thomas Fricke Date: Mon, 7 Dec 2015 12:09:30 +0100 Subject: [PATCH 5/7] add README.md --- cluster/libvirt-coreos/README.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 cluster/libvirt-coreos/README.md diff --git a/cluster/libvirt-coreos/README.md b/cluster/libvirt-coreos/README.md new file mode 100644 index 00000000000..dc458ec2b82 --- /dev/null +++ b/cluster/libvirt-coreos/README.md @@ -0,0 +1,28 @@ +# Kubernetes CoreOS cluster + +With this tutorial one creates a Kubernetes CoreOS cluster containing of one +master and three minions (workers) running on `192.168.10.1`-`192.168.10.4`. + +For working correctly you need to create the directory addressed as `POOL_PATH` in +`util.sh`: +``` +$ sudo mkdir /var/lib/libvirt/images/kubernetes +$ sudo chown -R $USER:$USER /var/lib/libvirt/images/kubernetes/ +``` + +Then we follow the instructions in the main `kubernetes` directory. + +For debugging set `export UTIL_SH_DEBUG=1`. +``` +$ export KUBERNETES_PROVIDER=libvirt-coreos +$ make release-skip-tests +$ ./cluster/kube-up.sh +``` + +To bring the cluster down again, execute: +``` +$ ./cluster/kube-down.sh +``` + +Have fun! + From 5ade59ff002714d4ebe771ba499abcc21d333ec1 Mon Sep 17 00:00:00 2001 From: Julian Strobl Date: Tue, 22 Dec 2015 10:55:19 +0100 Subject: [PATCH 6/7] add coreos image to .gitignore This image is downloaded during the cluster bring up. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 950e035bc7c..90ee1b51db4 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,6 @@ doc_tmp/ # Config directories created by gcloud and gsutil on Jenkins /.config/gcloud/ /.gsutil/ + +# CoreOS stuff +cluster/libvirt-coreos/coreos_*.img From 7f4848cf5ba2237776167593b32ead4e7e6df6d8 Mon Sep 17 00:00:00 2001 From: Julian Strobl Date: Fri, 8 Jan 2016 10:12:18 +0100 Subject: [PATCH 7/7] update generated docs Command executed: ./hack/update-generated-docs.sh --- cluster/libvirt-coreos/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cluster/libvirt-coreos/README.md b/cluster/libvirt-coreos/README.md index dc458ec2b82..7f705bbac6c 100644 --- a/cluster/libvirt-coreos/README.md +++ b/cluster/libvirt-coreos/README.md @@ -26,3 +26,6 @@ $ ./cluster/kube-down.sh Have fun! + + +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/libvirt-coreos/README.md?pixel)]()