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