diff --git a/CHANGELOG.md b/CHANGELOG.md index 33b847a7..d830907b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +### v0.8.8 + +This is a minor release of the spec which includes some new small features intended to simplify implementation of the Kubernetes CRI (Container Runtime Interface) + +Spec additions: +- Two new isolators: 'os/linux/oom-score-adj' and 'os/linux/cpu-shares' (#658, #661) +- UserAnnotations and UserLabels for both Pods and Apps: key-vaue pairs exclusively for end-user use (#663) +- The ability to specify a complete ExposedPort+PodPort and Volume+Mount, instead of matching by name (#656) + +Bugfixes: +- Fixed a `go vet` failure in discovery/http.go + + ### v0.8.7 This is a minor but significant release of the spec with several new features, one notable bugfix, and some changes to the tooling codebase. diff --git a/README.md b/README.md index c5518eb9..ad2f2277 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.7", + "acVersion": "0.8.8", "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.7", + "acVersion": "0.8.8", "annotations": null, "app": { "environment": [], diff --git a/VERSION b/VERSION index bc5624c6..6201b5f7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.8.7+git +0.8.8 diff --git a/ace/image_manifest_main.json.in b/ace/image_manifest_main.json.in index 1d6968c2..71671bfe 100644 --- a/ace/image_manifest_main.json.in +++ b/ace/image_manifest_main.json.in @@ -1,9 +1,9 @@ { - "acVersion": "0.8.7", + "acVersion": "0.8.8", "acKind": "ImageManifest", "name": "coreos.com/ace-validator-main", "labels": [ - { "name": "version", "value": "0.8.7" }, + { "name": "version", "value": "0.8.8" }, { "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 f58b7796..567eed62 100644 --- a/ace/image_manifest_sidekick.json.in +++ b/ace/image_manifest_sidekick.json.in @@ -1,9 +1,9 @@ { - "acVersion": "0.8.7", + "acVersion": "0.8.8", "acKind": "ImageManifest", "name": "coreos.com/ace-validator-sidekick", "labels": [ - { "name": "version", "value": "0.8.7" }, + { "name": "version", "value": "0.8.8" }, { "name": "os", "value": "@GOOS@" }, { "name": "arch", "value": "@GOARCH@" } ], diff --git a/aci/file_test.go b/aci/file_test.go index 18ab47af..67eeab1d 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.7","name":"example.com/app"}` + manifestBody := `{"acKind":"ImageManifest","acVersion":"0.8.8","name":"example.com/app"}` gw := gzip.NewWriter(tf) tw := tar.NewWriter(gw) diff --git a/examples/image.json b/examples/image.json index 1605d119..e3c9a90f 100644 --- a/examples/image.json +++ b/examples/image.json @@ -1,6 +1,6 @@ { "acKind": "ImageManifest", - "acVersion": "0.8.7", + "acVersion": "0.8.8", "name": "example.com/reduce-worker", "labels": [ { diff --git a/examples/pod_runtime.json b/examples/pod_runtime.json index 4917a55d..2885a785 100644 --- a/examples/pod_runtime.json +++ b/examples/pod_runtime.json @@ -1,6 +1,6 @@ { "acKind": "PodManifest", - "acVersion": "0.8.7", + "acVersion": "0.8.8", "apps": [ { "name": "reduce-worker", diff --git a/pkg/acirenderer/acirenderer_test.go b/pkg/acirenderer/acirenderer_test.go index 1545a5a6..0e7b54e8 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.7", + "acVersion": "0.8.8", "name": "example.com/test_empty_rootfs" } `, @@ -2175,7 +2175,7 @@ func TestEmptyRootFsDir(t *testing.T) { ` { "acKind": "ImageManifest", - "acVersion": "0.8.7", + "acVersion": "0.8.8", "name": "example.com/test_empty_rootfs_pwl", "pathWhitelist": ["foo"] } diff --git a/schema/image_test.go b/schema/image_test.go index 442ba631..60b5f9fe 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.7", + "acVersion": "0.8.8", "name": "example.com/test" } ` diff --git a/schema/lastditch/image_test.go b/schema/lastditch/image_test.go index 05350337..6358d16e 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.7", + "acVersion": "0.8.8", } `, ` @@ -101,7 +101,7 @@ func imgJ(name, labels, extra string) string { { %s "acKind": "ImageManifest", - "acVersion": "0.8.7", + "acVersion": "0.8.8", "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.7", + ACVersion: "0.8.8", ACKind: "ImageManifest", Name: name, Labels: labels, diff --git a/schema/lastditch/pod_test.go b/schema/lastditch/pod_test.go index 9c840891..894fdd31 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.7", + "acVersion": "0.8.8", } `, ` @@ -134,7 +134,7 @@ func podJ(apps, extra string) string { { %s "acKind": "PodManifest", - "acVersion": "0.8.7", + "acVersion": "0.8.8", "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.7", + ACVersion: "0.8.8", ACKind: "PodManifest", Apps: apps, } diff --git a/schema/version.go b/schema/version.go index 1081af17..82cc6509 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.7+git" + version string = "0.8.8" ) var ( diff --git a/spec/aci.md b/spec/aci.md index 05ee7c4b..036ade80 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.7", + "acVersion": "0.8.8", "name": "example.com/reduce-worker", "labels": [ { diff --git a/spec/pods.md b/spec/pods.md index 48cb0fe1..3b17369d 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.7", + "acVersion": "0.8.8", "acKind": "PodManifest", "apps": [ {