Merge pull request #981 from bgrant0607/master

Add containerPort to service schema. Regenerate HTML. Add instructions f...

README.md

@@ -179,7 +179,7 @@ git fetch upstream
 git rebase upstream/master
 ```
 
-### Regenerating the documentation
+### Regenerating the API documentation
 
 ```
 cd kubernetes/api
@@ -187,3 +187,8 @@ sudo docker build -t kubernetes/raml2html .
 sudo docker run --name="docgen" kubernetes/raml2html
 sudo docker cp docgen:/data/kubernetes.html .
 ```
+
+View the API documentation using htmlpreview (works on your fork, too):
+```
+http://htmlpreview.github.io/?https://github.com/GoogleCloudPlatform/kubernetes/blob/master/api/kubernetes.html
+```

api/doc/service-schema.json

@@ -28,6 +28,10 @@
       "type": "number",
       "required": false
     },
+    "containerPort": {
+      "type": "string",
+      "required": false
+    },
     "labels": {
       "type": "object",
       "required": false

api/kubernetes.html

@@ -699,6 +699,10 @@
       "type": "number",
       "required": false
     },
+    "containerPort": {
+      "type": "string",
+      "required": false
+    },
     "labels": {
       "type": "object",
       "required": false
@@ -763,6 +767,10 @@
       "type": "number",
       "required": false
     },
+    "containerPort": {
+      "type": "string",
+      "required": false
+    },
     "labels": {
       "type": "object",
       "required": false