From 6b19a2ad3ff84ae82ed865d8ab64597b449595bb Mon Sep 17 00:00:00 2001 From: Jacob Blain Christen Date: Thu, 10 Oct 2019 11:01:46 -0700 Subject: [PATCH] Update README and Packer templates to v0.4.0 --- README.md | 6 +++--- install.sh | 2 +- package/packer/aws/template-arm64.json | 4 ++-- package/packer/aws/template.json | 4 ++-- package/packer/gcp/template.json | 4 ++-- package/packer/vagrant/vagrant.json | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index b896e59e..5efd7ed2 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ This script will run the same installation as the ISO but is a bit more raw and ``` Usage: ./install.sh [--force-efi] [--debug] [--tty TTY] [--poweroff] [--takeover] [--no-format] [--config https://.../config.yaml] DEVICE ISO_URL -Example: ./install.sh /dev/vda https://github.com/rancher/k3os/releases/download/v0.3.0/k3os.iso +Example: ./install.sh /dev/vda https://github.com/rancher/k3os/releases/download/v0.4.0/k3os.iso DEVICE must be the disk that will be partitioned (/dev/vda). If you are using --no-format it should be the device of the K3OS_STATE partition (/dev/vda2) @@ -158,7 +158,7 @@ and run with the `--takeover` flag. This will install k3OS to the current root In order for this to work a couple of assumptions are made. First the root (/) is assumed to be a ext4 partition. Also it is assumed that grub2 is installed and looking for the configuration at `/boot/grub/grub.cfg`. When running `--takeover` ensure that you also set `--no-format` and DEVICE must be set to the partition of `/`. Refer to the AWS packer template to see this mode in action, below is any example of how to run a takeover installation. ``` -./install.sh --takeover --debug --tty ttyS0 --config /tmp/config.yaml --no-format /dev/vda1 https://github.com/rancher/k3os/releases/download/v0.3.0/k3os.iso +./install.sh --takeover --debug --tty ttyS0 --config /tmp/config.yaml --no-format /dev/vda1 https://github.com/rancher/k3os/releases/download/v0.4.0/k3os.iso ``` ### ARM Overlay Installation @@ -166,7 +166,7 @@ In order for this to work a couple of assumptions are made. First the root (/) If you have a custom ARMv7 or ARM64 device you can easily use an existing bootable ARM image to create an k3OS setup. All you must do is boot the ARM system and then extract `k3os-rootfs-arm.tar.gz` to the root (stripping one path, look at the example below) and then place your cloud-config at `/k3os/system/config.yaml`. For example: ``` -curl -sfL https://github.com/rancher/k3os/releases/download/v0.3.0/k3os-rootfs-arm.tar.gz | tar zxvf - --strip-components=1 -C / +curl -sfL https://github.com/rancher/k3os/releases/download/v0.4.0/k3os-rootfs-arm.tar.gz | tar zxvf - --strip-components=1 -C / cp myconfig.yaml /k3os/system/config.yaml sync reboot -f diff --git a/install.sh b/install.sh index afc5f91c..dc6dd253 100755 --- a/install.sh +++ b/install.sh @@ -45,7 +45,7 @@ usage() { echo "Usage: $PROG [--force-efi] [--debug] [--tty TTY] [--poweroff] [--takeover] [--no-format] [--config https://.../config.yaml] DEVICE ISO_URL" echo "" - echo "Example: $PROG /dev/vda https://github.com/rancher/k3os/releases/download/v0.3.0/k3os.iso" + echo "Example: $PROG /dev/vda https://github.com/rancher/k3os/releases/download/v0.4.0/k3os.iso" echo "" echo "DEVICE must be the disk that will be partitioned (/dev/vda). If you are using --no-format it should be the device of the K3OS_STATE partition (/dev/vda2)" echo "" diff --git a/package/packer/aws/template-arm64.json b/package/packer/aws/template-arm64.json index aad18d4c..4068f170 100644 --- a/package/packer/aws/template-arm64.json +++ b/package/packer/aws/template-arm64.json @@ -3,8 +3,8 @@ "aws_access_key": "{{env `AWS_ACCESS_KEY_ID`}}", "aws_secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}", "region": "us-east-1", - "k3os_version": "v0.3.0", - "iso_url": "https://github.com/rancher/k3os/releases/download/v0.3.0/k3os-arm64.iso" + "k3os_version": "v0.4.0", + "iso_url": "https://github.com/rancher/k3os/releases/download/v0.4.0/k3os-arm64.iso" }, "builders": [{ "type": "amazon-ebs", diff --git a/package/packer/aws/template.json b/package/packer/aws/template.json index bb23ac8e..45b2a3e3 100644 --- a/package/packer/aws/template.json +++ b/package/packer/aws/template.json @@ -3,8 +3,8 @@ "aws_access_key": "{{env `AWS_ACCESS_KEY_ID`}}", "aws_secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}", "region": "us-east-1", - "k3os_version": "v0.3.0", - "iso_url": "https://github.com/rancher/k3os/releases/download/v0.3.0/k3os-amd64.iso" + "k3os_version": "v0.4.0", + "iso_url": "https://github.com/rancher/k3os/releases/download/v0.4.0/k3os-amd64.iso" }, "builders": [{ "type": "amazon-ebs", diff --git a/package/packer/gcp/template.json b/package/packer/gcp/template.json index 48fc84a4..f846880b 100644 --- a/package/packer/gcp/template.json +++ b/package/packer/gcp/template.json @@ -2,8 +2,8 @@ "variables": { "gcp_project_id": "{{env `GCP_PROJECT_ID`}}", "region": "us-east1-d", - "k3os_version": "v0.3.0", - "iso_url": "https://github.com/rancher/k3os/releases/download/v0.3.0/k3os-amd64.iso" + "k3os_version": "v0.4.0", + "iso_url": "https://github.com/rancher/k3os/releases/download/v0.4.0/k3os-amd64.iso" }, "builders": [ { diff --git a/package/packer/vagrant/vagrant.json b/package/packer/vagrant/vagrant.json index a5a7b831..d770369b 100644 --- a/package/packer/vagrant/vagrant.json +++ b/package/packer/vagrant/vagrant.json @@ -1,7 +1,7 @@ { "variables": { "password": "rancher", - "version": "v0.3.0", + "version": "v0.4.0", "checksum": "e3a0b0f22ac492fc76363a0319c733f392c6ce829825f3dc76cd72a45da384ca" }, "builders": [{