github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #176 from lavalamp/master

Browse Source 
Fix schema, regen docs
This commit is contained in:
brendandburns 2014-06-19 15:46:25 -07:00
commit fced42719c
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/doc/service-schema.json
View File

@ -31,7 +31,7 @@
"labels": { "labels": {
"type": "object", "type": "object",
"required": false "required": false
} },
"selector": { "selector": {
"type": "object", "type": "object",
"required": false "required": false

30
api/kubernetes.html
View File

@ -1570,6 +1570,9 @@ implemented, either.</p>
"<span class="hljs-attribute">labels</span>": <span class="hljs-value">{ "<span class="hljs-attribute">labels</span>": <span class="hljs-value">{
"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span> "<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span>
</span>} </span>}
<span class="hljs-string">"selector"</span>: {
"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span>
</span>}
</span>}, </span>},
{ {
"<span class="hljs-attribute">id</span>": <span class="hljs-value"><span class="hljs-string">"example2"</span></span>, "<span class="hljs-attribute">id</span>": <span class="hljs-value"><span class="hljs-string">"example2"</span></span>,
@ -1578,6 +1581,10 @@ implemented, either.</p>
"<span class="hljs-attribute">env</span>": <span class="hljs-value"><span class="hljs-string">"prod"</span></span>, "<span class="hljs-attribute">env</span>": <span class="hljs-value"><span class="hljs-string">"prod"</span></span>,
"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"jetty"</span> "<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"jetty"</span>
</span>} </span>}
<span class="hljs-string">"selector"</span>: {
"<span class="hljs-attribute">env</span>": <span class="hljs-value"><span class="hljs-string">"prod"</span></span>,
"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"jetty"</span>
</span>}
</span>} </span>}
] ]
</span>} </span>}
@ -1663,6 +1670,10 @@ implemented, either.</p>
"<span class="hljs-attribute">labels</span>": <span class="hljs-value">{ "<span class="hljs-attribute">labels</span>": <span class="hljs-value">{
"<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"object"</span></span>, "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"object"</span></span>,
"<span class="hljs-attribute">required</span>": <span class="hljs-value"><span class="hljs-literal">false</span> "<span class="hljs-attribute">required</span>": <span class="hljs-value"><span class="hljs-literal">false</span>
</span>}</span>,
"<span class="hljs-attribute">selector</span>": <span class="hljs-value">{
"<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"object"</span></span>,
"<span class="hljs-attribute">required</span>": <span class="hljs-value"><span class="hljs-literal">false</span>
</span>} </span>}
</span>} </span>}
</span>} </span>}
@ -1671,11 +1682,14 @@ implemented, either.</p>
<strong>Example:</strong> <strong>Example:</strong>
<pre>{ <pre>{
"<span class="hljs-attribute">id</span>": <span class="hljs-value"><span class="hljs-string">"example2"</span></span>, "<span class="hljs-attribute">id</span>": <span class="hljs-value"><span class="hljs-string">"example"</span></span>,
"<span class="hljs-attribute">port</span>": <span class="hljs-value"><span class="hljs-number">8000</span></span>, "<span class="hljs-attribute">port</span>": <span class="hljs-value"><span class="hljs-number">8000</span></span>,
"<span class="hljs-attribute">labels</span>": <span class="hljs-value">{ "<span class="hljs-attribute">labels</span>": <span class="hljs-value">{
"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span> "<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span>
</span>} </span>}
<span class="hljs-string">"selector"</span>: {
"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span>
</span>}
</span>} </span>}
</pre> </pre>
@ -1791,11 +1805,14 @@ implemented, either.</p>
<strong>Example:</strong> <strong>Example:</strong>
<pre>{ <pre>{
"<span class="hljs-attribute">id</span>": <span class="hljs-value"><span class="hljs-string">"example2"</span></span>, "<span class="hljs-attribute">id</span>": <span class="hljs-value"><span class="hljs-string">"example"</span></span>,
"<span class="hljs-attribute">port</span>": <span class="hljs-value"><span class="hljs-number">8000</span></span>, "<span class="hljs-attribute">port</span>": <span class="hljs-value"><span class="hljs-number">8000</span></span>,
"<span class="hljs-attribute">labels</span>": <span class="hljs-value">{ "<span class="hljs-attribute">labels</span>": <span class="hljs-value">{
"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span> "<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span>
</span>} </span>}
<span class="hljs-string">"selector"</span>: {
"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span>
</span>}
</span>} </span>}
</pre> </pre>
@ -1886,6 +1903,10 @@ implemented, either.</p>
"<span class="hljs-attribute">labels</span>": <span class="hljs-value">{ "<span class="hljs-attribute">labels</span>": <span class="hljs-value">{
"<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"object"</span></span>, "<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"object"</span></span>,
"<span class="hljs-attribute">required</span>": <span class="hljs-value"><span class="hljs-literal">false</span> "<span class="hljs-attribute">required</span>": <span class="hljs-value"><span class="hljs-literal">false</span>
</span>}</span>,
"<span class="hljs-attribute">selector</span>": <span class="hljs-value">{
"<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"object"</span></span>,
"<span class="hljs-attribute">required</span>": <span class="hljs-value"><span class="hljs-literal">false</span>
</span>} </span>}
</span>} </span>}
</span>} </span>}
@ -1894,11 +1915,14 @@ implemented, either.</p>
<strong>Example:</strong> <strong>Example:</strong>
<pre>{ <pre>{
"<span class="hljs-attribute">id</span>": <span class="hljs-value"><span class="hljs-string">"example2"</span></span>, "<span class="hljs-attribute">id</span>": <span class="hljs-value"><span class="hljs-string">"example"</span></span>,
"<span class="hljs-attribute">port</span>": <span class="hljs-value"><span class="hljs-number">8000</span></span>, "<span class="hljs-attribute">port</span>": <span class="hljs-value"><span class="hljs-number">8000</span></span>,
"<span class="hljs-attribute">labels</span>": <span class="hljs-value">{ "<span class="hljs-attribute">labels</span>": <span class="hljs-value">{
"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span> "<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span>
</span>} </span>}
<span class="hljs-string">"selector"</span>: {
"<span class="hljs-attribute">name</span>": <span class="hljs-value"><span class="hljs-string">"nginx"</span>
</span>}
</span>} </span>}
</pre> </pre>