From 20effb017daceca1b694f7d5e333586ce5610008 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Wed, 4 May 2016 00:24:32 -0700 Subject: [PATCH] examples: Update CoreOS version to alpha 1032.0.0 --- Documentation/api.md | 2 +- Documentation/bootkube.md | 2 +- Documentation/kubernetes.md | 2 +- examples/README.md | 22 +++++++++---------- examples/groups/bootkube-install/install.json | 2 +- examples/groups/etcd-install/install.json | 2 +- examples/groups/k8s-install/install.json | 2 +- examples/profiles/bootkube-master.json | 4 ++-- examples/profiles/bootkube-worker.json | 4 ++-- examples/profiles/etcd-proxy.json | 4 ++-- examples/profiles/etcd.json | 4 ++-- examples/profiles/grub.json | 4 ++-- examples/profiles/install-reboot.json | 4 ++-- examples/profiles/install-shutdown.json | 4 ++-- examples/profiles/k8s-master-install.json | 4 ++-- examples/profiles/k8s-master.json | 4 ++-- examples/profiles/k8s-worker-install.json | 4 ++-- examples/profiles/k8s-worker.json | 4 ++-- examples/profiles/pxe-disk.json | 4 ++-- examples/profiles/pxe.json | 8 +++---- scripts/get-coreos | 4 ++-- scripts/libvirt | 3 +++ 22 files changed, 49 insertions(+), 48 deletions(-) diff --git a/Documentation/api.md b/Documentation/api.md index ae90e5b9..fb89ded4 100644 --- a/Documentation/api.md +++ b/Documentation/api.md @@ -198,7 +198,7 @@ If you need to serve static assets (e.g. kernel, initrd), `bootcfg` can serve ar bootcfg.foo/assets/ └── coreos - └── 962.0.0 + └── 1032.0.0 ├── coreos_production_pxe.vmlinuz └── coreos_production_pxe_image.cpio.gz └── 983.0.0 diff --git a/Documentation/bootkube.md b/Documentation/bootkube.md index 35325a9b..9df13e70 100644 --- a/Documentation/bootkube.md +++ b/Documentation/bootkube.md @@ -24,7 +24,7 @@ The examples statically assign IP addresses for client VMs on the `metal0` CNI b Download the CoreOS PXE image referenced in the target [profile](../examples/profiles). - ./scripts/get-coreos alpha 983.0.0 + ./scripts/get-coreos alpha 1032.0.0 Use the `bootkube` tool to render Kubernetes manifests and credentials into an output directory. diff --git a/Documentation/kubernetes.md b/Documentation/kubernetes.md index 2923509b..2734ea1e 100644 --- a/Documentation/kubernetes.md +++ b/Documentation/kubernetes.md @@ -23,7 +23,7 @@ The examples statically assign IP addresses for client VMs on the `metal0` CNI b Download the CoreOS PXE image assets referenced in the target [profile](../examples/profiles). - ./scripts/get-coreos alpha 983.0.0 + ./scripts/get-coreos alpha 1032.0.0 Generate a root CA and Kubernetes TLS assets for components (`admin`, `apiserver`, `worker`). diff --git a/examples/README.md b/examples/README.md index e39f2b10..fb0e63c1 100644 --- a/examples/README.md +++ b/examples/README.md @@ -5,15 +5,15 @@ These examples network boot and provision VMs into CoreOS clusters using `bootcf | Name | Description | CoreOS Version | FS | Docs | |------------|-------------|----------------|----|-----------| -| pxe | CoreOS via iPXE | alpha/983.0.0 | RAM | [reference](https://coreos.com/os/docs/latest/booting-with-ipxe.html) | -| grub | CoreOS via GRUB2 Netboot | alpha/983.0.0 | RAM | NA | -| pxe-disk | CoreOS via iPXE, with a root filesystem | alpha/983.0.0 | Disk | [reference](https://coreos.com/os/docs/latest/booting-with-ipxe.html) | -| etcd, etcd-docker | iPXE boot a 3 node etcd cluster and proxy | alpha/983.0.0 | RAM | [reference](https://coreos.com/os/docs/latest/cluster-architectures.html) | -| etcd-install | Install a 3-node etcd cluster to disk | alpha/983.0.0 | Disk | [reference](https://coreos.com/os/docs/latest/installing-to-disk.html) | -| k8s, k8s-docker | Kubernetes cluster with 1 master and 2 workers, TLS-authentication | alpha/983.0.0 | Disk | [tutorial](../Documentation/kubernetes.md) | -| k8s-install | Install a Kubernetes cluster to disk (1 master) | alpha/983.0.0 | Disk | [tutorial](../Documentation/kubernetes.md) | -| bootkube | iPXE boot a self-hosted Kubernetes cluster (with bootkube) | alpha/983.0.0 | Disk | [tutorial](../Documentation/bootkube.md) | -| bootkube-install | Install a self-hosted Kubernetes cluster (with bootkube) | alpha/983.0.0 | Disk | [tutorial](../Documentation/bootkube.md) | +| pxe | CoreOS via iPXE | alpha/1032.0.0 | RAM | [reference](https://coreos.com/os/docs/latest/booting-with-ipxe.html) | +| grub | CoreOS via GRUB2 Netboot | alpha/1032.0.0 | RAM | NA | +| pxe-disk | CoreOS via iPXE, with a root filesystem | alpha/1032.0.0 | Disk | [reference](https://coreos.com/os/docs/latest/booting-with-ipxe.html) | +| etcd, etcd-docker | iPXE boot a 3 node etcd cluster and proxy | alpha/1032.0.0 | RAM | [reference](https://coreos.com/os/docs/latest/cluster-architectures.html) | +| etcd-install | Install a 3-node etcd cluster to disk | alpha/1032.0.0 | Disk | [reference](https://coreos.com/os/docs/latest/installing-to-disk.html) | +| k8s, k8s-docker | Kubernetes cluster with 1 master and 2 workers, TLS-authentication | alpha/1032.0.0 | Disk | [tutorial](../Documentation/kubernetes.md) | +| k8s-install | Install a Kubernetes cluster to disk (1 master) | alpha/1032.0.0 | Disk | [tutorial](../Documentation/kubernetes.md) | +| bootkube | iPXE boot a self-hosted Kubernetes cluster (with bootkube) | alpha/1032.0.0 | Disk | [tutorial](../Documentation/bootkube.md) | +| bootkube-install | Install a self-hosted Kubernetes cluster (with bootkube) | alpha/1032.0.0 | Disk | [tutorial](../Documentation/bootkube.md) | ## Tutorials @@ -21,8 +21,8 @@ Get started running `bootcfg` on your Linux machine to network boot and provisio * [bootcfg with rkt](../Documentation/getting-started-rkt.md) * [bootcfg with Docker](../Documentation/getting-started-docker.md) -* [Kubernetes](../Documentation/kubernetes.md) -* [Self-hosted Kubernetes](../Documentation/bootkube.md) +* [Kubernetes v1.2.2](../Documentation/kubernetes.md) +* [Self-hosted Kubernetes](../Documentation/bootkube.md) (experimental) ## Experimental diff --git a/examples/groups/bootkube-install/install.json b/examples/groups/bootkube-install/install.json index 8995f806..fe76dd6a 100644 --- a/examples/groups/bootkube-install/install.json +++ b/examples/groups/bootkube-install/install.json @@ -4,7 +4,7 @@ "profile": "install-reboot", "metadata": { "coreos_channel": "alpha", - "coreos_version": "983.0.0", + "coreos_version": "1032.0.0", "ignition_endpoint": "http://bootcfg.foo:8080/ignition" } } diff --git a/examples/groups/etcd-install/install.json b/examples/groups/etcd-install/install.json index 8995f806..fe76dd6a 100644 --- a/examples/groups/etcd-install/install.json +++ b/examples/groups/etcd-install/install.json @@ -4,7 +4,7 @@ "profile": "install-reboot", "metadata": { "coreos_channel": "alpha", - "coreos_version": "983.0.0", + "coreos_version": "1032.0.0", "ignition_endpoint": "http://bootcfg.foo:8080/ignition" } } diff --git a/examples/groups/k8s-install/install.json b/examples/groups/k8s-install/install.json index 8995f806..fe76dd6a 100644 --- a/examples/groups/k8s-install/install.json +++ b/examples/groups/k8s-install/install.json @@ -4,7 +4,7 @@ "profile": "install-reboot", "metadata": { "coreos_channel": "alpha", - "coreos_version": "983.0.0", + "coreos_version": "1032.0.0", "ignition_endpoint": "http://bootcfg.foo:8080/ignition" } } diff --git a/examples/profiles/bootkube-master.json b/examples/profiles/bootkube-master.json index 87a20b26..52fc189d 100644 --- a/examples/profiles/bootkube-master.json +++ b/examples/profiles/bootkube-master.json @@ -2,8 +2,8 @@ "id": "bootkube-master", "name": "bootkube Ready Master", "boot": { - "kernel": "/assets/coreos/983.0.0/coreos_production_pxe.vmlinuz", - "initrd": ["/assets/coreos/983.0.0/coreos_production_pxe_image.cpio.gz"], + "kernel": "/assets/coreos/1032.0.0/coreos_production_pxe.vmlinuz", + "initrd": ["/assets/coreos/1032.0.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "root": "/dev/sda1", "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", diff --git a/examples/profiles/bootkube-worker.json b/examples/profiles/bootkube-worker.json index 1884f5e3..80ec1f31 100644 --- a/examples/profiles/bootkube-worker.json +++ b/examples/profiles/bootkube-worker.json @@ -2,8 +2,8 @@ "id": "bootkube-worker", "name": "bootkube Ready Worker", "boot": { - "kernel": "/assets/coreos/983.0.0/coreos_production_pxe.vmlinuz", - "initrd": ["/assets/coreos/983.0.0/coreos_production_pxe_image.cpio.gz"], + "kernel": "/assets/coreos/1032.0.0/coreos_production_pxe.vmlinuz", + "initrd": ["/assets/coreos/1032.0.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "root": "/dev/sda1", "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", diff --git a/examples/profiles/etcd-proxy.json b/examples/profiles/etcd-proxy.json index ad520ddb..496004e5 100644 --- a/examples/profiles/etcd-proxy.json +++ b/examples/profiles/etcd-proxy.json @@ -2,8 +2,8 @@ "id": "etcd-proxy", "name": "etcd-proxy", "boot": { - "kernel": "/assets/coreos/983.0.0/coreos_production_pxe.vmlinuz", - "initrd": ["/assets/coreos/983.0.0/coreos_production_pxe_image.cpio.gz"], + "kernel": "/assets/coreos/1032.0.0/coreos_production_pxe.vmlinuz", + "initrd": ["/assets/coreos/1032.0.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", "coreos.autologin": "", diff --git a/examples/profiles/etcd.json b/examples/profiles/etcd.json index ab0d9de1..77223073 100644 --- a/examples/profiles/etcd.json +++ b/examples/profiles/etcd.json @@ -2,8 +2,8 @@ "id": "etcd", "name": "etcd", "boot": { - "kernel": "/assets/coreos/983.0.0/coreos_production_pxe.vmlinuz", - "initrd": ["/assets/coreos/983.0.0/coreos_production_pxe_image.cpio.gz"], + "kernel": "/assets/coreos/1032.0.0/coreos_production_pxe.vmlinuz", + "initrd": ["/assets/coreos/1032.0.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", "coreos.autologin": "", diff --git a/examples/profiles/grub.json b/examples/profiles/grub.json index 273297dd..ac21a182 100644 --- a/examples/profiles/grub.json +++ b/examples/profiles/grub.json @@ -2,8 +2,8 @@ "id": "grub", "name": "CoreOS via GRUB2", "boot": { - "kernel": "(http;bootcfg.foo:8080)/assets/coreos/983.0.0/coreos_production_pxe.vmlinuz", - "initrd": ["(http;bootcfg.foo:8080)/assets/coreos/983.0.0/coreos_production_pxe_image.cpio.gz"], + "kernel": "(http;bootcfg.foo:8080)/assets/coreos/1032.0.0/coreos_production_pxe.vmlinuz", + "initrd": ["(http;bootcfg.foo:8080)/assets/coreos/1032.0.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "coreos.config.url": "http://bootcfg.foo:8080/ignition", "coreos.autologin": "", diff --git a/examples/profiles/install-reboot.json b/examples/profiles/install-reboot.json index 48c233e6..a0c8b86a 100644 --- a/examples/profiles/install-reboot.json +++ b/examples/profiles/install-reboot.json @@ -2,8 +2,8 @@ "id": "install-reboot", "name": "Install CoreOS and Reboot", "boot": { - "kernel": "/assets/coreos/983.0.0/coreos_production_pxe.vmlinuz", - "initrd": ["/assets/coreos/983.0.0/coreos_production_pxe_image.cpio.gz"], + "kernel": "/assets/coreos/1032.0.0/coreos_production_pxe.vmlinuz", + "initrd": ["/assets/coreos/1032.0.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", "coreos.autologin": "", diff --git a/examples/profiles/install-shutdown.json b/examples/profiles/install-shutdown.json index d7ef1cff..a339b6c8 100644 --- a/examples/profiles/install-shutdown.json +++ b/examples/profiles/install-shutdown.json @@ -2,8 +2,8 @@ "id": "install-shutdown", "name": "Install CoreOS and Shutdown", "boot": { - "kernel": "/assets/coreos/983.0.0/coreos_production_pxe.vmlinuz", - "initrd": ["/assets/coreos/983.0.0/coreos_production_pxe_image.cpio.gz"], + "kernel": "/assets/coreos/1032.0.0/coreos_production_pxe.vmlinuz", + "initrd": ["/assets/coreos/1032.0.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", "coreos.autologin": "", diff --git a/examples/profiles/k8s-master-install.json b/examples/profiles/k8s-master-install.json index f5c50dd6..7973024a 100644 --- a/examples/profiles/k8s-master-install.json +++ b/examples/profiles/k8s-master-install.json @@ -2,8 +2,8 @@ "id": "k8s-master-install", "name": "Kubernetes Master Install", "boot": { - "kernel": "/assets/coreos/983.0.0/coreos_production_pxe.vmlinuz", - "initrd": ["/assets/coreos/983.0.0/coreos_production_pxe_image.cpio.gz"], + "kernel": "/assets/coreos/1032.0.0/coreos_production_pxe.vmlinuz", + "initrd": ["/assets/coreos/1032.0.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", "coreos.autologin": "", diff --git a/examples/profiles/k8s-master.json b/examples/profiles/k8s-master.json index 3af4468c..271652ba 100644 --- a/examples/profiles/k8s-master.json +++ b/examples/profiles/k8s-master.json @@ -2,8 +2,8 @@ "id": "k8s-master", "name": "Kubernetes Master", "boot": { - "kernel": "/assets/coreos/983.0.0/coreos_production_pxe.vmlinuz", - "initrd": ["/assets/coreos/983.0.0/coreos_production_pxe_image.cpio.gz"], + "kernel": "/assets/coreos/1032.0.0/coreos_production_pxe.vmlinuz", + "initrd": ["/assets/coreos/1032.0.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "root": "/dev/sda1", "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", diff --git a/examples/profiles/k8s-worker-install.json b/examples/profiles/k8s-worker-install.json index 9223d1ae..8c9b32d0 100644 --- a/examples/profiles/k8s-worker-install.json +++ b/examples/profiles/k8s-worker-install.json @@ -2,8 +2,8 @@ "id": "k8s-worker-install", "name": "Kubernetes Worker Install", "boot": { - "kernel": "/assets/coreos/983.0.0/coreos_production_pxe.vmlinuz", - "initrd": ["/assets/coreos/983.0.0/coreos_production_pxe_image.cpio.gz"], + "kernel": "/assets/coreos/1032.0.0/coreos_production_pxe.vmlinuz", + "initrd": ["/assets/coreos/1032.0.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", "coreos.autologin": "", diff --git a/examples/profiles/k8s-worker.json b/examples/profiles/k8s-worker.json index f2f522fb..18aae115 100644 --- a/examples/profiles/k8s-worker.json +++ b/examples/profiles/k8s-worker.json @@ -2,8 +2,8 @@ "id": "k8s-worker", "name": "Kubernetes Worker", "boot": { - "kernel": "/assets/coreos/983.0.0/coreos_production_pxe.vmlinuz", - "initrd": ["/assets/coreos/983.0.0/coreos_production_pxe_image.cpio.gz"], + "kernel": "/assets/coreos/1032.0.0/coreos_production_pxe.vmlinuz", + "initrd": ["/assets/coreos/1032.0.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "root": "/dev/sda1", "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", diff --git a/examples/profiles/pxe-disk.json b/examples/profiles/pxe-disk.json index e342fa1c..98435b6d 100644 --- a/examples/profiles/pxe-disk.json +++ b/examples/profiles/pxe-disk.json @@ -2,8 +2,8 @@ "id": "pxe-disk", "name": "CoreOS with SSH", "boot": { - "kernel": "/assets/coreos/983.0.0/coreos_production_pxe.vmlinuz", - "initrd": ["/assets/coreos/983.0.0/coreos_production_pxe_image.cpio.gz"], + "kernel": "/assets/coreos/1032.0.0/coreos_production_pxe.vmlinuz", + "initrd": ["/assets/coreos/1032.0.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "root": "/dev/sda1", "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", diff --git a/examples/profiles/pxe.json b/examples/profiles/pxe.json index 71e19a9b..62a5e83a 100644 --- a/examples/profiles/pxe.json +++ b/examples/profiles/pxe.json @@ -3,13 +3,11 @@ "name": "CoreOS with SSH", "ignition_id": "ssh.yaml", "boot": { - "kernel": "/assets/coreos/983.0.0/coreos_production_pxe.vmlinuz", - "initrd": [ - "/assets/coreos/983.0.0/coreos_production_pxe_image.cpio.gz" - ], + "kernel": "/assets/coreos/1032.0.0/coreos_production_pxe.vmlinuz", + "initrd": ["/assets/coreos/1032.0.0/coreos_production_pxe_image.cpio.gz"], "cmdline": { "coreos.autologin": "", - "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}\u0026mac=${net0/mac:hexhyp}", + "coreos.config.url": "http://bootcfg.foo:8080/ignition?uuid=${uuid}&mac=${net0/mac:hexhyp}", "coreos.first_boot": "" } } diff --git a/scripts/get-coreos b/scripts/get-coreos index 43b5ba49..72b3a338 100755 --- a/scripts/get-coreos +++ b/scripts/get-coreos @@ -3,9 +3,9 @@ # USAGE: ./scripts/get-coreos channel version CHANNEL=${1:-"alpha"} -VERSION=${2:-"983.0.0"} +VERSION=${2:-"1032.0.0"} DEST=${PWD}/examples/assets/coreos/$VERSION -BASE_URL=http://$CHANNEL.release.core-os.net/amd64-usr/$VERSION +BASE_URL=https://$CHANNEL.release.core-os.net/amd64-usr/$VERSION # check channel/version exist based on the header response curl -s -I $BASE_URL/coreos_production_pxe.vmlinuz | awk '/200/ {found++} /301/ {found++} END { if (found<1) { print "Channel or Version not found"; exit 1 }}' diff --git a/scripts/libvirt b/scripts/libvirt index ffa963a6..12c34c8d 100755 --- a/scripts/libvirt +++ b/scripts/libvirt @@ -75,6 +75,9 @@ function poweroff { } function destroy { + for node in ${nodes[@]}; do + virsh destroy $node + done for node in ${nodes[@]}; do virsh undefine $node done