From 3723eb76293edb013d48eb9061c7e724ca41bb90 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Wed, 23 Jul 2014 22:32:07 -0700 Subject: [PATCH] Add kind and apiVersion to guestbook example. --- README.md | 2 ++ api/examples/controller-list.json | 4 +++- api/examples/controller.json | 1 + api/examples/external-service.json | 2 ++ api/examples/pod-list.json | 2 ++ api/examples/pod.json | 2 ++ api/examples/service-list.json | 2 ++ api/examples/service.json | 2 ++ examples/guestbook/frontend-controller.json | 2 ++ examples/guestbook/frontend-service.json | 2 ++ examples/guestbook/redis-master-service.json | 2 ++ examples/guestbook/redis-master.json | 2 ++ examples/guestbook/redis-slave-controller.json | 2 ++ examples/guestbook/redis-slave-service.json | 2 ++ 14 files changed, 28 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 20569d435f388..521f447f70457 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,8 @@ Where pod.json contains something like: ``` { "id": "php", + "kind": "Pod", + "apiVersion": "v1beta1", "desiredState": { "manifest": { "version": "v1beta1", diff --git a/api/examples/controller-list.json b/api/examples/controller-list.json index c3c1d969d2c8c..4cadf17686582 100644 --- a/api/examples/controller-list.json +++ b/api/examples/controller-list.json @@ -1,4 +1,6 @@ { + "kind": "ReplicationControllerList", + "apiVersion": "v1beta1", "items": [ { "id": "testRun", @@ -30,4 +32,4 @@ } } ] -} \ No newline at end of file +} diff --git a/api/examples/controller.json b/api/examples/controller.json index ea04e69d28319..d385569898b85 100644 --- a/api/examples/controller.json +++ b/api/examples/controller.json @@ -1,6 +1,7 @@ { "id": "nginxController", "apiVersion": "v1beta1", + "kind": "ReplicationController", "desiredState": { "replicas": 2, "replicaSelector": {"name": "nginx"}, diff --git a/api/examples/external-service.json b/api/examples/external-service.json index e841b2e946b38..95d796e5049dc 100644 --- a/api/examples/external-service.json +++ b/api/examples/external-service.json @@ -1,5 +1,7 @@ { "id": "example", + "kind": "Service", + "apiVersion": "v1beta1", "port": 8000, "labels": { "name": "nginx" diff --git a/api/examples/pod-list.json b/api/examples/pod-list.json index e9259424929f8..ea6f9f874e9bf 100644 --- a/api/examples/pod-list.json +++ b/api/examples/pod-list.json @@ -1,4 +1,6 @@ { + "kind": "PodList", + "apiVersion": "v1beta1", "items": [ { "id": "my-pod-1", diff --git a/api/examples/pod.json b/api/examples/pod.json index 5ab5bc461ae25..f3157ad3f3100 100644 --- a/api/examples/pod.json +++ b/api/examples/pod.json @@ -1,4 +1,6 @@ { + "kind": "Pod", + "apiVersion": "v1beta1", "id": "php", "desiredState": { "manifest": { diff --git a/api/examples/service-list.json b/api/examples/service-list.json index 87aff59381714..1ac2963b1643c 100644 --- a/api/examples/service-list.json +++ b/api/examples/service-list.json @@ -1,4 +1,6 @@ { + "kind": "ServiceList", + "apiVersion": "v1beta1", "items": [ { "id": "example1", diff --git a/api/examples/service.json b/api/examples/service.json index f9616e62813fa..f4ae8993db3a0 100644 --- a/api/examples/service.json +++ b/api/examples/service.json @@ -1,4 +1,6 @@ { + "kind": "Service", + "apiVersion": "v1beta1", "id": "example", "port": 8000, "labels": { diff --git a/examples/guestbook/frontend-controller.json b/examples/guestbook/frontend-controller.json index 9302f560a432f..c98c26b0731a6 100644 --- a/examples/guestbook/frontend-controller.json +++ b/examples/guestbook/frontend-controller.json @@ -1,5 +1,7 @@ { "id": "frontendController", + "kind": "ReplicationController", + "apiVersion": "v1beta1", "desiredState": { "replicas": 3, "replicaSelector": {"name": "frontend"}, diff --git a/examples/guestbook/frontend-service.json b/examples/guestbook/frontend-service.json index 11d4bba177780..3c49cc59d35d8 100644 --- a/examples/guestbook/frontend-service.json +++ b/examples/guestbook/frontend-service.json @@ -1,5 +1,7 @@ { "id": "frontend", + "kind": "Service", + "apiVersion": "v1beta1", "port": 9998, "selector": { "name": "frontend" diff --git a/examples/guestbook/redis-master-service.json b/examples/guestbook/redis-master-service.json index 5d79ea37fdd3e..a66dd9be7bc72 100644 --- a/examples/guestbook/redis-master-service.json +++ b/examples/guestbook/redis-master-service.json @@ -1,5 +1,7 @@ { "id": "redismaster", + "kind": "Service", + "apiVersion": "v1beta1", "port": 10000, "selector": { "name": "redis-master" diff --git a/examples/guestbook/redis-master.json b/examples/guestbook/redis-master.json index 355f44134589d..313f9c4e06c96 100644 --- a/examples/guestbook/redis-master.json +++ b/examples/guestbook/redis-master.json @@ -1,5 +1,7 @@ { "id": "redis-master-2", + "kind": "Pod", + "apiVersion": "v1beta1", "desiredState": { "manifest": { "version": "v1beta1", diff --git a/examples/guestbook/redis-slave-controller.json b/examples/guestbook/redis-slave-controller.json index cfee708a99a69..1f0db5f06f554 100644 --- a/examples/guestbook/redis-slave-controller.json +++ b/examples/guestbook/redis-slave-controller.json @@ -1,5 +1,7 @@ { "id": "redisSlaveController", + "kind": "ReplicationController", + "apiVersion": "v1beta1", "desiredState": { "replicas": 2, "replicaSelector": {"name": "redisslave"}, diff --git a/examples/guestbook/redis-slave-service.json b/examples/guestbook/redis-slave-service.json index b317ae856e623..5525b6314cea4 100644 --- a/examples/guestbook/redis-slave-service.json +++ b/examples/guestbook/redis-slave-service.json @@ -1,5 +1,7 @@ { "id": "redisslave", + "kind": "Service", + "apiVersion": "v1beta1", "port": 10001, "labels": { "name": "redisslave"