From 89ff231826918f9fc12b53509d553a7a15faec42 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Fri, 10 Jun 2016 16:46:46 -0700 Subject: Revert "Versioning docs and examples for v1.4.0-alpha.0." This reverts commit cce9db3aa9555671c5ddf69549b46ed0fd7e472a. --- node-allocatable.md | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) (limited to 'node-allocatable.md') 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 @@ + + +WARNING +WARNING +WARNING +WARNING +WARNING + +

PLEASE NOTE: This document applies to the HEAD of the source tree

+ +If you are using a released version of Kubernetes, you should +refer to the docs that go with that version. + + + +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). + +-- + + @@ -41,7 +70,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/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 - - - - - - - [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/proposals/node-allocatable.md?pixel)]() -- cgit v1.2.3