Merge pull request #1926 from brendandburns/docs

Fix tests.

examples_test.go

@@ -109,6 +109,9 @@ func TestExampleObjectSchemas(t *testing.T) {
 		"../examples/walkthrough": {
 			"pod1": &api.Pod{},
 			"pod2": &api.Pod{},
+			"pod-with-http-healthcheck": &api.Pod{},
+			"service":                   &api.Service{},
+			"replication-controller":    &api.ReplicationController{},
 		},
 	}
 

walkthrough/k8s201.md

@@ -57,14 +57,15 @@ For example, here is a service that balances across the pods created in the prev
 ```yaml
 kind: Service
 apiVersion: v1beta1
-id: nginxExample
+# must be a DNS compatible name
+id: nginx-example
 # the port that this service should serve on
 port: 8000
 # just like the selector in the replication controller,
 # but this time it identifies the set of pods to load balance
 # traffic to.
 selector:
-  - name: nginx
+  name: nginx
 # the container on each pod to connect to, can be a name
 # (e.g. 'www') or a number (e.g. 80)
 containerPort: 80

walkthrough/service.yaml

@@ -1,13 +1,13 @@
 kind: Service
 apiVersion: v1beta1
-id: nginxExample
+id: nginx-example
 # the port that this service should serve on
 port: 8000
 # just like the selector in the replication controller,
 # but this time it identifies the set of pods to load balance
 # traffic to.
 selector:
-  - name: nginx
+  name: nginx
 # the container on each pod to connect to, can be a name
 # (e.g. 'www') or a number (e.g. 80)
 containerPort: 80