renaming folder to v1beta3 and updating testcases

satnam6502 · Feb 23, 2015 · 95c2255 · 95c2255
1 parent fd3d60f
commit 95c2255
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 2 deletions.
diff --git 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
@@ -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/...o/v3_json_files/guestbook-controller.json → ...book-go/v1beta3/guestbook-controller.json b/...o/v3_json_files/guestbook-controller.json → ...book-go/v1beta3/guestbook-controller.json
diff --git a/...k-go/v3_json_files/guestbook-service.json → ...estbook-go/v1beta3/guestbook-service.json b/...k-go/v3_json_files/guestbook-service.json → ...estbook-go/v1beta3/guestbook-service.json
diff --git a/...3_json_files/redis-master-controller.json → ...k-go/v1beta3/redis-master-controller.json b/...3_json_files/redis-master-controller.json → ...k-go/v1beta3/redis-master-controller.json
diff --git a/...o/v3_json_files/redis-master-service.json → ...book-go/v1beta3/redis-master-service.json b/...o/v3_json_files/redis-master-service.json → ...book-go/v1beta3/redis-master-service.json
diff --git a/...v3_json_files/redis-slave-controller.json → ...ok-go/v1beta3/redis-slave-controller.json b/...v3_json_files/redis-slave-controller.json → ...ok-go/v1beta3/redis-slave-controller.json
diff --git a/...go/v3_json_files/redis-slave-service.json → ...tbook-go/v1beta3/redis-slave-service.json b/...go/v3_json_files/redis-slave-service.json → ...tbook-go/v1beta3/redis-slave-service.json
diff --git a/examples/guestbook/v1beta3/README.md 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/...ok/v3_json_files/frontend-controller.json → ...uestbook/v1beta3/frontend-controller.json b/...ok/v3_json_files/frontend-controller.json → ...uestbook/v1beta3/frontend-controller.json
diff --git a/...tbook/v3_json_files/frontend-service.json → ...s/guestbook/v1beta3/frontend-service.json b/...tbook/v3_json_files/frontend-service.json → ...s/guestbook/v1beta3/frontend-service.json
diff --git a/...k/v3_json_files/redis-master-service.json → ...estbook/v1beta3/redis-master-service.json b/...k/v3_json_files/redis-master-service.json → ...estbook/v1beta3/redis-master-service.json
diff --git a/...guestbook/v3_json_files/redis-master.json → examples/guestbook/v1beta3/redis-master.json b/...guestbook/v3_json_files/redis-master.json → examples/guestbook/v1beta3/redis-master.json
diff --git a/...v3_json_files/redis-slave-controller.json → ...tbook/v1beta3/redis-slave-controller.json b/...v3_json_files/redis-slave-controller.json → ...tbook/v1beta3/redis-slave-controller.json
diff --git a/...ok/v3_json_files/redis-slave-service.json → ...uestbook/v1beta3/redis-slave-service.json b/...ok/v3_json_files/redis-slave-service.json → ...uestbook/v1beta3/redis-slave-service.json