Merge pull request #5124 from MikeJeffrey/ex3

Deleting old sample JSON; moving those in use; updating references

cmd/integration/controller.json

@@ -0,0 +1,23 @@
+  {
+    "id": "nginx-controller",
+    "apiVersion": "v1beta1",
+    "kind": "ReplicationController",
+    "desiredState": {
+      "replicas": 2,
+      "replicaSelector": {"name": "nginx"},
+      "podTemplate": {
+        "desiredState": {
+           "manifest": {
+             "version": "v1beta1",
+             "id": "nginx-controller",
+             "containers": [{
+               "name": "nginx",
+               "image": "dockerfile/nginx",
+               "ports": [{"containerPort": 80, "hostPort": 8080}]
+             }]
+           }
+         },
+         "labels": {"name": "nginx"}
+        }},
+    "labels": {"name": "nginx"}
+  }

cmd/integration/integration.go

@@ -273,7 +273,7 @@ func podExists(c *client.Client, podNamespace string, podID string) wait.Conditi
 }
 
 func runReplicationControllerTest(c *client.Client) {
-	data, err := ioutil.ReadFile("api/examples/controller.json")
+	data, err := ioutil.ReadFile("cmd/integration/controller.json")
 	if err != nil {
 		glog.Fatalf("Unexpected error: %v", err)
 	}