Skip to content

Commit 4641c5f

Browse files
DominicDVDominicDV
authored
Merge branch 'master' into patch-2
2 parents f6f0da2 + 28925a0 commit 4641c5f

File tree

114 files changed

+20927
-3414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+20927
-3414
lines changed

‎_data/samples.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ toc:
1212
path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/rbd/
1313
- title: CephFS
1414
path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/cephfs/
15+
- title: CockroachDB
16+
path: https://github.com/kubernetes/kubernetes/tree/release-1.4/examples/cockroachdb/
1517
- title: GlusterFS
1618
path: https://github.com/kubernetes/kubernetes/tree/release-1.3/examples/glusterfs/
1719
- title: Hazelcast

‎_data/tasks.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ toc:
88
path: /docs/tasks/configure-pod-container/define-environment-variable-container/
99
- title: Defining a Command and Arguments for a Container
1010
path: /docs/tasks/configure-pod-container/define-command-argument-container/
11+
- title: Assigning CPU and RAM Resources to a Container
12+
path: /docs/tasks/configure-pod-container/assign-cpu-ram-container/
1113
- title: Accessing Applications in a Cluster
1214
section:
1315
- title: Using Port Forwarding to Access Applications in a Cluster

‎_includes/partner-script.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,13 @@
188188
logo: 'jetstack',
189189
link: 'https://www.jetstack.io/',
190190
blurb: 'Jetstack is an organisation focused entirely on Kubernetes. They will help you to get the most out of Kubernetes through expert professional services and open source tooling. Get in touch, and accelerate your project.'
191+
},
192+
{
193+
type: 1,
194+
name: 'Tigera',
195+
logo: 'tigera',
196+
link: 'http://docs.projectcalico.org/v1.5/getting-started/kubernetes/',
197+
blurb: 'Tigera builds high performance, policy driven, cloud native networking solutions for Kubernetes.'
191198
}
192199
]
193200

‎_includes/v1.4/extensions-v1beta1-definitions.html

Lines changed: 1 addition & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ <h2 id="_top_level_api_objects">Top Level API Objects</h2>
6969
<li>
7070
<p><a href="#_v1beta1_networkpolicylist">v1beta1.NetworkPolicyList</a></p>
7171
</li>
72-
<li>
73-
<p><a href="#_v1beta1_storageclass">v1beta1.StorageClass</a></p>
74-
</li>
75-
<li>
76-
<p><a href="#_v1beta1_storageclasslist">v1beta1.StorageClassList</a></p>
77-
</li>
7872
</ul>
7973
</div>
8074
</div>
@@ -1213,71 +1207,6 @@ <h3 id="_v1_localobjectreference">v1.LocalObjectReference</h3>
12131207
</tbody>
12141208
</table>
12151209

1216-
</div>
1217-
<div class="sect2">
1218-
<h3 id="_v1beta1_storageclass">v1beta1.StorageClass</h3>
1219-
<div class="paragraph">
1220-
<p>StorageClass describes the parameters for a class of storage for which PersistentVolumes can be dynamically provisioned.</p>
1221-
</div>
1222-
<div class="paragraph">
1223-
<p>StorageClasses are non-namespaced; the name of the storage class according to etcd is in ObjectMeta.Name.</p>
1224-
</div>
1225-
<table class="tableblock frame-all grid-all" style="width:100%; ">
1226-
<colgroup>
1227-
<col style="width:20%;">
1228-
<col style="width:20%;">
1229-
<col style="width:20%;">
1230-
<col style="width:20%;">
1231-
<col style="width:20%;">
1232-
</colgroup>
1233-
<thead>
1234-
<tr>
1235-
<th class="tableblock halign-left valign-top">Name</th>
1236-
<th class="tableblock halign-left valign-top">Description</th>
1237-
<th class="tableblock halign-left valign-top">Required</th>
1238-
<th class="tableblock halign-left valign-top">Schema</th>
1239-
<th class="tableblock halign-left valign-top">Default</th>
1240-
</tr>
1241-
</thead>
1242-
<tbody>
1243-
<tr>
1244-
<td class="tableblock halign-left valign-top"><p class="tableblock">kind</p></td>
1245-
<td class="tableblock halign-left valign-top"><p class="tableblock">Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: <a href="http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#types-kinds">http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#types-kinds</a></p></td>
1246-
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
1247-
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
1248-
<td class="tableblock halign-left valign-top"></td>
1249-
</tr>
1250-
<tr>
1251-
<td class="tableblock halign-left valign-top"><p class="tableblock">apiVersion</p></td>
1252-
<td class="tableblock halign-left valign-top"><p class="tableblock">APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: <a href="http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#resources">http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#resources</a></p></td>
1253-
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
1254-
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
1255-
<td class="tableblock halign-left valign-top"></td>
1256-
</tr>
1257-
<tr>
1258-
<td class="tableblock halign-left valign-top"><p class="tableblock">metadata</p></td>
1259-
<td class="tableblock halign-left valign-top"><p class="tableblock">Standard object&#8217;s metadata. More info: <a href="http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#metadata">http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#metadata</a></p></td>
1260-
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
1261-
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_objectmeta">v1.ObjectMeta</a></p></td>
1262-
<td class="tableblock halign-left valign-top"></td>
1263-
</tr>
1264-
<tr>
1265-
<td class="tableblock halign-left valign-top"><p class="tableblock">provisioner</p></td>
1266-
<td class="tableblock halign-left valign-top"><p class="tableblock">Provisioner indicates the type of the provisioner.</p></td>
1267-
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
1268-
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
1269-
<td class="tableblock halign-left valign-top"></td>
1270-
</tr>
1271-
<tr>
1272-
<td class="tableblock halign-left valign-top"><p class="tableblock">parameters</p></td>
1273-
<td class="tableblock halign-left valign-top"><p class="tableblock">Parameters holds the parameters for the provisioner that should create volumes of this storage class.</p></td>
1274-
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
1275-
<td class="tableblock halign-left valign-top"><p class="tableblock">object</p></td>
1276-
<td class="tableblock halign-left valign-top"></td>
1277-
</tr>
1278-
</tbody>
1279-
</table>
1280-
12811210
</div>
12821211
<div class="sect2">
12831212
<h3 id="_v1_execaction">v1.ExecAction</h3>
@@ -1859,61 +1788,6 @@ <h3 id="_unversioned_patch">unversioned.Patch</h3>
18591788
<div class="paragraph">
18601789
<p>Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.</p>
18611790
</div>
1862-
</div>
1863-
<div class="sect2">
1864-
<h3 id="_v1beta1_storageclasslist">v1beta1.StorageClassList</h3>
1865-
<div class="paragraph">
1866-
<p>StorageClassList is a collection of storage classes.</p>
1867-
</div>
1868-
<table class="tableblock frame-all grid-all" style="width:100%; ">
1869-
<colgroup>
1870-
<col style="width:20%;">
1871-
<col style="width:20%;">
1872-
<col style="width:20%;">
1873-
<col style="width:20%;">
1874-
<col style="width:20%;">
1875-
</colgroup>
1876-
<thead>
1877-
<tr>
1878-
<th class="tableblock halign-left valign-top">Name</th>
1879-
<th class="tableblock halign-left valign-top">Description</th>
1880-
<th class="tableblock halign-left valign-top">Required</th>
1881-
<th class="tableblock halign-left valign-top">Schema</th>
1882-
<th class="tableblock halign-left valign-top">Default</th>
1883-
</tr>
1884-
</thead>
1885-
<tbody>
1886-
<tr>
1887-
<td class="tableblock halign-left valign-top"><p class="tableblock">kind</p></td>
1888-
<td class="tableblock halign-left valign-top"><p class="tableblock">Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: <a href="http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#types-kinds">http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#types-kinds</a></p></td>
1889-
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
1890-
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
1891-
<td class="tableblock halign-left valign-top"></td>
1892-
</tr>
1893-
<tr>
1894-
<td class="tableblock halign-left valign-top"><p class="tableblock">apiVersion</p></td>
1895-
<td class="tableblock halign-left valign-top"><p class="tableblock">APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: <a href="http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#resources">http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#resources</a></p></td>
1896-
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
1897-
<td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
1898-
<td class="tableblock halign-left valign-top"></td>
1899-
</tr>
1900-
<tr>
1901-
<td class="tableblock halign-left valign-top"><p class="tableblock">metadata</p></td>
1902-
<td class="tableblock halign-left valign-top"><p class="tableblock">Standard list metadata More info: <a href="http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#metadata">http://releases.k8s.io/release-1.4/docs/devel/api-conventions.md#metadata</a></p></td>
1903-
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
1904-
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_unversioned_listmeta">unversioned.ListMeta</a></p></td>
1905-
<td class="tableblock halign-left valign-top"></td>
1906-
</tr>
1907-
<tr>
1908-
<td class="tableblock halign-left valign-top"><p class="tableblock">items</p></td>
1909-
<td class="tableblock halign-left valign-top"><p class="tableblock">Items is the list of StorageClasses</p></td>
1910-
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
1911-
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1beta1_storageclass">v1beta1.StorageClass</a> array</p></td>
1912-
<td class="tableblock halign-left valign-top"></td>
1913-
</tr>
1914-
</tbody>
1915-
</table>
1916-
19171791
</div>
19181792
<div class="sect2">
19191793
<h3 id="_v1_flockervolumesource">v1.FlockerVolumeSource</h3>
@@ -6328,7 +6202,7 @@ <h3 id="_any">any</h3>
63286202
</div>
63296203
<div id="footer">
63306204
<div id="footer-text">
6331-
Last updated 2016-09-01 21:16:11 UTC
6205+
Last updated 2016-09-09 01:13:48 UTC
63326206
</div>
63336207
</div>
63346208
</body>

0 commit comments

Comments
 (0)