Merge pull request #314 from thockin/valid2

Fix examples to set manifest ID and version

api/examples/controller.json

@@ -6,6 +6,8 @@
       "podTemplate": {
         "desiredState": {
            "manifest": {
+             "version": "v1beta1",
+             "id": "nginxController",
              "containers": [{
                "name": "nginx",
                "image": "dockerfile/nginx",

api/examples/pod-list.json

@@ -8,6 +8,8 @@
             },
             "desiredState": {
               "manifest": {
+                "version": "v1beta1",
+                "id": "my-pod-1",
                 "containers": [{
                   "image": "dockerfile/nginx",
                   "ports": [{
@@ -29,6 +31,8 @@
             },
             "desiredState": {
               "manifest": {
+                "version": "v1beta1",
+                "id": "my-pod-2",
                 "containers": [{
                   "image": "dockerfile/nginx",
                   "ports": [{

api/examples/pod.json

@@ -2,6 +2,8 @@
   "id": "php",
   "desiredState": {
     "manifest": {
+      "version": "v1beta1",
+      "id": "php",
       "containers": [{
         "image": "dockerfile/nginx",
         "ports": [{

cmd/integration/integration.go

@@ -161,7 +161,7 @@ containers:
     image: dockerfile/redis
     volumeMounts:
       - name: redis-data
-        path: /data
+        mountPath: /data
 
   - name: guestbook
     image: google/guestbook-python-redis

examples/guestbook/frontend-controller.json

@@ -6,6 +6,8 @@
       "podTemplate": {
         "desiredState": {
            "manifest": {
+             "version": "v1beta1",
+             "id": "frontendController",
              "containers": [{
                "image": "brendanburns/php-redis",
                "ports": [{"containerPort": 80, "hostPort": 8000}]

examples/guestbook/guestbook.md

@@ -21,6 +21,8 @@ Create a file named `redis-master.json` describing a single pod, which runs a re
   "id": "redis-master-2",
   "desiredState": {
     "manifest": {
+      "version": "v1beta1",
+      "id": "redis-master-2",
       "containers": [{
         "name": "master",
         "image": "dockerfile/redis",
@@ -112,6 +114,8 @@ Create a file named `redis-slave-controller.json` that contains:
       "podTemplate": {
         "desiredState": {
            "manifest": {
+             "version": "v1beta1",
+             "id": "redisSlaveController",
              "containers": [{
                "image": "brendanburns/redis-slave",
                "ports": [{"containerPort": 6379, "hostPort": 6380}]
@@ -195,6 +199,8 @@ Create a file named `frontend-controller.json`:
     "podTemplate": {
       "desiredState": {
          "manifest": {
+           "version": "v1beta1",
+           "id": "frontendController",
            "containers": [{
              "image": "brendanburns/php-redis",
              "ports": [{"containerPort": 80, "hostPort": 8000}]

examples/guestbook/redis-master.json

@@ -2,6 +2,8 @@
   "id": "redis-master-2",
   "desiredState": {
     "manifest": {
+      "version": "v1beta1",
+      "id": "redis-master-2",
       "containers": [{
         "name": "master",
         "image": "dockerfile/redis",

examples/guestbook/redis-slave-controller.json

@@ -6,6 +6,8 @@
       "podTemplate": {
         "desiredState": {
            "manifest": {
+             "version": "v1beta1",
+             "id": "redisSlaveController",
              "containers": [{
                "image": "brendanburns/redis-slave",
                "ports": [{"containerPort": 6379, "hostPort": 6380}]