summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeyuan Deng <deyuan.deng@gmail.com>2015-02-20 10:44:02 -0500
committerDeyuan Deng <deyuan.deng@gmail.com>2015-02-20 10:46:09 -0500
commit684bb8868e54d701edab9b6eeaa3500fb6a931e1 (patch)
tree593e5ea285b02dea57c71099fbb2e4a4a6c4a7e1
parente6e17729be57537bc49aa8734c2bfdb202ebdbd4 (diff)
Admission doc cleanup
-rw-r--r--admission_control.md6
-rw-r--r--admission_control_limit_range.md20
-rw-r--r--admission_control_resource_quota.md25
3 files changed, 26 insertions, 25 deletions
diff --git a/admission_control.md b/admission_control.md
index 88afda73..1e1c1e53 100644
--- a/admission_control.md
+++ b/admission_control.md
@@ -1,6 +1,6 @@
# Kubernetes Proposal - Admission Control
-**Related PR:**
+**Related PR:**
| Topic | Link |
| ----- | ---- |
@@ -35,7 +35,7 @@ The kube-apiserver takes the following OPTIONAL arguments to enable admission co
An **AdmissionControl** plug-in is an implementation of the following interface:
-```
+```go
package admission
// Attributes is an interface used by a plug-in to make an admission decision on a individual request.
@@ -57,7 +57,7 @@ type Interface interface {
A **plug-in** must be compiled with the binary, and is registered as an available option by providing a name, and implementation
of admission.Interface.
-```
+```go
func init() {
admission.RegisterPlugin("AlwaysDeny", func(client client.Interface, config io.Reader) (admission.Interface, error) { return NewAlwaysDeny(), nil })
}
diff --git a/admission_control_limit_range.md b/admission_control_limit_range.md
index 69fe144b..e3a56c87 100644
--- a/admission_control_limit_range.md
+++ b/admission_control_limit_range.md
@@ -9,7 +9,7 @@ This document proposes a system for enforcing min/max limits per resource as par
A new resource, **LimitRange**, is introduced to enumerate min/max limits for a resource type scoped to a
Kubernetes namespace.
-```
+```go
const (
// Limit that applies to all pods in a namespace
LimitTypePod string = "Pod"
@@ -54,7 +54,7 @@ type LimitRangeList struct {
## AdmissionControl plugin: LimitRanger
-The **LimitRanger** plug-in introspects all incoming admission requests.
+The **LimitRanger** plug-in introspects all incoming admission requests.
It makes decisions by evaluating the incoming object against all defined **LimitRange** objects in the request context namespace.
@@ -97,20 +97,20 @@ kubectl is modified to support the **LimitRange** resource.
For example,
-```
+```shell
$ kubectl namespace myspace
$ kubectl create -f examples/limitrange/limit-range.json
$ kubectl get limits
NAME
limits
$ kubectl describe limits limits
-Name: limits
-Type Resource Min Max
----- -------- --- ---
-Pod memory 1Mi 1Gi
-Pod cpu 250m 2
-Container cpu 250m 2
-Container memory 1Mi 1Gi
+Name: limits
+Type Resource Min Max
+---- -------- --- ---
+Pod memory 1Mi 1Gi
+Pod cpu 250m 2
+Container memory 1Mi 1Gi
+Container cpu 250m 2
```
## Future Enhancements: Define limits for a particular pod or container.
diff --git a/admission_control_resource_quota.md b/admission_control_resource_quota.md
index 08bc6bec..ebad0728 100644
--- a/admission_control_resource_quota.md
+++ b/admission_control_resource_quota.md
@@ -10,7 +10,7 @@ A new resource, **ResourceQuota**, is introduced to enumerate hard resource limi
A new resource, **ResourceQuotaUsage**, is introduced to support atomic updates of a **ResourceQuota** status.
-```
+```go
// The following identify resource constants for Kubernetes object types
const (
// Pods, number
@@ -139,14 +139,15 @@ $ kubectl namespace myspace
$ kubectl create -f examples/resourcequota/resource-quota.json
$ kubectl get quota
NAME
-myquota
-$ kubectl describe quota myquota
-Name: myquota
-Resource Used Hard
--------- ---- ----
-cpu 100m 20
-memory 0 1.5Gb
-pods 1 10
-replicationControllers 1 10
-services 2 3
-``` \ No newline at end of file
+quota
+$ kubectl describe quota quota
+Name: quota
+Resource Used Hard
+-------- ---- ----
+cpu 0m 20
+memory 0 1Gi
+pods 5 10
+replicationcontrollers 5 20
+resourcequotas 1 1
+services 3 5
+```