From f666131b5ab4bbb57a7817295f28f83ff4426f61 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Thu, 19 Jun 2014 14:54:52 -0700 Subject: [PATCH] Fix schema, regen docs --- api/doc/service-schema.json | 2 +- api/kubernetes.html | 30 +++++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/api/doc/service-schema.json b/api/doc/service-schema.json index f5a8aba95f7..097c95482c9 100644 --- a/api/doc/service-schema.json +++ b/api/doc/service-schema.json @@ -31,7 +31,7 @@ "labels": { "type": "object", "required": false - } + }, "selector": { "type": "object", "required": false diff --git a/api/kubernetes.html b/api/kubernetes.html index b6cfcae98f0..df5d77a8fdb 100644 --- a/api/kubernetes.html +++ b/api/kubernetes.html @@ -1570,6 +1570,9 @@ implemented, either.

"labels": { "name": "nginx" } + "selector": { + "name": "nginx" + } }, { "id": "example2", @@ -1578,6 +1581,10 @@ implemented, either.

"env": "prod", "name": "jetty" } + "selector": { + "env": "prod", + "name": "jetty" + } } ] } @@ -1663,6 +1670,10 @@ implemented, either.

"labels": { "type": "object", "required": false + }, + "selector": { + "type": "object", + "required": false } } } @@ -1671,11 +1682,14 @@ implemented, either.

Example: 
{
-  "id": "example2",
+  "id": "example",
   "port": 8000,
   "labels": {
      "name": "nginx"
   }
+  "selector": {
+     "name": "nginx"
+  }
 }
@@ -1791,11 +1805,14 @@ implemented, either.

Example: 
{
-  "id": "example2",
+  "id": "example",
   "port": 8000,
   "labels": {
      "name": "nginx"
   }
+  "selector": {
+     "name": "nginx"
+  }
 }
@@ -1886,6 +1903,10 @@ implemented, either.

"labels": { "type": "object", "required": false + }, + "selector": { + "type": "object", + "required": false } } } @@ -1894,11 +1915,14 @@ implemented, either.

Example: 
{
-  "id": "example2",
+  "id": "example",
   "port": 8000,
   "labels": {
      "name": "nginx"
   }
+  "selector": {
+     "name": "nginx"
+  }
 }