Admission doc cleanup

This commit is contained in:
Deyuan Deng 2015-02-20 10:44:02 -05:00
parent e6e17729be
commit 684bb8868e
3 changed files with 26 additions and 25 deletions

View File

@ -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: An **AdmissionControl** plug-in is an implementation of the following interface:
``` ```go
package admission package admission
// Attributes is an interface used by a plug-in to make an admission decision on a individual request. // 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 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. of admission.Interface.
``` ```go
func init() { func init() {
admission.RegisterPlugin("AlwaysDeny", func(client client.Interface, config io.Reader) (admission.Interface, error) { return NewAlwaysDeny(), nil }) admission.RegisterPlugin("AlwaysDeny", func(client client.Interface, config io.Reader) (admission.Interface, error) { return NewAlwaysDeny(), nil })
} }

View File

@ -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 A new resource, **LimitRange**, is introduced to enumerate min/max limits for a resource type scoped to a
Kubernetes namespace. Kubernetes namespace.
``` ```go
const ( const (
// Limit that applies to all pods in a namespace // Limit that applies to all pods in a namespace
LimitTypePod string = "Pod" LimitTypePod string = "Pod"
@ -97,7 +97,7 @@ kubectl is modified to support the **LimitRange** resource.
For example, For example,
``` ```shell
$ kubectl namespace myspace $ kubectl namespace myspace
$ kubectl create -f examples/limitrange/limit-range.json $ kubectl create -f examples/limitrange/limit-range.json
$ kubectl get limits $ kubectl get limits
@ -109,8 +109,8 @@ Type Resource Min Max
---- -------- --- --- ---- -------- --- ---
Pod memory 1Mi 1Gi Pod memory 1Mi 1Gi
Pod cpu 250m 2 Pod cpu 250m 2
Container cpu 250m 2
Container memory 1Mi 1Gi Container memory 1Mi 1Gi
Container cpu 250m 2
``` ```
## Future Enhancements: Define limits for a particular pod or container. ## Future Enhancements: Define limits for a particular pod or container.

View File

@ -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. A new resource, **ResourceQuotaUsage**, is introduced to support atomic updates of a **ResourceQuota** status.
``` ```go
// The following identify resource constants for Kubernetes object types // The following identify resource constants for Kubernetes object types
const ( const (
// Pods, number // Pods, number
@ -139,14 +139,15 @@ $ kubectl namespace myspace
$ kubectl create -f examples/resourcequota/resource-quota.json $ kubectl create -f examples/resourcequota/resource-quota.json
$ kubectl get quota $ kubectl get quota
NAME NAME
myquota quota
$ kubectl describe quota myquota $ kubectl describe quota quota
Name: myquota Name: quota
Resource Used Hard Resource Used Hard
-------- ---- ---- -------- ---- ----
cpu 100m 20 cpu 0m 20
memory 0 1.5Gb memory 0 1Gi
pods 1 10 pods 5 10
replicationControllers 1 10 replicationcontrollers 5 20
services 2 3 resourcequotas 1 1
services 3 5
``` ```