summaryrefslogtreecommitdiff
path: root/node-allocatable.md
diff options
context:
space:
mode:
authorDavid McMahon <djmm@google.com>2016-06-10 14:21:20 -0700
committerDavid McMahon <djmm@google.com>2016-06-10 14:55:35 -0700
commitb870dd0fae6803fff83580452502a3070be55203 (patch)
tree42b891c8dd7f41e5ca28bad300d6b191c0120fd8 /node-allocatable.md
parent837cb42e3492500356ad6568190a1612d07720d0 (diff)
Versioning docs and examples for v1.4.0-alpha.0.
Diffstat (limited to 'node-allocatable.md')
-rw-r--r--node-allocatable.md40
1 files changed, 9 insertions, 31 deletions
diff --git a/node-allocatable.md b/node-allocatable.md
index 4e8e7820..32dd2297 100644
--- a/node-allocatable.md
+++ b/node-allocatable.md
@@ -1,34 +1,5 @@
<!-- 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 -->
@@ -70,7 +41,7 @@ reservation grows), or running multiple Kubelets on a single node.
![image](node-allocatable.png)
1. **Node Capacity** - Already provided as
- [`NodeStatus.Capacity`](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/HEAD/docs/api-reference/v1/definitions.html#_v1_nodestatus),
+ [`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),
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
@@ -86,7 +57,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/HEAD/docs/api-reference/v1/definitions.html#_v1_nodestatus):
+[`NodeStatus`](https://htmlpreview.github.io/?https://github.com/kubernetes/kubernetes/blob/v1.4.0-alpha.0/docs/api-reference/v1/definitions.html#_v1_nodestatus):
```
type NodeStatus struct {
@@ -180,6 +151,13 @@ 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 -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/proposals/node-allocatable.md?pixel)]()
<!-- END MUNGE: GENERATED_ANALYTICS -->