Commit c5e1c87a authored by Abhi Shah's avatar Abhi Shah

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

examples/cluster-dns and examples/downward-api to v1
parents 064e7146 193fb072
apiVersion: v1beta3 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
name: dns-backend name: dns-backend
...@@ -19,4 +19,3 @@ spec: ...@@ -19,4 +19,3 @@ spec:
ports: ports:
- name: backend-port - name: backend-port
containerPort: 8000 containerPort: 8000
protocol: tcp
kind: Service kind: Service
apiVersion: v1beta3 apiVersion: v1
metadata: metadata:
name: dns-backend name: dns-backend
spec: spec:
......
apiVersion: v1beta3 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: dns-frontend name: dns-frontend
......
apiVersion: v1beta3 apiVersion: v1
kind: Namespace kind: Namespace
metadata: metadata:
name: "development" name: "development"
......
apiVersion: v1beta3 apiVersion: v1
kind: Namespace kind: Namespace
metadata: metadata:
name: "production" name: "production"
......
...@@ -27,7 +27,7 @@ This pod runs the `env` command in a container that consumes the downward API. ...@@ -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
``` ```
......
apiVersion: v1beta3 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: dapi-test-pod name: dapi-test-pod
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment