Merge pull request #1926 from brendandburns/docs

Fix tests.
This commit is contained in:
Brendan Burns 2014-10-21 07:40:08 -07:00
commit 456f2603de
3 changed files with 8 additions and 4 deletions

View File

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

View File

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

View File

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