summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Smith <dbsmith@google.com>2015-07-16 19:01:02 -0700
committerDaniel Smith <dbsmith@google.com>2015-07-17 11:04:46 -0700
commit60cec0f5fa87f28f2a7f1357817d06db433b1e75 (patch)
tree9f4938bc69d767bb43c4004998044f7d47cbe35f
parent4510fab29da1d028321cf708a5665a14757b7ca7 (diff)
apply changes
-rw-r--r--admission_control_limit_range.md2
-rw-r--r--admission_control_resource_quota.md2
-rw-r--r--event_compression.md1
-rw-r--r--resources.md7
-rw-r--r--security_context.md1
-rw-r--r--service_accounts.md1
6 files changed, 12 insertions, 2 deletions
diff --git a/admission_control_limit_range.md b/admission_control_limit_range.md
index 824d4a35..90329815 100644
--- a/admission_control_limit_range.md
+++ b/admission_control_limit_range.md
@@ -164,7 +164,7 @@ It is expected we will want to define limits for particular pods or containers b
To make a **LimitRangeItem** more restrictive, we will intend to add these additional restrictions at a future point in time.
## Example
-See the [example of Limit Range](../user-guide/limitrange) for more information.
+See the [example of Limit Range](../user-guide/limitrange/) for more information.
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
diff --git a/admission_control_resource_quota.md b/admission_control_resource_quota.md
index e262eb2d..d5cdc9a1 100644
--- a/admission_control_resource_quota.md
+++ b/admission_control_resource_quota.md
@@ -185,7 +185,7 @@ services 3 5
```
## More information
-See [resource quota document](../admin/resource-quota.md) and the [example of Resource Quota](../user-guide/resourcequota) for more information.
+See [resource quota document](../admin/resource-quota.md) and the [example of Resource Quota](../user-guide/resourcequota/) for more information.
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
diff --git a/event_compression.md b/event_compression.md
index 0b458c8d..af823972 100644
--- a/event_compression.md
+++ b/event_compression.md
@@ -84,6 +84,7 @@ Each binary that generates events:
## Example
Sample kubectl output
+
```
FIRSTSEEN LASTSEEN COUNT NAME KIND SUBOBJECT REASON SOURCE MESSAGE
Thu, 12 Feb 2015 01:13:02 +0000 Thu, 12 Feb 2015 01:13:02 +0000 1 kubernetes-minion-4.c.saad-dev-vms.internal Minion starting {kubelet kubernetes-minion-4.c.saad-dev-vms.internal} Starting kubelet.
diff --git a/resources.md b/resources.md
index 0457eb44..2effb5cf 100644
--- a/resources.md
+++ b/resources.md
@@ -87,23 +87,27 @@ Internally (i.e., everywhere else), Kubernetes will represent resource quantitie
Both users and a number of system components, such as schedulers, (horizontal) auto-scalers, (vertical) auto-sizers, load balancers, and worker-pool managers need to reason about resource requirements of workloads, resource capacities of nodes, and resource usage. Kubernetes divides specifications of *desired state*, aka the Spec, and representations of *current state*, aka the Status. Resource requirements and total node capacity fall into the specification category, while resource usage, characterizations derived from usage (e.g., maximum usage, histograms), and other resource demand signals (e.g., CPU load) clearly fall into the status category and are discussed in the Appendix for now.
Resource requirements for a container or pod should have the following form:
+
```
resourceRequirementSpec: [
request: [ cpu: 2.5, memory: "40Mi" ],
limit: [ cpu: 4.0, memory: "99Mi" ],
]
```
+
Where:
* _request_ [optional]: the amount of resources being requested, or that were requested and have been allocated. Scheduler algorithms will use these quantities to test feasibility (whether a pod will fit onto a node). If a container (or pod) tries to use more resources than its _request_, any associated SLOs are voided &mdash; e.g., the program it is running may be throttled (compressible resource types), or the attempt may be denied. If _request_ is omitted for a container, it defaults to _limit_ if that is explicitly specified, otherwise to an implementation-defined value; this will always be 0 for a user-defined resource type. If _request_ is omitted for a pod, it defaults to the sum of the (explicit or implicit) _request_ values for the containers it encloses.
* _limit_ [optional]: an upper bound or cap on the maximum amount of resources that will be made available to a container or pod; if a container or pod uses more resources than its _limit_, it may be terminated. The _limit_ defaults to "unbounded"; in practice, this probably means the capacity of an enclosing container, pod, or node, but may result in non-deterministic behavior, especially for memory.
Total capacity for a node should have a similar structure:
+
```
resourceCapacitySpec: [
total: [ cpu: 12, memory: "128Gi" ]
]
```
+
Where:
* _total_: the total allocatable resources of a node. Initially, the resources at a given scope will bound the resources of the sum of inner scopes.
@@ -149,6 +153,7 @@ rather than decimal ones: "64MiB" rather than "64MB".
## Resource metadata
A resource type may have an associated read-only ResourceType structure, that contains metadata about the type. For example:
+
```
resourceTypes: [
"kubernetes.io/memory": [
@@ -194,6 +199,7 @@ resourceStatus: [
```
where a `<CPU-info>` or `<memory-info>` structure looks like this:
+
```
{
mean: <value> # arithmetic mean
@@ -209,6 +215,7 @@ where a `<CPU-info>` or `<memory-info>` structure looks like this:
]
}
```
+
All parts of this structure are optional, although we strongly encourage including quantities for 50, 90, 95, 99, 99.5, and 99.9 percentiles. _[In practice, it will be important to include additional info such as the length of the time window over which the averages are calculated, the confidence level, and information-quality metrics such as the number of dropped or discarded data points.]_
and predicted
diff --git a/security_context.md b/security_context.md
index 6940aae2..bc76495a 100644
--- a/security_context.md
+++ b/security_context.md
@@ -179,6 +179,7 @@ type SELinuxOptions struct {
Level string
}
```
+
### Admission
It is up to an admission plugin to determine if the security context is acceptable or not. At the
diff --git a/service_accounts.md b/service_accounts.md
index c53b4633..c6acbd24 100644
--- a/service_accounts.md
+++ b/service_accounts.md
@@ -61,6 +61,7 @@ A service account binds together several things:
## Design Discussion
A new object Kind is added:
+
```go
type ServiceAccount struct {
TypeMeta `json:",inline" yaml:",inline"`