Revert "Revert "Deleting old sample JSON; moving those in use; updati…

…ng referenc..."
duda · Mar 9, 2015 · da9622a · da9622a
1 parent 56bdd94
commit da9622a
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 154 deletions.
diff --git a/api/examples/controller-list.json b/api/examples/controller-list.json
diff --git a/api/examples/external-service.json b/api/examples/external-service.json
diff --git a/api/examples/pod-list.json b/api/examples/pod-list.json
diff --git a/api/examples/service-list.json b/api/examples/service-list.json
diff --git a/api/examples/service.json b/api/examples/service.json
diff --git a/api/examples/controller.json → cmd/integration/controller.json b/api/examples/controller.json → cmd/integration/controller.json
diff --git a/cmd/integration/integration.go b/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)
 	}

diff --git a/docs/getting-started-guides/azure.md b/docs/getting-started-guides/azure.md
@@ -64,7 +64,7 @@ You can create a pod like this:
 
 ```
 cd kubernetes
-cluster/kubectl.sh create -f api/examples/pod.json
+cluster/kubectl.sh create -f docs/getting-started-guides/pod.json
 ```
 
 Where pod.json contains something like:

diff --git a/docs/getting-started-guides/gce.md b/docs/getting-started-guides/gce.md
@@ -77,7 +77,7 @@ can create a pod like this:
 
 ```bash
 cd kubernetes
-cluster/kubectl.sh create -f api/examples/pod.json
+cluster/kubectl.sh create -f docs/getting-started-guides/pod.json
 ```
 
 Where pod.json contains something like:

diff --git a/docs/getting-started-guides/locally.md b/docs/getting-started-guides/locally.md
@@ -74,7 +74,7 @@ However you can't view the nginx start page on localhost. To verify that nginx i
 You can control the specifications of a pod via a user defined manifest, and reach nginx through your browser on the port specified therein:
 
 ```
-cluster/kubectl.sh create -f api/examples/pod.json
+cluster/kubectl.sh create -f docs/getting-started-guides/pod.json
 ```
 
 Congratulations!

diff --git a/api/examples/pod.json → docs/getting-started-guides/pod.json b/api/examples/pod.json → docs/getting-started-guides/pod.json
diff --git a/examples/examples_test.go b/examples/examples_test.go
@@ -98,14 +98,11 @@ func walkJSONFiles(inDir string, fn func(name, path string, data []byte)) error
 
 func TestExampleObjectSchemas(t *testing.T) {
 	cases := map[string]map[string]runtime.Object{
-		"../api/examples": {
-			"controller":       &api.ReplicationController{},
-			"controller-list":  &api.ReplicationControllerList{},
-			"pod":              &api.Pod{},
-			"pod-list":         &api.PodList{},
-			"service":          &api.Service{},
-			"external-service": &api.Service{},
-			"service-list":     &api.ServiceList{},
+		"../docs/getting-started-guides": {
+			"pod": &api.Pod{},
+		},
+		"../cmd/integration": {
+			"controller": &api.ReplicationController{},
 		},
 		"../examples/guestbook": {
 			"frontend-controller":     &api.ReplicationController{},