From 3d25fd3b0012cd1a91ea2e584d057435a8e4ab26 Mon Sep 17 00:00:00 2001 From: Lasse Dalegaard Date: Tue, 26 Sep 2017 18:43:50 +0200 Subject: [PATCH] Bump minimum rkt version to 1.27.0. The changes introduces in #3256 require at least rkt 1.27.0 because of a bug in the JSON output of `rkt status` in previous versions. Here we upgrade all references to rkt's minimum version, and also make travis and vagrant use this version when running tests. Finally we add a CHANGELOG notice. --- CHANGELOG.md | 5 +++++ client/driver/rkt.go | 2 +- scripts/travis-rkt.sh | 2 +- scripts/vagrant-linux-priv-rkt.sh | 2 +- website/source/docs/drivers/rkt.html.md | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2205d8e1c..01258dbf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## 0.7 (Unreleased) +__BACKWARDS INCOMPATIBILITIES:__ + * driver/rkt: Nomad now requires at least rkt version `1.27.0` for the rkt + driver to function. Please update your version of rkt to at least this + version. + IMPROVEMENTS: * core: Capability based ACL system with authoratative region, providing federated ACLs. diff --git a/client/driver/rkt.go b/client/driver/rkt.go index 986e1e1de..3ff513c2a 100644 --- a/client/driver/rkt.go +++ b/client/driver/rkt.go @@ -44,7 +44,7 @@ const ( // minRktVersion is the earliest supported version of rkt. rkt added support // for CPU and memory isolators in 0.14.0. We cannot support an earlier // version to maintain an uniform interface across all drivers - minRktVersion = "1.0.0" + minRktVersion = "1.27.0" // The key populated in the Node Attributes to indicate the presence of the // Rkt driver diff --git a/scripts/travis-rkt.sh b/scripts/travis-rkt.sh index 31bc6b6d7..2e06bf250 100755 --- a/scripts/travis-rkt.sh +++ b/scripts/travis-rkt.sh @@ -2,7 +2,7 @@ set -o errexit -VERSION=1.18.0 +VERSION=1.27.0 DOWNLOAD=https://github.com/coreos/rkt/releases/download/v${VERSION}/rkt-v${VERSION}.tar.gz function install_rkt() { diff --git a/scripts/vagrant-linux-priv-rkt.sh b/scripts/vagrant-linux-priv-rkt.sh index 2dc694540..07375133f 100755 --- a/scripts/vagrant-linux-priv-rkt.sh +++ b/scripts/vagrant-linux-priv-rkt.sh @@ -2,7 +2,7 @@ set -o errexit -VERSION=1.18.0 +VERSION=1.27.0 DOWNLOAD=https://github.com/coreos/rkt/releases/download/v${VERSION}/rkt-v${VERSION}.tar.gz function install_rkt() { diff --git a/website/source/docs/drivers/rkt.html.md b/website/source/docs/drivers/rkt.html.md index 803eff6b4..33d44f648 100644 --- a/website/source/docs/drivers/rkt.html.md +++ b/website/source/docs/drivers/rkt.html.md @@ -180,8 +180,8 @@ The `rkt` driver will set the following client attributes: * `driver.rkt` - Set to `1` if rkt is found on the host node. Nomad determines this by executing `rkt version` on the host and parsing the output -* `driver.rkt.version` - Version of `rkt` e.g.: `1.1.0`. Note that the minimum required - version is `1.0.0` +* `driver.rkt.version` - Version of `rkt` e.g.: `1.27.0`. Note that the minimum required + version is `1.27.0` * `driver.rkt.appc.version` - Version of `appc` that `rkt` is using e.g.: `1.1.0` Here is an example of using these properties in a job file: