From fd5e3d8f5d596c6fbd506e80b5e13ba8a97b704c Mon Sep 17 00:00:00 2001 From: Jonathan Boulle Date: Thu, 23 Jun 2016 15:50:06 +0200 Subject: [PATCH] version: bump to v0.8.5 --- CHANGELOG.md | 8 ++++++++ README.md | 4 ++-- VERSION | 2 +- ace/image_manifest_main.json.in | 4 ++-- ace/image_manifest_sidekick.json.in | 4 ++-- aci/file_test.go | 2 +- examples/image.json | 2 +- examples/pod_runtime.json | 2 +- pkg/acirenderer/acirenderer_test.go | 4 ++-- schema/image_test.go | 2 +- schema/lastditch/image_test.go | 6 +++--- schema/lastditch/pod_test.go | 6 +++--- schema/version.go | 2 +- spec/aci.md | 2 +- spec/pods.md | 2 +- 15 files changed, 30 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f02aa166..2079be1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +### v0.8.5 + +This is a minor release of the spec, containing one new backwards-compatible feature, and several tooling improvements: +- Added seccomp support, via the `os/linux/seccomp-remove-set` and `os/linux/seccomp-retain-set` isolator types. This includes `actool patch-manifest` support (#521) +- Moved to using `vendor/` directory with Godeps (#618) +- Added a port parameter to the discovery code, allowing users to perform discovery on arbitrary ports (#629) +- Changed schema code to fail more gracefully (return error instead of panic) if users inadvertently create a bad Isolator value (#633) + ### v0.8.4 This is a minor release of the spec; the only changes over 0.8.3 are that some of the Godeps are updated to use tagged releases. diff --git a/README.md b/README.md index d99987d2..ea14dc53 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ $ find /tmp/my-app/ $ cat /tmp/my-app/manifest { "acKind": "ImageManifest", - "acVersion": "0.8.4", + "acVersion": "0.8.5", "name": "my-app", "labels": [ {"name": "os", "value": "linux"}, @@ -115,7 +115,7 @@ and verify that the manifest was embedded appropriately $ tar xf /tmp/my-app.aci manifest -O | python -m json.tool { "acKind": "ImageManifest", - "acVersion": "0.8.4", + "acVersion": "0.8.5", "annotations": null, "app": { "environment": [], diff --git a/VERSION b/VERSION index d695db05..7ada0d30 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.8.4+git +0.8.5 diff --git a/ace/image_manifest_main.json.in b/ace/image_manifest_main.json.in index 33157eee..3a9e4a66 100644 --- a/ace/image_manifest_main.json.in +++ b/ace/image_manifest_main.json.in @@ -1,9 +1,9 @@ { - "acVersion": "0.8.4", + "acVersion": "0.8.5", "acKind": "ImageManifest", "name": "coreos.com/ace-validator-main", "labels": [ - { "name": "version", "value": "0.8.4" }, + { "name": "version", "value": "0.8.5" }, { "name": "os", "value": "@GOOS@" }, { "name": "arch", "value": "@GOARCH@" } ], diff --git a/ace/image_manifest_sidekick.json.in b/ace/image_manifest_sidekick.json.in index a69bbcf6..f66bdd3b 100644 --- a/ace/image_manifest_sidekick.json.in +++ b/ace/image_manifest_sidekick.json.in @@ -1,9 +1,9 @@ { - "acVersion": "0.8.4", + "acVersion": "0.8.5", "acKind": "ImageManifest", "name": "coreos.com/ace-validator-sidekick", "labels": [ - { "name": "version", "value": "0.8.4" }, + { "name": "version", "value": "0.8.5" }, { "name": "os", "value": "@GOOS@" }, { "name": "arch", "value": "@GOARCH@" } ], diff --git a/aci/file_test.go b/aci/file_test.go index fefd2797..6a6e37de 100644 --- a/aci/file_test.go +++ b/aci/file_test.go @@ -28,7 +28,7 @@ func newTestACI(usedotslash bool) (*os.File, error) { return nil, err } - manifestBody := `{"acKind":"ImageManifest","acVersion":"0.8.4","name":"example.com/app"}` + manifestBody := `{"acKind":"ImageManifest","acVersion":"0.8.5","name":"example.com/app"}` gw := gzip.NewWriter(tf) tw := tar.NewWriter(gw) diff --git a/examples/image.json b/examples/image.json index 9f811d5a..e7272deb 100644 --- a/examples/image.json +++ b/examples/image.json @@ -1,6 +1,6 @@ { "acKind": "ImageManifest", - "acVersion": "0.8.4", + "acVersion": "0.8.5", "name": "example.com/reduce-worker", "labels": [ { diff --git a/examples/pod_runtime.json b/examples/pod_runtime.json index 7d201351..5f9e6319 100644 --- a/examples/pod_runtime.json +++ b/examples/pod_runtime.json @@ -1,6 +1,6 @@ { "acKind": "PodManifest", - "acVersion": "0.8.4", + "acVersion": "0.8.5", "apps": [ { "name": "reduce-worker", diff --git a/pkg/acirenderer/acirenderer_test.go b/pkg/acirenderer/acirenderer_test.go index bb41911e..1fbc56e7 100644 --- a/pkg/acirenderer/acirenderer_test.go +++ b/pkg/acirenderer/acirenderer_test.go @@ -2149,7 +2149,7 @@ func TestEmptyRootFsDir(t *testing.T) { ` { "acKind": "ImageManifest", - "acVersion": "0.8.4", + "acVersion": "0.8.5", "name": "example.com/test_empty_rootfs" } `, @@ -2175,7 +2175,7 @@ func TestEmptyRootFsDir(t *testing.T) { ` { "acKind": "ImageManifest", - "acVersion": "0.8.4", + "acVersion": "0.8.5", "name": "example.com/test_empty_rootfs_pwl", "pathWhitelist": ["foo"] } diff --git a/schema/image_test.go b/schema/image_test.go index 40764904..6c95a5e3 100644 --- a/schema/image_test.go +++ b/schema/image_test.go @@ -20,7 +20,7 @@ func TestEmptyApp(t *testing.T) { imj := ` { "acKind": "ImageManifest", - "acVersion": "0.8.4", + "acVersion": "0.8.5", "name": "example.com/test" } ` diff --git a/schema/lastditch/image_test.go b/schema/lastditch/image_test.go index 9c02da80..68861cbf 100644 --- a/schema/lastditch/image_test.go +++ b/schema/lastditch/image_test.go @@ -77,7 +77,7 @@ func TestBogusImageManifest(t *testing.T) { bogus := []string{` { "acKind": "Bogus", - "acVersion": "0.8.4", + "acVersion": "0.8.5", } `, ` @@ -101,7 +101,7 @@ func imgJ(name, labels, extra string) string { { %s "acKind": "ImageManifest", - "acVersion": "0.8.4", + "acVersion": "0.8.5", "name": "%s", "labels": %s }`, extra, name, labels) @@ -110,7 +110,7 @@ func imgJ(name, labels, extra string) string { // imgI returns an image manifest instance with given name and labels func imgI(name string, labels Labels) ImageManifest { return ImageManifest{ - ACVersion: "0.8.4", + ACVersion: "0.8.5", ACKind: "ImageManifest", Name: name, Labels: labels, diff --git a/schema/lastditch/pod_test.go b/schema/lastditch/pod_test.go index 7c322f5c..9214eed7 100644 --- a/schema/lastditch/pod_test.go +++ b/schema/lastditch/pod_test.go @@ -109,7 +109,7 @@ func TestBogusPodManifest(t *testing.T) { ` { "acKind": "Bogus", - "acVersion": "0.8.4", + "acVersion": "0.8.5", } `, ` @@ -134,7 +134,7 @@ func podJ(apps, extra string) string { { %s "acKind": "PodManifest", - "acVersion": "0.8.4", + "acVersion": "0.8.5", "apps": %s }`, extra, apps) } @@ -142,7 +142,7 @@ func podJ(apps, extra string) string { // podI returns a pod manifest instance with given apps func podI(apps AppList) PodManifest { return PodManifest{ - ACVersion: "0.8.4", + ACVersion: "0.8.5", ACKind: "PodManifest", Apps: apps, } diff --git a/schema/version.go b/schema/version.go index 88ddaee7..494a8eb8 100644 --- a/schema/version.go +++ b/schema/version.go @@ -22,7 +22,7 @@ const ( // version represents the canonical version of the appc spec and tooling. // For now, the schema and tooling is coupled with the spec itself, so // this must be kept in sync with the VERSION file in the root of the repo. - version string = "0.8.4+git" + version string = "0.8.5" ) var ( diff --git a/spec/aci.md b/spec/aci.md index d3d0fd9a..ade96424 100644 --- a/spec/aci.md +++ b/spec/aci.md @@ -78,7 +78,7 @@ JSON Schema for the Image Manifest (app image manifest, ACI manifest), conformin ```json { "acKind": "ImageManifest", - "acVersion": "0.8.4", + "acVersion": "0.8.5", "name": "example.com/reduce-worker", "labels": [ { diff --git a/spec/pods.md b/spec/pods.md index 82dd0185..8410d40b 100644 --- a/spec/pods.md +++ b/spec/pods.md @@ -28,7 +28,7 @@ JSON Schema for the Pod Manifest, conforming to [RFC4627](https://tools.ietf.org ```json { - "acVersion": "0.8.4", + "acVersion": "0.8.5", "acKind": "PodManifest", "apps": [ {