Merge pull request #9516 from caesarxuchao/cluster-dns-AND-downward-api-v1

examples/cluster-dns and examples/downward-api to v1
This commit is contained in:
Abhi Shah 2015-06-11 11:26:35 -07:00
commit 6914d1e27e
7 changed files with 7 additions and 8 deletions

View File

@ -1,4 +1,4 @@
apiVersion: v1beta3 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: dns-backend name: dns-backend
@ -19,4 +19,3 @@ spec:
ports: ports:
- name: backend-port - name: backend-port
containerPort: 8000 containerPort: 8000
protocol: tcp

View File

@ -1,5 +1,5 @@
kind: Service kind: Service
apiVersion: v1beta3 apiVersion: v1
metadata: metadata:
name: dns-backend name: dns-backend
spec: spec:

View File

@ -1,4 +1,4 @@
apiVersion: v1beta3 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: dns-frontend name: dns-frontend

View File

@ -1,4 +1,4 @@
apiVersion: v1beta3 apiVersion: v1
kind: Namespace kind: Namespace
metadata: metadata:
name: "development" name: "development"

View File

@ -1,4 +1,4 @@
apiVersion: v1beta3 apiVersion: v1
kind: Namespace kind: Namespace
metadata: metadata:
name: "production" name: "production"

View File

@ -27,7 +27,7 @@ This pod runs the `env` command in a container that consumes the downward API.
through the pod logs to see that the pod was injected with the correct values: through the pod logs to see that the pod was injected with the correct values:
```shell ```shell
$ kubectl log dapi-test-pod | grep POD_ $ kubectl logs dapi-test-pod | grep POD_
2015-04-30T20:22:18.568024817Z POD_NAME=dapi-test-pod 2015-04-30T20:22:18.568024817Z POD_NAME=dapi-test-pod
2015-04-30T20:22:18.568087688Z POD_NAMESPACE=default 2015-04-30T20:22:18.568087688Z POD_NAMESPACE=default
``` ```

View File

@ -1,4 +1,4 @@
apiVersion: v1beta3 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: dapi-test-pod name: dapi-test-pod