Merge pull request #2393 from justincormack/kube-iso

Use ISO for kubernetes
This commit is contained in:
Justin Cormack 2017-08-10 11:17:27 +01:00 committed by GitHub
commit d2b7782419
2 changed files with 19 additions and 9 deletions

View File

@ -10,15 +10,15 @@ push-container-images:
$(MAKE) -C kubernetes push $(MAKE) -C kubernetes push
$(MAKE) -C image-cache push $(MAKE) -C image-cache push
build-vm-images: kube-master-initrd.img kube-node-initrd.img build-vm-images: kube-master.iso kube-node.iso
kube-master-initrd.img: kube-master.yml kube-master.iso: kube-master.yml
../../bin/moby build -name kube-master kube-master.yml moby build -name kube-master -output iso-efi -output iso-bios kube-master.yml
kube-node-initrd.img: kube-node.yml kube-node.iso: kube-node.yml
../../bin/moby build -name kube-node kube-node.yml moby build -name kube-node -output iso-efi -output iso-bios kube-node.yml
clean: clean:
rm -f -r \ rm -f -r \
kube-*-kernel kube-*-cmdline kube-*-state kube-*-initrd.img kube-*-kernel kube-*-cmdline kube-*-state kube-*-initrd.img *.iso
$(MAKE) -C image-cache clean $(MAKE) -C image-cache clean

View File

@ -1,10 +1,20 @@
#!/bin/bash -eu #!/bin/sh
set -e
: ${KUBE_PORT_BASE:=2222} : ${KUBE_PORT_BASE:=2222}
: ${KUBE_VCPUS:=2} : ${KUBE_VCPUS:=2}
: ${KUBE_MEM:=4096} : ${KUBE_MEM:=1024}
: ${KUBE_DISK:=4G} : ${KUBE_DISK:=4G}
: ${KUBE_NETWORKING:=default} : ${KUBE_NETWORKING:=default}
: ${KUBE_RUN_ARGS:=} : ${KUBE_RUN_ARGS:=}
: ${KUBE_EFI:=}
[ "$(uname -s)" = "Darwin" ] && KUBE_EFI=1
suffix=".iso"
[ -n "${KUBE_EFI}" ] && suffix="-efi.iso" && uefi="--uefi"
if [ $# -eq 0 ] ; then if [ $# -eq 0 ] ; then
img="kube-master" img="kube-master"
data="" data=""
@ -36,4 +46,4 @@ else
fi fi
set -x set -x
rm -rf "${state}" rm -rf "${state}"
../../bin/linuxkit run ${KUBE_RUN_ARGS} -networking ${KUBE_NETWORKING} -cpus ${KUBE_VCPUS} -mem ${KUBE_MEM} -state "${state}" -disk size=${KUBE_DISK} -data "${data}" "${img}" linuxkit run ${KUBE_RUN_ARGS} -networking ${KUBE_NETWORKING} -cpus ${KUBE_VCPUS} -mem ${KUBE_MEM} -state "${state}" -disk size=${KUBE_DISK} -data "${data}" ${uefi} "${img}${suffix}"