Merge pull request #608 from jonboulle/master

*: appc v0.8.2
appc · May 23, 2016 · e9daa59 · e9daa59
2 parents 33fefe1 + deda37c
commit e9daa59
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### v0.8.2
+
+Minor release of the spec with two tooling fixes:
+- Updated Godeps to the latest k8s.io packages, which should help downstream users attempting to vendor schema code (#607)
+- Minor fixes to the ACE validator (#605)
+
 ### v0.8.1
 
 Minor release of the spec which introduces one new backwards-compatible feature: the field `readOnlyRootFS` in the pod spec. 

diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ $ find /tmp/my-app/
 $ cat /tmp/my-app/manifest
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.1",
+    "acVersion": "0.8.2",
     "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.1",
+    "acVersion": "0.8.2",
     "annotations": null,
     "app": {
         "environment": [],

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.8.1+git
+0.8.2+git
diff --git a/ace/image_manifest_main.json.in b/ace/image_manifest_main.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.1",
+    "acVersion": "0.8.2",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-main",
     "labels": [
-        { "name": "version", "value": "0.8.1" },
+        { "name": "version", "value": "0.8.2" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],

diff --git a/ace/image_manifest_sidekick.json.in b/ace/image_manifest_sidekick.json.in
@@ -1,9 +1,9 @@
 {
-    "acVersion": "0.8.1",
+    "acVersion": "0.8.2",
     "acKind": "ImageManifest",
     "name": "coreos.com/ace-validator-sidekick",
     "labels": [
-        { "name": "version", "value": "0.8.1" },
+        { "name": "version", "value": "0.8.2" },
         { "name": "os", "value": "@GOOS@" },
         { "name": "arch", "value": "@GOARCH@" }
     ],

diff --git 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.1","name":"example.com/app"}`
+	manifestBody := `{"acKind":"ImageManifest","acVersion":"0.8.2","name":"example.com/app"}`
 
 	gw := gzip.NewWriter(tf)
 	tw := tar.NewWriter(gw)

diff --git a/examples/image.json b/examples/image.json
@@ -1,6 +1,6 @@
 {
     "acKind": "ImageManifest",
-    "acVersion": "0.8.1",
+    "acVersion": "0.8.2",
     "name": "example.com/reduce-worker",
     "labels": [
         {

diff --git a/examples/pod_runtime.json b/examples/pod_runtime.json
@@ -1,6 +1,6 @@
 {
     "acKind": "PodManifest",
-    "acVersion": "0.8.1",
+    "acVersion": "0.8.2",
     "apps": [
         {
             "name": "reduce-worker",

diff --git 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.1",
+		                "acVersion": "0.8.2",
 		                "name": "example.com/test_empty_rootfs"
 		            }
                         `,
@@ -2175,7 +2175,7 @@ func TestEmptyRootFsDir(t *testing.T) {
 			`
 		            {
 		                "acKind": "ImageManifest",
-		                "acVersion": "0.8.1",
+		                "acVersion": "0.8.2",
 		                "name": "example.com/test_empty_rootfs_pwl",
                                 "pathWhitelist": ["foo"]
 		            }

diff --git 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.1",
+		    "acVersion": "0.8.2",
 		    "name": "example.com/test"
 		}
 		`

diff --git 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.1",
+		    "acVersion": "0.8.2",
 		}
 		`, `
 		<html>
@@ -101,7 +101,7 @@ func imgJ(name, labels, extra string) string {
 		{
 		    %s
 		    "acKind": "ImageManifest",
-		    "acVersion": "0.8.1",
+		    "acVersion": "0.8.2",
 		    "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.1",
+		ACVersion: "0.8.2",
 		ACKind:    "ImageManifest",
 		Name:      name,
 		Labels:    labels,

diff --git 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.1",
+			    "acVersion": "0.8.2",
 			}
 			`,
 		`
@@ -134,15 +134,15 @@ func podJ(apps, extra string) string {
 		{
 		    %s
 		    "acKind": "PodManifest",
-		    "acVersion": "0.8.1",
+		    "acVersion": "0.8.2",
 		    "apps": %s
 		}`, extra, apps)
 }
 
 // podI returns a pod manifest instance with given apps
 func podI(apps AppList) PodManifest {
 	return PodManifest{
-		ACVersion: "0.8.1",
+		ACVersion: "0.8.2",
 		ACKind:    "PodManifest",
 		Apps:      apps,
 	}

diff --git 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.1+git"
+	version string = "0.8.2+git"
 )
 
 var (

diff --git 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.1",
+    "acVersion": "0.8.2",
     "name": "example.com/reduce-worker",
     "labels": [
         {

diff --git 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.1",
+    "acVersion": "0.8.2",
     "acKind": "PodManifest",
     "apps": [
         {