diff options
| author | Dawn Chen <dawnchen@google.com> | 2016-06-10 16:46:46 -0700 |
|---|---|---|
| committer | Dawn Chen <dawnchen@google.com> | 2016-06-10 16:46:46 -0700 |
| commit | 89ff231826918f9fc12b53509d553a7a15faec42 (patch) | |
| tree | cfb2b89c89ae793ad2bce519c60a63f2b3481b80 /node-allocatable.md | |
| parent | b870dd0fae6803fff83580452502a3070be55203 (diff) | |
Revert "Versioning docs and examples for v1.4.0-alpha.0."
This reverts commit cce9db3aa9555671c5ddf69549b46ed0fd7e472a.
Diffstat (limited to 'node-allocatable.md')
| -rw-r--r-- | node-allocatable.md | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/node-allocatable.md b/node-allocatable.md index 32dd2297..4e8e7820 100644 --- a/node-allocatable.md +++ b/node-allocatable.md @@ -1,5 +1,34 @@ <!-- BEGIN MUNGE: UNVERSIONED_WARNING --> +<!-- BEGIN STRIP_FOR_RELEASE --> + +<img src="http://kubernetes.io/img/warning.png" alt="WARNING" + width="25" height="25"> +<img src="http://kubernetes.io/img/warning.png" alt="WARNING" + width="25" height="25"> +<img src="http://kubernetes.io/img/warning.png" alt="WARNING" + width="25" height="25"> +<img src="http://kubernetes.io/img/warning.png" alt="WARNING" + width="25" height="25"> +<img src="http://kubernetes.io/img/warning.png" alt="WARNING" + width="25" height="25"> + +<h2>PLEASE NOTE: This document applies to the HEAD of the source tree</h2> + +If you are using a released version of Kubernetes, you should +refer to the docs that go with that version. + +<!-- TAG RELEASE_LINK, added by the munger automatically --> +<strong> +The latest release of this document can be found +[here](http://releases.k8s.io/release-1.2/docs/proposals/node-allocatable.md). + +Documentation for other releases can be found at +[releases.k8s.io](http://releases.k8s.io). +</strong> +-- + +<!-- END STRIP_FOR_RELEASE --> <!-- END MUNGE: UNVERSIONED_WARNING --> @@ -41,7 +70,7 @@ reservation grows), or running multiple Kubelets on a single node.  1. **Node Capacity** - Already provided as - [`NodeStatus.Capacity`](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/v1.4.0-alpha.0/docs/api-reference/v1/definitions.html#_v1_nodestatus), + [`NodeStatus.Capacity`](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/HEAD/docs/api-reference/v1/definitions.html#_v1_nodestatus), this is total capacity read from the node instance, and assumed to be constant. 2. **System-Reserved** (proposed) - Compute resources reserved for processes which are not managed by Kubernetes. Currently this covers all the processes lumped together in the `/system` raw @@ -57,7 +86,7 @@ reservation grows), or running multiple Kubelets on a single node. #### Allocatable Add `Allocatable` (4) to -[`NodeStatus`](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/v1.4.0-alpha.0/docs/api-reference/v1/definitions.html#_v1_nodestatus): +[`NodeStatus`](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/HEAD/docs/api-reference/v1/definitions.html#_v1_nodestatus): ``` type NodeStatus struct { @@ -151,13 +180,6 @@ not updated it falls under the above case of "scheduler is not allocatable-resou - - -<!-- BEGIN MUNGE: IS_VERSIONED --> -<!-- TAG IS_VERSIONED --> -<!-- END MUNGE: IS_VERSIONED --> - - <!-- BEGIN MUNGE: GENERATED_ANALYTICS --> []() <!-- END MUNGE: GENERATED_ANALYTICS --> |