mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-09 03:57:41 +00:00
fix messed up volume handling
This commit is contained in:
parent
058896340d
commit
ee3c66fd46
@ -25,7 +25,7 @@ export LIBVIRT_DEFAULT_URI=qemu:///system
|
|||||||
export SERVICE_ACCOUNT_LOOKUP=${SERVICE_ACCOUNT_LOOKUP:-false}
|
export SERVICE_ACCOUNT_LOOKUP=${SERVICE_ACCOUNT_LOOKUP:-false}
|
||||||
export ADMISSION_CONTROL=${ADMISSION_CONTROL:-NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota}
|
export ADMISSION_CONTROL=${ADMISSION_CONTROL:-NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota}
|
||||||
readonly POOL=kubernetes
|
readonly POOL=kubernetes
|
||||||
readonly POOL_PATH="$(cd $ROOT && pwd)/libvirt_storage_pool"
|
readonly POOL_PATH=/var/lib/libvirt/images/kubernetes
|
||||||
|
|
||||||
# join <delim> <list...>
|
# join <delim> <list...>
|
||||||
# Concatenates the list elements with the delimiter passed as first parameter
|
# 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
|
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"
|
bunzip2 -f -k "$ROOT/coreos_production_qemu_image.img.bz2"
|
||||||
virsh vol-delete coreos_base.img --pool $POOL 2> /dev/null || true
|
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
|
fi
|
||||||
# if ! virsh vol-list $POOL | grep -q coreos_base.img; then
|
if ! virsh vol-list $POOL | grep -q coreos_base.img; then
|
||||||
# virsh vol-create-as $POOL coreos_base.img 10G --format qcow2
|
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
|
virsh vol-upload coreos_base.img "$ROOT/coreos_production_qemu_image.img" --pool $POOL
|
||||||
# fi
|
fi
|
||||||
|
|
||||||
mkdir -p "$POOL_PATH/kubernetes"
|
mkdir -p "$POOL_PATH/kubernetes"
|
||||||
kube-push-internal
|
kube-push-internal
|
||||||
|
Loading…
Reference in New Issue
Block a user