From 9affd6d2608c460a6ed13a8347ac39e1de5de825 Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Mon, 30 Jun 2014 16:16:06 -0700
Subject: [PATCH] Fix examples to set manifest ID and version

Part 4 in a series of changes towards data validation.
---
 api/examples/controller.json                   | 2 ++
 api/examples/pod-list.json                     | 6 +++++-
 api/examples/pod.json                          | 2 ++
 cmd/integration/integration.go                 | 2 +-
 examples/guestbook/frontend-controller.json    | 2 ++
 examples/guestbook/guestbook.md                | 6 ++++++
 examples/guestbook/redis-master.json           | 2 ++
 examples/guestbook/redis-slave-controller.json | 2 ++
 8 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/api/examples/controller.json b/api/examples/controller.json
index 998db43aaa..3ccc63520e 100644
--- a/api/examples/controller.json
+++ b/api/examples/controller.json
@@ -6,6 +6,8 @@
       "podTemplate": {
         "desiredState": {
            "manifest": {
+             "version": "v1beta1",
+             "id": "nginxController",
              "containers": [{
                "name": "nginx",
                "image": "dockerfile/nginx",
diff --git a/api/examples/pod-list.json b/api/examples/pod-list.json
index 9ad192c5cb..7f753a151b 100644
--- a/api/examples/pod-list.json
+++ b/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": [{
@@ -43,4 +47,4 @@
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api/examples/pod.json b/api/examples/pod.json
index 2a26cb742f..665444c712 100644
--- a/api/examples/pod.json
+++ b/api/examples/pod.json
@@ -2,6 +2,8 @@
   "id": "php",
   "desiredState": {
     "manifest": {
+      "version": "v1beta1",
+      "id": "php",
       "containers": [{
         "image": "dockerfile/nginx",
         "ports": [{
diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
index cf2cb1fa13..203e6af83c 100644
--- a/cmd/integration/integration.go
+++ b/cmd/integration/integration.go
@@ -160,7 +160,7 @@ containers:
     image: dockerfile/redis
     volumeMounts:
       - name: redis-data
-        path: /data
+        mountPath: /data
 
   - name: guestbook
     image: google/guestbook-python-redis
diff --git a/examples/guestbook/frontend-controller.json b/examples/guestbook/frontend-controller.json
index 19f3fc011d..e1294faf79 100644
--- a/examples/guestbook/frontend-controller.json
+++ b/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}]
diff --git a/examples/guestbook/guestbook.md b/examples/guestbook/guestbook.md
index a07acb9079..323592bd4d 100644
--- a/examples/guestbook/guestbook.md
+++ b/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}]
diff --git a/examples/guestbook/redis-master.json b/examples/guestbook/redis-master.json
index 6f06b74245..355f441345 100644
--- a/examples/guestbook/redis-master.json
+++ b/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",
diff --git a/examples/guestbook/redis-slave-controller.json b/examples/guestbook/redis-slave-controller.json
index d4d38117c2..2257d288be 100644
--- a/examples/guestbook/redis-slave-controller.json
+++ b/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}]