From ecce66965199300cbfb38df3c96c21ba14e921c8 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Tue, 9 Jun 2015 14:26:41 -0700 Subject: [PATCH 1/2] update examples/cluster-dns to v1 --- examples/cluster-dns/dns-backend-rc.yaml | 3 +-- examples/cluster-dns/dns-backend-service.yaml | 2 +- examples/cluster-dns/dns-frontend-pod.yaml | 2 +- examples/cluster-dns/namespace-dev.yaml | 2 +- examples/cluster-dns/namespace-prod.yaml | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/examples/cluster-dns/dns-backend-rc.yaml b/examples/cluster-dns/dns-backend-rc.yaml index 34530a5865a..f21356f328e 100644 --- a/examples/cluster-dns/dns-backend-rc.yaml +++ b/examples/cluster-dns/dns-backend-rc.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: ReplicationController metadata: name: dns-backend @@ -19,4 +19,3 @@ spec: ports: - name: backend-port containerPort: 8000 - protocol: tcp diff --git a/examples/cluster-dns/dns-backend-service.yaml b/examples/cluster-dns/dns-backend-service.yaml index 09077855e18..0a814ce1896 100644 --- a/examples/cluster-dns/dns-backend-service.yaml +++ b/examples/cluster-dns/dns-backend-service.yaml @@ -1,5 +1,5 @@ kind: Service -apiVersion: v1beta3 +apiVersion: v1 metadata: name: dns-backend spec: diff --git a/examples/cluster-dns/dns-frontend-pod.yaml b/examples/cluster-dns/dns-frontend-pod.yaml index fee1c81a374..516ff414415 100644 --- a/examples/cluster-dns/dns-frontend-pod.yaml +++ b/examples/cluster-dns/dns-frontend-pod.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: Pod metadata: name: dns-frontend diff --git a/examples/cluster-dns/namespace-dev.yaml b/examples/cluster-dns/namespace-dev.yaml index 492eddb9f4a..149c2f6659a 100644 --- a/examples/cluster-dns/namespace-dev.yaml +++ b/examples/cluster-dns/namespace-dev.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: Namespace metadata: name: "development" diff --git a/examples/cluster-dns/namespace-prod.yaml b/examples/cluster-dns/namespace-prod.yaml index 7cd820ca9ad..04bb44c1d0f 100644 --- a/examples/cluster-dns/namespace-prod.yaml +++ b/examples/cluster-dns/namespace-prod.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: Namespace metadata: name: "production" From 193fb07206c665ea3563c0a11b6540156448e0be Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Tue, 9 Jun 2015 14:30:53 -0700 Subject: [PATCH 2/2] update examples/downward-api to v1 --- examples/downward-api/README.md | 2 +- examples/downward-api/dapi-pod.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/downward-api/README.md b/examples/downward-api/README.md index cbc53420bf6..468da615ddd 100644 --- a/examples/downward-api/README.md +++ b/examples/downward-api/README.md @@ -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: ```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.568087688Z POD_NAMESPACE=default ``` diff --git a/examples/downward-api/dapi-pod.yaml b/examples/downward-api/dapi-pod.yaml index 09e8bbe8c17..b16f6e5f5a6 100644 --- a/examples/downward-api/dapi-pod.yaml +++ b/examples/downward-api/dapi-pod.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: Pod metadata: name: dapi-test-pod