Merge pull request #13025 from pires/example_elasticsearch

Revamped Elasticsearch example
2015-09-04 12:28:17 -07:00
parent 80cda53b9f 0a64995b7b
commit e4fbfa9777
21 changed files with 618 additions and 873 deletions
--- a/examples/examples_test.go
+++ b/examples/examples_test.go
@@ -240,9 +240,9 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"dapi-volume": &api.Pod{},
 		},
 		"../examples/elasticsearch": {
-			"mytunes-namespace": &api.Namespace{},
-			"music-rc":          &api.ReplicationController{},
-			"music-service":     &api.Service{},
+			"es-rc":           &api.ReplicationController{},
+			"es-svc":          &api.Service{},
+			"service-account": nil,
 		},
 		"../examples/explorer": {
 			"pod": &api.Pod{},