From 3f2553f5b3af97d6837bbe4e93490e39fb277f12 Mon Sep 17 00:00:00 2001 From: Subin M Date: Tue, 17 Feb 2015 00:05:11 +0530 Subject: [PATCH 01/14] Adding guestbook example with namespace --- .../guestbook_ns/frontend-controller.json | 48 ++++++++++++++++++ .../guestbook_ns/frontend_service.json | 18 +++++++ .../guestbook_ns/redis-master-service.json | 20 ++++++++ .../guestbook/guestbook_ns/redis-master.json | 33 +++++++++++++ .../guestbook_ns/redis-slave-controller.json | 49 +++++++++++++++++++ .../guestbook_ns/redis-slave-service.json | 20 ++++++++ 6 files changed, 188 insertions(+) create mode 100644 examples/guestbook/guestbook_ns/frontend-controller.json create mode 100644 examples/guestbook/guestbook_ns/frontend_service.json create mode 100644 examples/guestbook/guestbook_ns/redis-master-service.json create mode 100644 examples/guestbook/guestbook_ns/redis-master.json create mode 100644 examples/guestbook/guestbook_ns/redis-slave-controller.json create mode 100644 examples/guestbook/guestbook_ns/redis-slave-service.json diff --git a/examples/guestbook/guestbook_ns/frontend-controller.json b/examples/guestbook/guestbook_ns/frontend-controller.json new file mode 100644 index 00000000000..a5300f82457 --- /dev/null +++ b/examples/guestbook/guestbook_ns/frontend-controller.json @@ -0,0 +1,48 @@ +{ + "kind": "ReplicationController", + "apiVersion": "v1beta3", + "metadata": { + "name": "frontend-controller", + "namespace": "default", + "labels": { + "name": "frontend", + "template": "frontend" + } + }, + "spec": { + "replicas": 2, + "selector": { + "name": "frontend" + }, + "template": { + "metadata": { + "name": "frontend-controller", + "namespace": "default", + "labels": { + "name": "frontend", + "uses": "redisslave,redis-master", + "template": "frontend" + } + }, + "spec": { + "volumes": null, + "containers": [ + { + "name": "php-redis", + "image": "kubernetes/example-guestbook-php-redis", + "ports": [ + { + "containerPort": 80, + "hostPort": 8000 + } + ] + } + ], + "restartPolicy": { + "always": {} + }, + "dnsPolicy": "ClusterFirst" + } + } + } +} diff --git a/examples/guestbook/guestbook_ns/frontend_service.json b/examples/guestbook/guestbook_ns/frontend_service.json new file mode 100644 index 00000000000..fb47f418d65 --- /dev/null +++ b/examples/guestbook/guestbook_ns/frontend_service.json @@ -0,0 +1,18 @@ +{ + "kind": "Service", + "apiVersion": "v1beta3", + "metadata": { + "name": "frontend", + "namespace": "default", + "labels": {}, + }, + "spec": { + "port": 80, + "protocol": "TCP", + "selector": { + "name": "frontend" + }, + "containerPort": 80, + "sessionAffinity": "None" + } +} diff --git a/examples/guestbook/guestbook_ns/redis-master-service.json b/examples/guestbook/guestbook_ns/redis-master-service.json new file mode 100644 index 00000000000..c10a029555d --- /dev/null +++ b/examples/guestbook/guestbook_ns/redis-master-service.json @@ -0,0 +1,20 @@ +{ + "kind": "Service", + "apiVersion": "v1beta3", + "metadata": { + "name": "redis-master", + "namespace": "default", + "labels": { + "name": "redis-master" + } + }, + "spec": { + "port": 6379, + "containerPort": 6379, + "protocol": "TCP", + "selector": { + "name": "redis-master" + }, + "sessionAffinity": "None" + } +} diff --git a/examples/guestbook/guestbook_ns/redis-master.json b/examples/guestbook/guestbook_ns/redis-master.json new file mode 100644 index 00000000000..484c3bfd8b6 --- /dev/null +++ b/examples/guestbook/guestbook_ns/redis-master.json @@ -0,0 +1,33 @@ +{ + "apiVersion": "v1beta3", + "kind": "Pod", + "id": "redis-master", + "metadata": { + "name": "redis-master", + "namespace": "default", + "labels": { + "name": "redis-master" + } + }, + "spec": { + "volumes": null, + "resources": {}, + "containers": [ + { + "name": "master", + "image": "dockerfile/redis", + "ports": [ + { + "containerPort": 6379, + "hostPort": 6379, + "protocol": "TCP" + } + ] + } + ], + "restartPolicy": { + "always": {} + } + } +} + diff --git a/examples/guestbook/guestbook_ns/redis-slave-controller.json b/examples/guestbook/guestbook_ns/redis-slave-controller.json new file mode 100644 index 00000000000..70f4b4a2c50 --- /dev/null +++ b/examples/guestbook/guestbook_ns/redis-slave-controller.json @@ -0,0 +1,49 @@ +{ + "kind": "ReplicationController", + "apiVersion": "v1beta3", + "metadata": { + "name": "redis-slave-controller", + "namespace": "default", + "labels": { + "name": "redisslave", + "template": "redisslave" + } + }, + "spec": { + "replicas": 2, + "selector": { + "name": "redisslave" + }, + "template": { + "metadata": { + "name": "redis-slave-controller", + "namespace": "default", + "labels": { + "name": "redisslave", + "template": "redisslave", + "uses": "redis-master" + } + }, + "spec": { + "volumes": null, + "containers": [ + { + "name": "slave", + "image": "brendanburns/redis-slave", + "ports": [ + { + "containerPort": 6379, + "hostPort": 6380 + } + ] + } + ], + "restartPolicy": { + "always": {} + }, + "dnsPolicy": "ClusterFirst" + } + } + } +} + diff --git a/examples/guestbook/guestbook_ns/redis-slave-service.json b/examples/guestbook/guestbook_ns/redis-slave-service.json new file mode 100644 index 00000000000..835917f0500 --- /dev/null +++ b/examples/guestbook/guestbook_ns/redis-slave-service.json @@ -0,0 +1,20 @@ +{ + "kind": "Service", + "apiVersion": "v1beta3", + "metadata": { + "name": "redisslave", + "namespace": "default", + "labels": { + "name": "redisslave" + } + }, + "spec": { + "port": 6379, + "containerPort": 6379, + "protocol": "TCP", + "selector": { + "name": "redisslave" + }, + "sessionAffinity": "None" + } +} From 2cc5dd526da9b1a09ff994593327fbd0be1b9d10 Mon Sep 17 00:00:00 2001 From: Subin M Date: Tue, 17 Feb 2015 10:58:58 +0530 Subject: [PATCH 02/14] Removing namespace from json files --- examples/guestbook/guestbook_ns/frontend-controller.json | 2 -- examples/guestbook/guestbook_ns/frontend_service.json | 1 - examples/guestbook/guestbook_ns/redis-master-service.json | 1 - examples/guestbook/guestbook_ns/redis-master.json | 1 - examples/guestbook/guestbook_ns/redis-slave-controller.json | 2 -- examples/guestbook/guestbook_ns/redis-slave-service.json | 1 - 6 files changed, 8 deletions(-) diff --git a/examples/guestbook/guestbook_ns/frontend-controller.json b/examples/guestbook/guestbook_ns/frontend-controller.json index a5300f82457..99c2326084e 100644 --- a/examples/guestbook/guestbook_ns/frontend-controller.json +++ b/examples/guestbook/guestbook_ns/frontend-controller.json @@ -3,7 +3,6 @@ "apiVersion": "v1beta3", "metadata": { "name": "frontend-controller", - "namespace": "default", "labels": { "name": "frontend", "template": "frontend" @@ -17,7 +16,6 @@ "template": { "metadata": { "name": "frontend-controller", - "namespace": "default", "labels": { "name": "frontend", "uses": "redisslave,redis-master", diff --git a/examples/guestbook/guestbook_ns/frontend_service.json b/examples/guestbook/guestbook_ns/frontend_service.json index fb47f418d65..7217b4acd88 100644 --- a/examples/guestbook/guestbook_ns/frontend_service.json +++ b/examples/guestbook/guestbook_ns/frontend_service.json @@ -3,7 +3,6 @@ "apiVersion": "v1beta3", "metadata": { "name": "frontend", - "namespace": "default", "labels": {}, }, "spec": { diff --git a/examples/guestbook/guestbook_ns/redis-master-service.json b/examples/guestbook/guestbook_ns/redis-master-service.json index c10a029555d..20c7b10e0bb 100644 --- a/examples/guestbook/guestbook_ns/redis-master-service.json +++ b/examples/guestbook/guestbook_ns/redis-master-service.json @@ -3,7 +3,6 @@ "apiVersion": "v1beta3", "metadata": { "name": "redis-master", - "namespace": "default", "labels": { "name": "redis-master" } diff --git a/examples/guestbook/guestbook_ns/redis-master.json b/examples/guestbook/guestbook_ns/redis-master.json index 484c3bfd8b6..f5f34939a0b 100644 --- a/examples/guestbook/guestbook_ns/redis-master.json +++ b/examples/guestbook/guestbook_ns/redis-master.json @@ -4,7 +4,6 @@ "id": "redis-master", "metadata": { "name": "redis-master", - "namespace": "default", "labels": { "name": "redis-master" } diff --git a/examples/guestbook/guestbook_ns/redis-slave-controller.json b/examples/guestbook/guestbook_ns/redis-slave-controller.json index 70f4b4a2c50..c38808cdb9a 100644 --- a/examples/guestbook/guestbook_ns/redis-slave-controller.json +++ b/examples/guestbook/guestbook_ns/redis-slave-controller.json @@ -3,7 +3,6 @@ "apiVersion": "v1beta3", "metadata": { "name": "redis-slave-controller", - "namespace": "default", "labels": { "name": "redisslave", "template": "redisslave" @@ -17,7 +16,6 @@ "template": { "metadata": { "name": "redis-slave-controller", - "namespace": "default", "labels": { "name": "redisslave", "template": "redisslave", diff --git a/examples/guestbook/guestbook_ns/redis-slave-service.json b/examples/guestbook/guestbook_ns/redis-slave-service.json index 835917f0500..c4de13569d4 100644 --- a/examples/guestbook/guestbook_ns/redis-slave-service.json +++ b/examples/guestbook/guestbook_ns/redis-slave-service.json @@ -3,7 +3,6 @@ "apiVersion": "v1beta3", "metadata": { "name": "redisslave", - "namespace": "default", "labels": { "name": "redisslave" } From a749efa50966d8a19a3b6183eca0939664edd198 Mon Sep 17 00:00:00 2001 From: Subin M Date: Thu, 19 Feb 2015 18:08:22 +0530 Subject: [PATCH 03/14] new changes --- .../guestbook_ns/frontend-controller.json | 23 ++++------- .../guestbook_ns/frontend_service.json | 9 ++-- .../guestbook_ns/redis-master-service.json | 5 +-- .../guestbook/guestbook_ns/redis-master.json | 41 +++++++++++-------- .../guestbook_ns/redis-slave-controller.json | 23 ++++------- .../guestbook_ns/redis-slave-service.json | 11 +++-- 6 files changed, 49 insertions(+), 63 deletions(-) diff --git a/examples/guestbook/guestbook_ns/frontend-controller.json b/examples/guestbook/guestbook_ns/frontend-controller.json index 99c2326084e..cdabdc1f8e7 100644 --- a/examples/guestbook/guestbook_ns/frontend-controller.json +++ b/examples/guestbook/guestbook_ns/frontend-controller.json @@ -2,10 +2,9 @@ "kind": "ReplicationController", "apiVersion": "v1beta3", "metadata": { - "name": "frontend-controller", + "name": "frontend", "labels": { - "name": "frontend", - "template": "frontend" + "name": "frontend" } }, "spec": { @@ -15,31 +14,23 @@ }, "template": { "metadata": { - "name": "frontend-controller", + "name": "frontend", "labels": { - "name": "frontend", - "uses": "redisslave,redis-master", - "template": "frontend" + "name": "frontend" } }, "spec": { - "volumes": null, "containers": [ { "name": "php-redis", "image": "kubernetes/example-guestbook-php-redis", "ports": [ { - "containerPort": 80, - "hostPort": 8000 - } + "containerPort": 80 + } ] } - ], - "restartPolicy": { - "always": {} - }, - "dnsPolicy": "ClusterFirst" + ] } } } diff --git a/examples/guestbook/guestbook_ns/frontend_service.json b/examples/guestbook/guestbook_ns/frontend_service.json index 7217b4acd88..d70df41b94d 100644 --- a/examples/guestbook/guestbook_ns/frontend_service.json +++ b/examples/guestbook/guestbook_ns/frontend_service.json @@ -3,15 +3,14 @@ "apiVersion": "v1beta3", "metadata": { "name": "frontend", - "labels": {}, + "labels": {"name": "frontend"}, }, "spec": { - "port": 80, + "port": 0, + "containerPort": 80, "protocol": "TCP", "selector": { "name": "frontend" - }, - "containerPort": 80, - "sessionAffinity": "None" + } } } diff --git a/examples/guestbook/guestbook_ns/redis-master-service.json b/examples/guestbook/guestbook_ns/redis-master-service.json index 20c7b10e0bb..2011469fd4d 100644 --- a/examples/guestbook/guestbook_ns/redis-master-service.json +++ b/examples/guestbook/guestbook_ns/redis-master-service.json @@ -8,12 +8,11 @@ } }, "spec": { - "port": 6379, + "port": 10000, "containerPort": 6379, "protocol": "TCP", "selector": { "name": "redis-master" - }, - "sessionAffinity": "None" + } } } diff --git a/examples/guestbook/guestbook_ns/redis-master.json b/examples/guestbook/guestbook_ns/redis-master.json index f5f34939a0b..0f9ae7ccd3d 100644 --- a/examples/guestbook/guestbook_ns/redis-master.json +++ b/examples/guestbook/guestbook_ns/redis-master.json @@ -1,32 +1,39 @@ { + "kind": "ReplicationController", "apiVersion": "v1beta3", - "kind": "Pod", - "id": "redis-master", "metadata": { "name": "redis-master", "labels": { - "name": "redis-master" + "name": "redis-master", + "template": "redis-master" } }, "spec": { - "volumes": null, - "resources": {}, - "containers": [ - { - "name": "master", - "image": "dockerfile/redis", - "ports": [ + "replicas": 1, + "selector": { + "name": "redis-master" + }, + "template": { + "metadata": { + "name": "redis-master", + "labels": { + "name": "redis-master" + } + }, + "spec": { + "containers": [ { - "containerPort": 6379, - "hostPort": 6379, - "protocol": "TCP" + "name": "master", + "image": "dockerfile/redis", + "ports": [ + { + "containerPort": 6379, + "protocol": "TCP" + } + ] } ] } - ], - "restartPolicy": { - "always": {} } } } - diff --git a/examples/guestbook/guestbook_ns/redis-slave-controller.json b/examples/guestbook/guestbook_ns/redis-slave-controller.json index c38808cdb9a..46ff915c066 100644 --- a/examples/guestbook/guestbook_ns/redis-slave-controller.json +++ b/examples/guestbook/guestbook_ns/redis-slave-controller.json @@ -2,44 +2,35 @@ "kind": "ReplicationController", "apiVersion": "v1beta3", "metadata": { - "name": "redis-slave-controller", + "name": "redis-slave", "labels": { - "name": "redisslave", - "template": "redisslave" + "name": "redis-slave" } }, "spec": { "replicas": 2, "selector": { - "name": "redisslave" + "name": "redis-slave" }, "template": { "metadata": { - "name": "redis-slave-controller", + "name": "redis-slave", "labels": { - "name": "redisslave", - "template": "redisslave", - "uses": "redis-master" + "name": "redis-slave" } }, "spec": { - "volumes": null, "containers": [ { "name": "slave", "image": "brendanburns/redis-slave", "ports": [ { - "containerPort": 6379, - "hostPort": 6380 + "containerPort": 6379 } ] } - ], - "restartPolicy": { - "always": {} - }, - "dnsPolicy": "ClusterFirst" + ] } } } diff --git a/examples/guestbook/guestbook_ns/redis-slave-service.json b/examples/guestbook/guestbook_ns/redis-slave-service.json index c4de13569d4..4aee222f05c 100644 --- a/examples/guestbook/guestbook_ns/redis-slave-service.json +++ b/examples/guestbook/guestbook_ns/redis-slave-service.json @@ -2,18 +2,17 @@ "kind": "Service", "apiVersion": "v1beta3", "metadata": { - "name": "redisslave", + "name": "redis-slave", "labels": { - "name": "redisslave" + "name": "redis-slave" } }, "spec": { - "port": 6379, + "port": 10001, "containerPort": 6379, "protocol": "TCP", "selector": { - "name": "redisslave" - }, - "sessionAffinity": "None" + "name": "redis-slave" + } } } From 5aedf108670789a4f68cf7af1528b788d1f93f9f Mon Sep 17 00:00:00 2001 From: Subin M Date: Thu, 19 Feb 2015 20:56:09 +0530 Subject: [PATCH 04/14] json files updated --- examples/guestbook/guestbook_ns/frontend-controller.json | 3 ++- examples/guestbook/guestbook_ns/frontend_service.json | 2 +- examples/guestbook/guestbook_ns/redis-master.json | 3 +-- examples/guestbook/guestbook_ns/redis-slave-controller.json | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/guestbook/guestbook_ns/frontend-controller.json b/examples/guestbook/guestbook_ns/frontend-controller.json index cdabdc1f8e7..536be9f78b2 100644 --- a/examples/guestbook/guestbook_ns/frontend-controller.json +++ b/examples/guestbook/guestbook_ns/frontend-controller.json @@ -26,7 +26,8 @@ "image": "kubernetes/example-guestbook-php-redis", "ports": [ { - "containerPort": 80 + "containerPort": 80, + "protocol": "TCP" } ] } diff --git a/examples/guestbook/guestbook_ns/frontend_service.json b/examples/guestbook/guestbook_ns/frontend_service.json index d70df41b94d..fabb2d6101c 100644 --- a/examples/guestbook/guestbook_ns/frontend_service.json +++ b/examples/guestbook/guestbook_ns/frontend_service.json @@ -6,7 +6,7 @@ "labels": {"name": "frontend"}, }, "spec": { - "port": 0, + "port": 10002, "containerPort": 80, "protocol": "TCP", "selector": { diff --git a/examples/guestbook/guestbook_ns/redis-master.json b/examples/guestbook/guestbook_ns/redis-master.json index 0f9ae7ccd3d..74293b9c275 100644 --- a/examples/guestbook/guestbook_ns/redis-master.json +++ b/examples/guestbook/guestbook_ns/redis-master.json @@ -4,8 +4,7 @@ "metadata": { "name": "redis-master", "labels": { - "name": "redis-master", - "template": "redis-master" + "name": "redis-master" } }, "spec": { diff --git a/examples/guestbook/guestbook_ns/redis-slave-controller.json b/examples/guestbook/guestbook_ns/redis-slave-controller.json index 46ff915c066..12dd37dffcc 100644 --- a/examples/guestbook/guestbook_ns/redis-slave-controller.json +++ b/examples/guestbook/guestbook_ns/redis-slave-controller.json @@ -26,7 +26,8 @@ "image": "brendanburns/redis-slave", "ports": [ { - "containerPort": 6379 + "containerPort": 6379, + "protocol": "TCP" } ] } From 3d7ca16599debfe58285e5663fb5ef0612ca00af Mon Sep 17 00:00:00 2001 From: Subin M Date: Thu, 19 Feb 2015 21:05:59 +0530 Subject: [PATCH 05/14] json files updated --- examples/guestbook/guestbook_ns/frontend_service.json | 2 +- examples/guestbook/guestbook_ns/redis-master-service.json | 2 +- examples/guestbook/guestbook_ns/redis-slave-service.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/guestbook/guestbook_ns/frontend_service.json b/examples/guestbook/guestbook_ns/frontend_service.json index fabb2d6101c..fd5cf3699d3 100644 --- a/examples/guestbook/guestbook_ns/frontend_service.json +++ b/examples/guestbook/guestbook_ns/frontend_service.json @@ -6,7 +6,7 @@ "labels": {"name": "frontend"}, }, "spec": { - "port": 10002, + "port": 80, "containerPort": 80, "protocol": "TCP", "selector": { diff --git a/examples/guestbook/guestbook_ns/redis-master-service.json b/examples/guestbook/guestbook_ns/redis-master-service.json index 2011469fd4d..0b0ee9eb3b6 100644 --- a/examples/guestbook/guestbook_ns/redis-master-service.json +++ b/examples/guestbook/guestbook_ns/redis-master-service.json @@ -8,7 +8,7 @@ } }, "spec": { - "port": 10000, + "port": 6379, "containerPort": 6379, "protocol": "TCP", "selector": { diff --git a/examples/guestbook/guestbook_ns/redis-slave-service.json b/examples/guestbook/guestbook_ns/redis-slave-service.json index 4aee222f05c..ceeb9e155fb 100644 --- a/examples/guestbook/guestbook_ns/redis-slave-service.json +++ b/examples/guestbook/guestbook_ns/redis-slave-service.json @@ -8,7 +8,7 @@ } }, "spec": { - "port": 10001, + "port": 6379, "containerPort": 6379, "protocol": "TCP", "selector": { From 46c58623e32061367e8f89cf24ebd532634801f3 Mon Sep 17 00:00:00 2001 From: Subin M Date: Thu, 19 Feb 2015 21:16:59 +0530 Subject: [PATCH 06/14] testcase updated --- examples/examples_test.go | 8 ++++++++ .../{frontend_service.json => frontend-service.json} | 0 2 files changed, 8 insertions(+) rename examples/guestbook/guestbook_ns/{frontend_service.json => frontend-service.json} (100%) diff --git a/examples/examples_test.go b/examples/examples_test.go index eafa0049438..dd504974ee7 100644 --- a/examples/examples_test.go +++ b/examples/examples_test.go @@ -115,6 +115,14 @@ func TestExampleObjectSchemas(t *testing.T) { "redis-master-service": &api.Service{}, "redis-slave-service": &api.Service{}, }, + "../examples/guestbook/guestbook_ns": { + "frontend-controller": &api.ReplicationController{}, + "redis-slave-controller": &api.ReplicationController{}, + "redis-master": &api.ReplicationController{}, + "frontend-service": &api.Service{}, + "redis-master-service": &api.Service{}, + "redis-slave-service": &api.Service{}, + }, "../examples/walkthrough": { "pod1": &api.Pod{}, "pod2": &api.Pod{}, diff --git a/examples/guestbook/guestbook_ns/frontend_service.json b/examples/guestbook/guestbook_ns/frontend-service.json similarity index 100% rename from examples/guestbook/guestbook_ns/frontend_service.json rename to examples/guestbook/guestbook_ns/frontend-service.json From 027c1ac873f3f83f10109f230fc8236df14f62b0 Mon Sep 17 00:00:00 2001 From: Subin M Date: Thu, 19 Feb 2015 23:16:47 +0530 Subject: [PATCH 07/14] add v3 json files for guesybook-go --- .../guestbook-go_v3/guestbook-controller.json | 39 +++++++++++++++ .../guestbook-go_v3/guestbook-service.json | 19 ++++++++ .../redis-master-controller.json | 43 +++++++++++++++++ .../guestbook-go_v3/redis-master-service.json | 20 ++++++++ .../redis-slave-controller.json | 48 +++++++++++++++++++ .../guestbook-go_v3/redis-slave-service.json | 20 ++++++++ 6 files changed, 189 insertions(+) create mode 100644 examples/guestbook-go/guestbook-go_v3/guestbook-controller.json create mode 100644 examples/guestbook-go/guestbook-go_v3/guestbook-service.json create mode 100644 examples/guestbook-go/guestbook-go_v3/redis-master-controller.json create mode 100644 examples/guestbook-go/guestbook-go_v3/redis-master-service.json create mode 100644 examples/guestbook-go/guestbook-go_v3/redis-slave-controller.json create mode 100644 examples/guestbook-go/guestbook-go_v3/redis-slave-service.json diff --git a/examples/guestbook-go/guestbook-go_v3/guestbook-controller.json b/examples/guestbook-go/guestbook-go_v3/guestbook-controller.json new file mode 100644 index 00000000000..1cf219319c7 --- /dev/null +++ b/examples/guestbook-go/guestbook-go_v3/guestbook-controller.json @@ -0,0 +1,39 @@ +{ + "kind": "ReplicationController", + "apiVersion": "v1beta3", + "metadata": { + "name": "guestbook", + "labels": { + "name": "guestbook" + } + }, + "spec": { + "replicas": 3, + "selector": { + "name": "guestbook" + }, + "template": { + "metadata": { + "name": "guestbook", + "labels": { + "name": "guestbook" + } + }, + "spec": { + "containers": [ + { + "image": "kubernetes/guestbook", + "name": "guestbook", + "ports": [ + { + "name": "http-server", + "containerPort": 3000, + "protocol": "TCP" + } + ] + } + ] + } + } + } +} diff --git a/examples/guestbook-go/guestbook-go_v3/guestbook-service.json b/examples/guestbook-go/guestbook-go_v3/guestbook-service.json new file mode 100644 index 00000000000..118f4ea281f --- /dev/null +++ b/examples/guestbook-go/guestbook-go_v3/guestbook-service.json @@ -0,0 +1,19 @@ +{ + "kind": "Service", + "apiVersion": "v1beta3", + "metadata": { + "name": "guestbook", + "labels": { + "name": "guestbook" + } + }, + "spec": { + "port": 3000, + "containerPort": "http-server", + "protocol": "TCP", + "createExternalLoadBalancer": true, + "selector": { + "name": "guestbook" + } + } +} diff --git a/examples/guestbook-go/guestbook-go_v3/redis-master-controller.json b/examples/guestbook-go/guestbook-go_v3/redis-master-controller.json new file mode 100644 index 00000000000..c1d59b3c4bc --- /dev/null +++ b/examples/guestbook-go/guestbook-go_v3/redis-master-controller.json @@ -0,0 +1,43 @@ +{ + "kind": "ReplicationController", + "apiVersion": "v1beta3", + "id": "redis-master", + "metadata": { + "name": "redis-master", + "labels": { + "name": "redis", + "role": "master" + } + }, + "spec": { + "replicas": 1, + "selector": { + "name": "redis", + "role": "master" + }, + "template": { + "metadata": { + "name": "redis-master", + "labels": { + "name": "redis", + "role": "master" + } + }, + "spec": { + "containers": [ + { + "name": "redis-master", + "image": "gurpartap/redis", + "ports": [ + { + "name": "redis-server", + "containerPort": 6379, + "protocol": "TCP" + } + ] + } + ] + } + } + } +} diff --git a/examples/guestbook-go/guestbook-go_v3/redis-master-service.json b/examples/guestbook-go/guestbook-go_v3/redis-master-service.json new file mode 100644 index 00000000000..5d4ee9fcf7b --- /dev/null +++ b/examples/guestbook-go/guestbook-go_v3/redis-master-service.json @@ -0,0 +1,20 @@ +{ + "kind": "Service", + "apiVersion": "v1beta3", + "metadata": { + "name": "redis-master", + "labels": { + "name": "redis", + "role": "master" + } + }, + "spec": { + "port": 6379, + "containerPort": "redis-server", + "protocol": "TCP", + "selector": { + "name": "redis", + "role": "master" + } + } +} diff --git a/examples/guestbook-go/guestbook-go_v3/redis-slave-controller.json b/examples/guestbook-go/guestbook-go_v3/redis-slave-controller.json new file mode 100644 index 00000000000..7341e8ed787 --- /dev/null +++ b/examples/guestbook-go/guestbook-go_v3/redis-slave-controller.json @@ -0,0 +1,48 @@ +{ + "kind": "ReplicationController", + "apiVersion": "v1beta3", + "id": "redis-slave", + "metadata": { + "name": "redis-slave", + "labels": { + "name": "redis", + "role": "slave" + } + }, + "spec": { + "replicas": 1, + "selector": { + "name": "redis", + "role": "slave" + }, + "template": { + "metadata": { + "name": "redis-slave", + "labels": { + "name": "redis", + "role": "slave" + } + }, + "spec": { + "containers": [ + { + "name": "redis-slave", + "image": "gurpartap/redis", + "command": [ + "sh", + "-c", + "redis-server /etc/redis/redis.conf --slaveof $REDIS_MASTER_SERVICE_HOST $REDIS_MASTER_SERVICE_PORT" + ], + "ports": [ + { + "name": "redis-server", + "containerPort": 6379, + "protocol": "TCP" + } + ] + } + ] + } + } + } +} diff --git a/examples/guestbook-go/guestbook-go_v3/redis-slave-service.json b/examples/guestbook-go/guestbook-go_v3/redis-slave-service.json new file mode 100644 index 00000000000..97c1599bbb0 --- /dev/null +++ b/examples/guestbook-go/guestbook-go_v3/redis-slave-service.json @@ -0,0 +1,20 @@ +{ + "kind": "Service", + "apiVersion": "v1beta3", + "metadata": { + "name": "redis-slave", + "labels": { + "name": "redis", + "role": "slave" + } + }, + "spec": { + "port": 6379, + "containerPort": "redis-server", + "protocol": "TCP", + "selector": { + "name": "redis", + "role": "slave" + } + } +} From eb82df81b66721908d9d1d06a5b145abec0d7a5f Mon Sep 17 00:00:00 2001 From: Subin M Date: Tue, 24 Feb 2015 02:49:58 +0530 Subject: [PATCH 08/14] renaming folders --- .../{guestbook-go_v3 => v3_json_files}/guestbook-controller.json | 0 .../{guestbook-go_v3 => v3_json_files}/guestbook-service.json | 0 .../redis-master-controller.json | 0 .../{guestbook-go_v3 => v3_json_files}/redis-master-service.json | 0 .../redis-slave-controller.json | 0 .../{guestbook-go_v3 => v3_json_files}/redis-slave-service.json | 0 .../{guestbook_ns => v3_json_files}/frontend-controller.json | 0 .../{guestbook_ns => v3_json_files}/frontend-service.json | 0 .../{guestbook_ns => v3_json_files}/redis-master-service.json | 0 .../guestbook/{guestbook_ns => v3_json_files}/redis-master.json | 0 .../{guestbook_ns => v3_json_files}/redis-slave-controller.json | 0 .../{guestbook_ns => v3_json_files}/redis-slave-service.json | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename examples/guestbook-go/{guestbook-go_v3 => v3_json_files}/guestbook-controller.json (100%) rename examples/guestbook-go/{guestbook-go_v3 => v3_json_files}/guestbook-service.json (100%) rename examples/guestbook-go/{guestbook-go_v3 => v3_json_files}/redis-master-controller.json (100%) rename examples/guestbook-go/{guestbook-go_v3 => v3_json_files}/redis-master-service.json (100%) rename examples/guestbook-go/{guestbook-go_v3 => v3_json_files}/redis-slave-controller.json (100%) rename examples/guestbook-go/{guestbook-go_v3 => v3_json_files}/redis-slave-service.json (100%) rename examples/guestbook/{guestbook_ns => v3_json_files}/frontend-controller.json (100%) rename examples/guestbook/{guestbook_ns => v3_json_files}/frontend-service.json (100%) rename examples/guestbook/{guestbook_ns => v3_json_files}/redis-master-service.json (100%) rename examples/guestbook/{guestbook_ns => v3_json_files}/redis-master.json (100%) rename examples/guestbook/{guestbook_ns => v3_json_files}/redis-slave-controller.json (100%) rename examples/guestbook/{guestbook_ns => v3_json_files}/redis-slave-service.json (100%) diff --git a/examples/guestbook-go/guestbook-go_v3/guestbook-controller.json b/examples/guestbook-go/v3_json_files/guestbook-controller.json similarity index 100% rename from examples/guestbook-go/guestbook-go_v3/guestbook-controller.json rename to examples/guestbook-go/v3_json_files/guestbook-controller.json diff --git a/examples/guestbook-go/guestbook-go_v3/guestbook-service.json b/examples/guestbook-go/v3_json_files/guestbook-service.json similarity index 100% rename from examples/guestbook-go/guestbook-go_v3/guestbook-service.json rename to examples/guestbook-go/v3_json_files/guestbook-service.json diff --git a/examples/guestbook-go/guestbook-go_v3/redis-master-controller.json b/examples/guestbook-go/v3_json_files/redis-master-controller.json similarity index 100% rename from examples/guestbook-go/guestbook-go_v3/redis-master-controller.json rename to examples/guestbook-go/v3_json_files/redis-master-controller.json diff --git a/examples/guestbook-go/guestbook-go_v3/redis-master-service.json b/examples/guestbook-go/v3_json_files/redis-master-service.json similarity index 100% rename from examples/guestbook-go/guestbook-go_v3/redis-master-service.json rename to examples/guestbook-go/v3_json_files/redis-master-service.json diff --git a/examples/guestbook-go/guestbook-go_v3/redis-slave-controller.json b/examples/guestbook-go/v3_json_files/redis-slave-controller.json similarity index 100% rename from examples/guestbook-go/guestbook-go_v3/redis-slave-controller.json rename to examples/guestbook-go/v3_json_files/redis-slave-controller.json diff --git a/examples/guestbook-go/guestbook-go_v3/redis-slave-service.json b/examples/guestbook-go/v3_json_files/redis-slave-service.json similarity index 100% rename from examples/guestbook-go/guestbook-go_v3/redis-slave-service.json rename to examples/guestbook-go/v3_json_files/redis-slave-service.json diff --git a/examples/guestbook/guestbook_ns/frontend-controller.json b/examples/guestbook/v3_json_files/frontend-controller.json similarity index 100% rename from examples/guestbook/guestbook_ns/frontend-controller.json rename to examples/guestbook/v3_json_files/frontend-controller.json diff --git a/examples/guestbook/guestbook_ns/frontend-service.json b/examples/guestbook/v3_json_files/frontend-service.json similarity index 100% rename from examples/guestbook/guestbook_ns/frontend-service.json rename to examples/guestbook/v3_json_files/frontend-service.json diff --git a/examples/guestbook/guestbook_ns/redis-master-service.json b/examples/guestbook/v3_json_files/redis-master-service.json similarity index 100% rename from examples/guestbook/guestbook_ns/redis-master-service.json rename to examples/guestbook/v3_json_files/redis-master-service.json diff --git a/examples/guestbook/guestbook_ns/redis-master.json b/examples/guestbook/v3_json_files/redis-master.json similarity index 100% rename from examples/guestbook/guestbook_ns/redis-master.json rename to examples/guestbook/v3_json_files/redis-master.json diff --git a/examples/guestbook/guestbook_ns/redis-slave-controller.json b/examples/guestbook/v3_json_files/redis-slave-controller.json similarity index 100% rename from examples/guestbook/guestbook_ns/redis-slave-controller.json rename to examples/guestbook/v3_json_files/redis-slave-controller.json diff --git a/examples/guestbook/guestbook_ns/redis-slave-service.json b/examples/guestbook/v3_json_files/redis-slave-service.json similarity index 100% rename from examples/guestbook/guestbook_ns/redis-slave-service.json rename to examples/guestbook/v3_json_files/redis-slave-service.json From 23a177c5ab8d371b80f6c93b8f41672205e989ae Mon Sep 17 00:00:00 2001 From: Subin M Date: Tue, 24 Feb 2015 02:54:16 +0530 Subject: [PATCH 09/14] updating testcases --- examples/examples_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/examples_test.go b/examples/examples_test.go index dd504974ee7..da80838e5fe 100644 --- a/examples/examples_test.go +++ b/examples/examples_test.go @@ -115,7 +115,7 @@ func TestExampleObjectSchemas(t *testing.T) { "redis-master-service": &api.Service{}, "redis-slave-service": &api.Service{}, }, - "../examples/guestbook/guestbook_ns": { + "../examples/guestbook/v3_json_files": { "frontend-controller": &api.ReplicationController{}, "redis-slave-controller": &api.ReplicationController{}, "redis-master": &api.ReplicationController{}, From fd3d60f72b86d142c5bdb37d96c75b95f9fbf94c Mon Sep 17 00:00:00 2001 From: Subin M Date: Tue, 24 Feb 2015 03:00:36 +0530 Subject: [PATCH 10/14] updating testcases --- examples/examples_test.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/examples/examples_test.go b/examples/examples_test.go index da80838e5fe..57c3662893b 100644 --- a/examples/examples_test.go +++ b/examples/examples_test.go @@ -123,6 +123,22 @@ func TestExampleObjectSchemas(t *testing.T) { "redis-master-service": &api.Service{}, "redis-slave-service": &api.Service{}, }, + "../examples/guestbook-go": { + "guestbook-controller": &api.ReplicationController{}, + "redis-slave-controller": &api.ReplicationController{}, + "redis-master-controller": &api.ReplicationController{}, + "guestbook-service": &api.Service{}, + "redis-master-service": &api.Service{}, + "redis-slave-service": &api.Service{}, + }, + "../examples/guestbook-go/v3_json_files": { + "guestbook-controller": &api.ReplicationController{}, + "redis-slave-controller": &api.ReplicationController{}, + "redis-master-controller": &api.ReplicationController{}, + "guestbook-service": &api.Service{}, + "redis-master-service": &api.Service{}, + "redis-slave-service": &api.Service{}, + }, "../examples/walkthrough": { "pod1": &api.Pod{}, "pod2": &api.Pod{}, From 95c225584ee723251048c9b07e520ba12e83d027 Mon Sep 17 00:00:00 2001 From: Subin M Date: Tue, 24 Feb 2015 03:17:22 +0530 Subject: [PATCH 11/14] renaming folder to v1beta3 and updating testcases --- examples/examples_test.go | 4 ++-- examples/guestbook-go/v1beta3/README.md | 14 ++++++++++++++ .../guestbook-controller.json | 0 .../guestbook-service.json | 0 .../redis-master-controller.json | 0 .../redis-master-service.json | 0 .../redis-slave-controller.json | 0 .../redis-slave-service.json | 0 examples/guestbook/v1beta3/README.md | 14 ++++++++++++++ .../frontend-controller.json | 0 .../frontend-service.json | 0 .../redis-master-service.json | 0 .../{v3_json_files => v1beta3}/redis-master.json | 0 .../redis-slave-controller.json | 0 .../redis-slave-service.json | 0 15 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 examples/guestbook-go/v1beta3/README.md rename examples/guestbook-go/{v3_json_files => v1beta3}/guestbook-controller.json (100%) rename examples/guestbook-go/{v3_json_files => v1beta3}/guestbook-service.json (100%) rename examples/guestbook-go/{v3_json_files => v1beta3}/redis-master-controller.json (100%) rename examples/guestbook-go/{v3_json_files => v1beta3}/redis-master-service.json (100%) rename examples/guestbook-go/{v3_json_files => v1beta3}/redis-slave-controller.json (100%) rename examples/guestbook-go/{v3_json_files => v1beta3}/redis-slave-service.json (100%) create mode 100644 examples/guestbook/v1beta3/README.md rename examples/guestbook/{v3_json_files => v1beta3}/frontend-controller.json (100%) rename examples/guestbook/{v3_json_files => v1beta3}/frontend-service.json (100%) rename examples/guestbook/{v3_json_files => v1beta3}/redis-master-service.json (100%) rename examples/guestbook/{v3_json_files => v1beta3}/redis-master.json (100%) rename examples/guestbook/{v3_json_files => v1beta3}/redis-slave-controller.json (100%) rename examples/guestbook/{v3_json_files => v1beta3}/redis-slave-service.json (100%) diff --git a/examples/examples_test.go b/examples/examples_test.go index 57c3662893b..d04479accad 100644 --- a/examples/examples_test.go +++ b/examples/examples_test.go @@ -115,7 +115,7 @@ func TestExampleObjectSchemas(t *testing.T) { "redis-master-service": &api.Service{}, "redis-slave-service": &api.Service{}, }, - "../examples/guestbook/v3_json_files": { + "../examples/guestbook/v1beta3": { "frontend-controller": &api.ReplicationController{}, "redis-slave-controller": &api.ReplicationController{}, "redis-master": &api.ReplicationController{}, @@ -131,7 +131,7 @@ func TestExampleObjectSchemas(t *testing.T) { "redis-master-service": &api.Service{}, "redis-slave-service": &api.Service{}, }, - "../examples/guestbook-go/v3_json_files": { + "../examples/guestbook-go/v1beta3": { "guestbook-controller": &api.ReplicationController{}, "redis-slave-controller": &api.ReplicationController{}, "redis-master-controller": &api.ReplicationController{}, diff --git a/examples/guestbook-go/v1beta3/README.md b/examples/guestbook-go/v1beta3/README.md new file mode 100644 index 00000000000..91ba177e2a5 --- /dev/null +++ b/examples/guestbook-go/v1beta3/README.md @@ -0,0 +1,14 @@ +## GuestBook v1beta3 example + +This example shows how to build a simple, multi-tier web application using Kubernetes and Docker. + +The example consists of: +- A web frontend +- A redis master (for storage and a replicated set of redis slaves) + +The web front end interacts with the redis master via javascript redis API calls. + +The v1beta3 API is not enabled by default. The kube-apiserver process needs to run with the --runtime_config=api/v1beta3 argument. Use the following command to enable it: +$sudo sed -i 's|KUBE_API_ARGS="|KUBE_API_ARGS="--runtime_config=api/v1beta3 |' /etc/kubernetes/apiserver + + diff --git a/examples/guestbook-go/v3_json_files/guestbook-controller.json b/examples/guestbook-go/v1beta3/guestbook-controller.json similarity index 100% rename from examples/guestbook-go/v3_json_files/guestbook-controller.json rename to examples/guestbook-go/v1beta3/guestbook-controller.json diff --git a/examples/guestbook-go/v3_json_files/guestbook-service.json b/examples/guestbook-go/v1beta3/guestbook-service.json similarity index 100% rename from examples/guestbook-go/v3_json_files/guestbook-service.json rename to examples/guestbook-go/v1beta3/guestbook-service.json diff --git a/examples/guestbook-go/v3_json_files/redis-master-controller.json b/examples/guestbook-go/v1beta3/redis-master-controller.json similarity index 100% rename from examples/guestbook-go/v3_json_files/redis-master-controller.json rename to examples/guestbook-go/v1beta3/redis-master-controller.json diff --git a/examples/guestbook-go/v3_json_files/redis-master-service.json b/examples/guestbook-go/v1beta3/redis-master-service.json similarity index 100% rename from examples/guestbook-go/v3_json_files/redis-master-service.json rename to examples/guestbook-go/v1beta3/redis-master-service.json diff --git a/examples/guestbook-go/v3_json_files/redis-slave-controller.json b/examples/guestbook-go/v1beta3/redis-slave-controller.json similarity index 100% rename from examples/guestbook-go/v3_json_files/redis-slave-controller.json rename to examples/guestbook-go/v1beta3/redis-slave-controller.json diff --git a/examples/guestbook-go/v3_json_files/redis-slave-service.json b/examples/guestbook-go/v1beta3/redis-slave-service.json similarity index 100% rename from examples/guestbook-go/v3_json_files/redis-slave-service.json rename to examples/guestbook-go/v1beta3/redis-slave-service.json diff --git a/examples/guestbook/v1beta3/README.md b/examples/guestbook/v1beta3/README.md new file mode 100644 index 00000000000..91ba177e2a5 --- /dev/null +++ b/examples/guestbook/v1beta3/README.md @@ -0,0 +1,14 @@ +## GuestBook v1beta3 example + +This example shows how to build a simple, multi-tier web application using Kubernetes and Docker. + +The example consists of: +- A web frontend +- A redis master (for storage and a replicated set of redis slaves) + +The web front end interacts with the redis master via javascript redis API calls. + +The v1beta3 API is not enabled by default. The kube-apiserver process needs to run with the --runtime_config=api/v1beta3 argument. Use the following command to enable it: +$sudo sed -i 's|KUBE_API_ARGS="|KUBE_API_ARGS="--runtime_config=api/v1beta3 |' /etc/kubernetes/apiserver + + diff --git a/examples/guestbook/v3_json_files/frontend-controller.json b/examples/guestbook/v1beta3/frontend-controller.json similarity index 100% rename from examples/guestbook/v3_json_files/frontend-controller.json rename to examples/guestbook/v1beta3/frontend-controller.json diff --git a/examples/guestbook/v3_json_files/frontend-service.json b/examples/guestbook/v1beta3/frontend-service.json similarity index 100% rename from examples/guestbook/v3_json_files/frontend-service.json rename to examples/guestbook/v1beta3/frontend-service.json diff --git a/examples/guestbook/v3_json_files/redis-master-service.json b/examples/guestbook/v1beta3/redis-master-service.json similarity index 100% rename from examples/guestbook/v3_json_files/redis-master-service.json rename to examples/guestbook/v1beta3/redis-master-service.json diff --git a/examples/guestbook/v3_json_files/redis-master.json b/examples/guestbook/v1beta3/redis-master.json similarity index 100% rename from examples/guestbook/v3_json_files/redis-master.json rename to examples/guestbook/v1beta3/redis-master.json diff --git a/examples/guestbook/v3_json_files/redis-slave-controller.json b/examples/guestbook/v1beta3/redis-slave-controller.json similarity index 100% rename from examples/guestbook/v3_json_files/redis-slave-controller.json rename to examples/guestbook/v1beta3/redis-slave-controller.json diff --git a/examples/guestbook/v3_json_files/redis-slave-service.json b/examples/guestbook/v1beta3/redis-slave-service.json similarity index 100% rename from examples/guestbook/v3_json_files/redis-slave-service.json rename to examples/guestbook/v1beta3/redis-slave-service.json From ea0a873417a766ceeddb56d8cd0acc949c77625e Mon Sep 17 00:00:00 2001 From: Subin M Date: Tue, 24 Feb 2015 03:57:09 +0530 Subject: [PATCH 12/14] removing LoadBalancer --- examples/guestbook-go/v1beta3/guestbook-service.json | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/guestbook-go/v1beta3/guestbook-service.json b/examples/guestbook-go/v1beta3/guestbook-service.json index 118f4ea281f..0e5bb736511 100644 --- a/examples/guestbook-go/v1beta3/guestbook-service.json +++ b/examples/guestbook-go/v1beta3/guestbook-service.json @@ -11,7 +11,6 @@ "port": 3000, "containerPort": "http-server", "protocol": "TCP", - "createExternalLoadBalancer": true, "selector": { "name": "guestbook" } From 62cb5b875fe950f2fd21237a792d5e000056f9b1 Mon Sep 17 00:00:00 2001 From: Subin M Date: Tue, 24 Feb 2015 04:07:49 +0530 Subject: [PATCH 13/14] removing name from template --- examples/guestbook-go/v1beta3/guestbook-controller.json | 1 - examples/guestbook-go/v1beta3/redis-master-controller.json | 1 - examples/guestbook-go/v1beta3/redis-slave-controller.json | 1 - examples/guestbook/v1beta3/frontend-controller.json | 1 - examples/guestbook/v1beta3/redis-master.json | 1 - examples/guestbook/v1beta3/redis-slave-controller.json | 1 - 6 files changed, 6 deletions(-) diff --git a/examples/guestbook-go/v1beta3/guestbook-controller.json b/examples/guestbook-go/v1beta3/guestbook-controller.json index 1cf219319c7..9f3d2dc244b 100644 --- a/examples/guestbook-go/v1beta3/guestbook-controller.json +++ b/examples/guestbook-go/v1beta3/guestbook-controller.json @@ -14,7 +14,6 @@ }, "template": { "metadata": { - "name": "guestbook", "labels": { "name": "guestbook" } diff --git a/examples/guestbook-go/v1beta3/redis-master-controller.json b/examples/guestbook-go/v1beta3/redis-master-controller.json index c1d59b3c4bc..c7f06e00629 100644 --- a/examples/guestbook-go/v1beta3/redis-master-controller.json +++ b/examples/guestbook-go/v1beta3/redis-master-controller.json @@ -17,7 +17,6 @@ }, "template": { "metadata": { - "name": "redis-master", "labels": { "name": "redis", "role": "master" diff --git a/examples/guestbook-go/v1beta3/redis-slave-controller.json b/examples/guestbook-go/v1beta3/redis-slave-controller.json index 7341e8ed787..ddb46932b0f 100644 --- a/examples/guestbook-go/v1beta3/redis-slave-controller.json +++ b/examples/guestbook-go/v1beta3/redis-slave-controller.json @@ -17,7 +17,6 @@ }, "template": { "metadata": { - "name": "redis-slave", "labels": { "name": "redis", "role": "slave" diff --git a/examples/guestbook/v1beta3/frontend-controller.json b/examples/guestbook/v1beta3/frontend-controller.json index 536be9f78b2..06518180078 100644 --- a/examples/guestbook/v1beta3/frontend-controller.json +++ b/examples/guestbook/v1beta3/frontend-controller.json @@ -14,7 +14,6 @@ }, "template": { "metadata": { - "name": "frontend", "labels": { "name": "frontend" } diff --git a/examples/guestbook/v1beta3/redis-master.json b/examples/guestbook/v1beta3/redis-master.json index 74293b9c275..26b9581fa7e 100644 --- a/examples/guestbook/v1beta3/redis-master.json +++ b/examples/guestbook/v1beta3/redis-master.json @@ -14,7 +14,6 @@ }, "template": { "metadata": { - "name": "redis-master", "labels": { "name": "redis-master" } diff --git a/examples/guestbook/v1beta3/redis-slave-controller.json b/examples/guestbook/v1beta3/redis-slave-controller.json index 12dd37dffcc..28a1384e422 100644 --- a/examples/guestbook/v1beta3/redis-slave-controller.json +++ b/examples/guestbook/v1beta3/redis-slave-controller.json @@ -14,7 +14,6 @@ }, "template": { "metadata": { - "name": "redis-slave", "labels": { "name": "redis-slave" } From 7d00c456d500a7d9cc17fcb5e1d34e46a5baf308 Mon Sep 17 00:00:00 2001 From: Subin M Date: Tue, 24 Feb 2015 04:20:32 +0530 Subject: [PATCH 14/14] format all json files --- .../v1beta3/guestbook-controller.json | 70 +++++++-------- .../v1beta3/guestbook-service.json | 32 +++---- .../v1beta3/redis-master-controller.json | 78 ++++++++-------- .../v1beta3/redis-master-service.json | 36 ++++---- .../v1beta3/redis-slave-controller.json | 88 +++++++++---------- .../v1beta3/redis-slave-service.json | 36 ++++---- .../v1beta3/frontend-controller.json | 68 +++++++------- .../guestbook/v1beta3/frontend-service.json | 30 ++++--- .../v1beta3/redis-master-service.json | 32 +++---- examples/guestbook/v1beta3/redis-master.json | 68 +++++++------- .../v1beta3/redis-slave-controller.json | 69 +++++++-------- .../v1beta3/redis-slave-service.json | 32 +++---- 12 files changed, 320 insertions(+), 319 deletions(-) diff --git a/examples/guestbook-go/v1beta3/guestbook-controller.json b/examples/guestbook-go/v1beta3/guestbook-controller.json index 9f3d2dc244b..4441d9748ce 100644 --- a/examples/guestbook-go/v1beta3/guestbook-controller.json +++ b/examples/guestbook-go/v1beta3/guestbook-controller.json @@ -1,38 +1,38 @@ { - "kind": "ReplicationController", - "apiVersion": "v1beta3", - "metadata": { - "name": "guestbook", - "labels": { - "name": "guestbook" - } - }, - "spec": { - "replicas": 3, - "selector": { - "name": "guestbook" - }, - "template": { - "metadata": { - "labels": { - "name": "guestbook" - } - }, - "spec": { - "containers": [ - { - "image": "kubernetes/guestbook", - "name": "guestbook", - "ports": [ - { - "name": "http-server", - "containerPort": 3000, - "protocol": "TCP" - } - ] - } - ] + "kind":"ReplicationController", + "apiVersion":"v1beta3", + "metadata":{ + "name":"guestbook", + "labels":{ + "name":"guestbook" + } + }, + "spec":{ + "replicas":3, + "selector":{ + "name":"guestbook" + }, + "template":{ + "metadata":{ + "labels":{ + "name":"guestbook" } - } - } + }, + "spec":{ + "containers":[ + { + "image":"kubernetes/guestbook", + "name":"guestbook", + "ports":[ + { + "name":"http-server", + "containerPort":3000, + "protocol":"TCP" + } + ] + } + ] + } + } + } } diff --git a/examples/guestbook-go/v1beta3/guestbook-service.json b/examples/guestbook-go/v1beta3/guestbook-service.json index 0e5bb736511..c7973217e81 100644 --- a/examples/guestbook-go/v1beta3/guestbook-service.json +++ b/examples/guestbook-go/v1beta3/guestbook-service.json @@ -1,18 +1,18 @@ { - "kind": "Service", - "apiVersion": "v1beta3", - "metadata": { - "name": "guestbook", - "labels": { - "name": "guestbook" - } - }, - "spec": { - "port": 3000, - "containerPort": "http-server", - "protocol": "TCP", - "selector": { - "name": "guestbook" - } - } + "kind":"Service", + "apiVersion":"v1beta3", + "metadata":{ + "name":"guestbook", + "labels":{ + "name":"guestbook" + } + }, + "spec":{ + "port":3000, + "containerPort":"http-server", + "protocol":"TCP", + "selector":{ + "name":"guestbook" + } + } } diff --git a/examples/guestbook-go/v1beta3/redis-master-controller.json b/examples/guestbook-go/v1beta3/redis-master-controller.json index c7f06e00629..2ca918e7398 100644 --- a/examples/guestbook-go/v1beta3/redis-master-controller.json +++ b/examples/guestbook-go/v1beta3/redis-master-controller.json @@ -1,42 +1,42 @@ { - "kind": "ReplicationController", - "apiVersion": "v1beta3", - "id": "redis-master", - "metadata": { - "name": "redis-master", - "labels": { - "name": "redis", - "role": "master" - } - }, - "spec": { - "replicas": 1, - "selector": { - "name": "redis", - "role": "master" - }, - "template": { - "metadata": { - "labels": { - "name": "redis", - "role": "master" - } - }, - "spec": { - "containers": [ - { - "name": "redis-master", - "image": "gurpartap/redis", - "ports": [ - { - "name": "redis-server", - "containerPort": 6379, - "protocol": "TCP" - } - ] - } - ] + "kind":"ReplicationController", + "apiVersion":"v1beta3", + "id":"redis-master", + "metadata":{ + "name":"redis-master", + "labels":{ + "name":"redis", + "role":"master" + } + }, + "spec":{ + "replicas":1, + "selector":{ + "name":"redis", + "role":"master" + }, + "template":{ + "metadata":{ + "labels":{ + "name":"redis", + "role":"master" } - } - } + }, + "spec":{ + "containers":[ + { + "name":"redis-master", + "image":"gurpartap/redis", + "ports":[ + { + "name":"redis-server", + "containerPort":6379, + "protocol":"TCP" + } + ] + } + ] + } + } + } } diff --git a/examples/guestbook-go/v1beta3/redis-master-service.json b/examples/guestbook-go/v1beta3/redis-master-service.json index 5d4ee9fcf7b..2296638efba 100644 --- a/examples/guestbook-go/v1beta3/redis-master-service.json +++ b/examples/guestbook-go/v1beta3/redis-master-service.json @@ -1,20 +1,20 @@ { - "kind": "Service", - "apiVersion": "v1beta3", - "metadata": { - "name": "redis-master", - "labels": { - "name": "redis", - "role": "master" - } - }, - "spec": { - "port": 6379, - "containerPort": "redis-server", - "protocol": "TCP", - "selector": { - "name": "redis", - "role": "master" - } - } + "kind":"Service", + "apiVersion":"v1beta3", + "metadata":{ + "name":"redis-master", + "labels":{ + "name":"redis", + "role":"master" + } + }, + "spec":{ + "port":6379, + "containerPort":"redis-server", + "protocol":"TCP", + "selector":{ + "name":"redis", + "role":"master" + } + } } diff --git a/examples/guestbook-go/v1beta3/redis-slave-controller.json b/examples/guestbook-go/v1beta3/redis-slave-controller.json index ddb46932b0f..af4f23e70c2 100644 --- a/examples/guestbook-go/v1beta3/redis-slave-controller.json +++ b/examples/guestbook-go/v1beta3/redis-slave-controller.json @@ -1,47 +1,47 @@ { - "kind": "ReplicationController", - "apiVersion": "v1beta3", - "id": "redis-slave", - "metadata": { - "name": "redis-slave", - "labels": { - "name": "redis", - "role": "slave" - } - }, - "spec": { - "replicas": 1, - "selector": { - "name": "redis", - "role": "slave" - }, - "template": { - "metadata": { - "labels": { - "name": "redis", - "role": "slave" - } - }, - "spec": { - "containers": [ - { - "name": "redis-slave", - "image": "gurpartap/redis", - "command": [ - "sh", - "-c", - "redis-server /etc/redis/redis.conf --slaveof $REDIS_MASTER_SERVICE_HOST $REDIS_MASTER_SERVICE_PORT" - ], - "ports": [ - { - "name": "redis-server", - "containerPort": 6379, - "protocol": "TCP" - } - ] - } - ] + "kind":"ReplicationController", + "apiVersion":"v1beta3", + "id":"redis-slave", + "metadata":{ + "name":"redis-slave", + "labels":{ + "name":"redis", + "role":"slave" + } + }, + "spec":{ + "replicas":1, + "selector":{ + "name":"redis", + "role":"slave" + }, + "template":{ + "metadata":{ + "labels":{ + "name":"redis", + "role":"slave" } - } - } + }, + "spec":{ + "containers":[ + { + "name":"redis-slave", + "image":"gurpartap/redis", + "command":[ + "sh", + "-c", + "redis-server /etc/redis/redis.conf --slaveof $REDIS_MASTER_SERVICE_HOST $REDIS_MASTER_SERVICE_PORT" + ], + "ports":[ + { + "name":"redis-server", + "containerPort":6379, + "protocol":"TCP" + } + ] + } + ] + } + } + } } diff --git a/examples/guestbook-go/v1beta3/redis-slave-service.json b/examples/guestbook-go/v1beta3/redis-slave-service.json index 97c1599bbb0..04b4861aa3b 100644 --- a/examples/guestbook-go/v1beta3/redis-slave-service.json +++ b/examples/guestbook-go/v1beta3/redis-slave-service.json @@ -1,20 +1,20 @@ { - "kind": "Service", - "apiVersion": "v1beta3", - "metadata": { - "name": "redis-slave", - "labels": { - "name": "redis", - "role": "slave" - } - }, - "spec": { - "port": 6379, - "containerPort": "redis-server", - "protocol": "TCP", - "selector": { - "name": "redis", - "role": "slave" - } - } + "kind":"Service", + "apiVersion":"v1beta3", + "metadata":{ + "name":"redis-slave", + "labels":{ + "name":"redis", + "role":"slave" + } + }, + "spec":{ + "port":6379, + "containerPort":"redis-server", + "protocol":"TCP", + "selector":{ + "name":"redis", + "role":"slave" + } + } } diff --git a/examples/guestbook/v1beta3/frontend-controller.json b/examples/guestbook/v1beta3/frontend-controller.json index 06518180078..6f7cf2700f3 100644 --- a/examples/guestbook/v1beta3/frontend-controller.json +++ b/examples/guestbook/v1beta3/frontend-controller.json @@ -1,37 +1,37 @@ { - "kind": "ReplicationController", - "apiVersion": "v1beta3", - "metadata": { - "name": "frontend", - "labels": { - "name": "frontend" - } - }, - "spec": { - "replicas": 2, - "selector": { - "name": "frontend" - }, - "template": { - "metadata": { - "labels": { - "name": "frontend" - } - }, - "spec": { - "containers": [ - { - "name": "php-redis", - "image": "kubernetes/example-guestbook-php-redis", - "ports": [ - { - "containerPort": 80, - "protocol": "TCP" - } - ] - } - ] + "kind":"ReplicationController", + "apiVersion":"v1beta3", + "metadata":{ + "name":"frontend", + "labels":{ + "name":"frontend" + } + }, + "spec":{ + "replicas":2, + "selector":{ + "name":"frontend" + }, + "template":{ + "metadata":{ + "labels":{ + "name":"frontend" } - } - } + }, + "spec":{ + "containers":[ + { + "name":"php-redis", + "image":"kubernetes/example-guestbook-php-redis", + "ports":[ + { + "containerPort":80, + "protocol":"TCP" + } + ] + } + ] + } + } + } } diff --git a/examples/guestbook/v1beta3/frontend-service.json b/examples/guestbook/v1beta3/frontend-service.json index fd5cf3699d3..0921ba7fcb4 100644 --- a/examples/guestbook/v1beta3/frontend-service.json +++ b/examples/guestbook/v1beta3/frontend-service.json @@ -1,16 +1,18 @@ { - "kind": "Service", - "apiVersion": "v1beta3", - "metadata": { - "name": "frontend", - "labels": {"name": "frontend"}, - }, - "spec": { - "port": 80, - "containerPort": 80, - "protocol": "TCP", - "selector": { - "name": "frontend" - } - } + "kind":"Service", + "apiVersion":"v1beta3", + "metadata":{ + "name":"frontend", + "labels":{ + "name":"frontend" + } + }, + "spec":{ + "port":80, + "containerPort":80, + "protocol":"TCP", + "selector":{ + "name":"frontend" + } + } } diff --git a/examples/guestbook/v1beta3/redis-master-service.json b/examples/guestbook/v1beta3/redis-master-service.json index 0b0ee9eb3b6..c22669b62bf 100644 --- a/examples/guestbook/v1beta3/redis-master-service.json +++ b/examples/guestbook/v1beta3/redis-master-service.json @@ -1,18 +1,18 @@ { - "kind": "Service", - "apiVersion": "v1beta3", - "metadata": { - "name": "redis-master", - "labels": { - "name": "redis-master" - } - }, - "spec": { - "port": 6379, - "containerPort": 6379, - "protocol": "TCP", - "selector": { - "name": "redis-master" - } - } + "kind":"Service", + "apiVersion":"v1beta3", + "metadata":{ + "name":"redis-master", + "labels":{ + "name":"redis-master" + } + }, + "spec":{ + "port":6379, + "containerPort":6379, + "protocol":"TCP", + "selector":{ + "name":"redis-master" + } + } } diff --git a/examples/guestbook/v1beta3/redis-master.json b/examples/guestbook/v1beta3/redis-master.json index 26b9581fa7e..cdce5b22dd5 100644 --- a/examples/guestbook/v1beta3/redis-master.json +++ b/examples/guestbook/v1beta3/redis-master.json @@ -1,37 +1,37 @@ { - "kind": "ReplicationController", - "apiVersion": "v1beta3", - "metadata": { - "name": "redis-master", - "labels": { - "name": "redis-master" - } - }, - "spec": { - "replicas": 1, - "selector": { - "name": "redis-master" - }, - "template": { - "metadata": { - "labels": { - "name": "redis-master" - } - }, - "spec": { - "containers": [ - { - "name": "master", - "image": "dockerfile/redis", - "ports": [ - { - "containerPort": 6379, - "protocol": "TCP" - } - ] - } - ] + "kind":"ReplicationController", + "apiVersion":"v1beta3", + "metadata":{ + "name":"redis-master", + "labels":{ + "name":"redis-master" + } + }, + "spec":{ + "replicas":1, + "selector":{ + "name":"redis-master" + }, + "template":{ + "metadata":{ + "labels":{ + "name":"redis-master" } - } - } + }, + "spec":{ + "containers":[ + { + "name":"master", + "image":"dockerfile/redis", + "ports":[ + { + "containerPort":6379, + "protocol":"TCP" + } + ] + } + ] + } + } + } } diff --git a/examples/guestbook/v1beta3/redis-slave-controller.json b/examples/guestbook/v1beta3/redis-slave-controller.json index 28a1384e422..d4942ad54bb 100644 --- a/examples/guestbook/v1beta3/redis-slave-controller.json +++ b/examples/guestbook/v1beta3/redis-slave-controller.json @@ -1,38 +1,37 @@ { - "kind": "ReplicationController", - "apiVersion": "v1beta3", - "metadata": { - "name": "redis-slave", - "labels": { - "name": "redis-slave" - } - }, - "spec": { - "replicas": 2, - "selector": { - "name": "redis-slave" - }, - "template": { - "metadata": { - "labels": { - "name": "redis-slave" - } - }, - "spec": { - "containers": [ - { - "name": "slave", - "image": "brendanburns/redis-slave", - "ports": [ - { - "containerPort": 6379, - "protocol": "TCP" - } - ] - } - ] + "kind":"ReplicationController", + "apiVersion":"v1beta3", + "metadata":{ + "name":"redis-slave", + "labels":{ + "name":"redis-slave" + } + }, + "spec":{ + "replicas":2, + "selector":{ + "name":"redis-slave" + }, + "template":{ + "metadata":{ + "labels":{ + "name":"redis-slave" } - } - } + }, + "spec":{ + "containers":[ + { + "name":"slave", + "image":"brendanburns/redis-slave", + "ports":[ + { + "containerPort":6379, + "protocol":"TCP" + } + ] + } + ] + } + } + } } - diff --git a/examples/guestbook/v1beta3/redis-slave-service.json b/examples/guestbook/v1beta3/redis-slave-service.json index ceeb9e155fb..ad8ddf92d61 100644 --- a/examples/guestbook/v1beta3/redis-slave-service.json +++ b/examples/guestbook/v1beta3/redis-slave-service.json @@ -1,18 +1,18 @@ { - "kind": "Service", - "apiVersion": "v1beta3", - "metadata": { - "name": "redis-slave", - "labels": { - "name": "redis-slave" - } - }, - "spec": { - "port": 6379, - "containerPort": 6379, - "protocol": "TCP", - "selector": { - "name": "redis-slave" - } - } + "kind":"Service", + "apiVersion":"v1beta3", + "metadata":{ + "name":"redis-slave", + "labels":{ + "name":"redis-slave" + } + }, + "spec":{ + "port":6379, + "containerPort":6379, + "protocol":"TCP", + "selector":{ + "name":"redis-slave" + } + } }