Skip to content

K
k3s
Commit 8a03d236 authored by Chao Xu's avatar Chao Xu
Browse files
Options

update examples/limitrange to v1beta3;

change the Memory req. in invalid-pod to 5Mi; add a minimum readme
parent ee4bf2ba
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 109 deletions
examples/limitrange/README.md 0 → 100644
View file @ 8a03d236
Please refer to this [doc](https://github.com/GoogleCloudPlatform/kubernetes/blob/620af168920b773ade28e27211ad684903a1db21/docs/design/admission_control_limit_range.md#kubectl).
examples/limitrange/invalid-pod.json
View file @ 8a03d236
{ {
"id": "invalid-pod", "apiVersion":"v1beta3",
"kind": "Pod", "kind": "Pod",
"apiVersion":"v1beta2", "metadata": {
"name": "invalid-pod",
"labels": { "labels": {
"name": "invalid-pod" "name": "invalid-pod"
}
}, },
"desiredState": { "spec": {
"manifest": {
"version": "v1beta1",
"id": "invalid-pod",
"containers": [{ "containers": [{
"name": "kubernetes-serve-hostname", "name": "kubernetes-serve-hostname",
"image": "gcr.io/google_containers/serve_hostname", "image": "gcr.io/google_containers/serve_hostname",
"cpu": 10, "resources": {
"memory": 1048576 "limits": {
}] "cpu": "10m",
"memory": "5Mi"
} }
} }
}]
}
} }
examples/limitrange/limit-range.json
View file @ 8a03d236
{ {
"id": "limits", "apiVersion": "v1beta3",
"kind": "LimitRange", "kind": "LimitRange",
"apiVersion": "v1beta1", "metadata": {
"name": "limits"
},
"spec": { "spec": {
"limits": [ "limits": [
{ {
"type": "Pod", "type": "Pod",
"max": { "max": {
"memory": "1073741824", "memory": "1Gi",
"cpu": "2" "cpu": "2"
}, },
"min": { "min": {
"memory": "5242880", "memory": "6Mi",
"cpu": "0.25" "cpu": "250m"
} }
}, },
{ {
"type": "Container", "type": "Container",
"max": { "max": {
"memory": "1073741824", "memory": "1Gi",
"cpu": "2" "cpu": "2"
}, },
"min": { "min": {
"memory": "5242880", "memory": "6Mi",
"cpu": "0.25" "cpu": "250m"
}, },
"default": { "default": {
"memory": "5242880", "memory": "6Mi",
"cpu": "0.25" "cpu": "250m"
} }
} }
] ]
......
examples/limitrange/v1beta3/invalid-pod.json deleted 100644 → 0
View file @ ee4bf2ba
{
"apiVersion":"v1beta3",
"kind": "Pod",
"metadata": {
"name": "invalid-pod"
},
"labels": {
"name": "invalid-pod"
},
"spec": {
"containers": [{
"name": "kubernetes-serve-hostname",
"image": "gcr.io/google_containers/serve_hostname",
"resources": {
"limits": {
"cpu": "10m",
"memory": "1Mi"
}
}
}]
}
}
examples/limitrange/v1beta3/limit-range.json deleted 100644 → 0
View file @ ee4bf2ba
{
"apiVersion": "v1beta3",
"kind": "LimitRange",
"metadata": {
"name": "limits"
},
"spec": {
"limits": [
{
"type": "Pod",
"max": {
"memory": "1Gi",
"cpu": "2"
},
"min": {
"memory": "5Mi",
"cpu": "250m"
}
},
{
"type": "Container",
"max": {
"memory": "1Gi",
"cpu": "2"
},
"min": {
"memory": "5Mi",
"cpu": "250m"
},
"default": {
"memory": "5Mi",
"cpu": "250m"
}
}
]
}
}
examples/limitrange/v1beta3/valid-pod.json deleted 100644 → 0
View file @ ee4bf2ba
{
"apiVersion":"v1beta3",
"kind": "Pod",
"metadata": {
"name": "valid-pod"
},
"labels": {
"name": "valid-pod"
},
"spec": {
"containers": [{
"name": "kubernetes-serve-hostname",
"image": "gcr.io/google_containers/serve_hostname",
"resources": {
"limits": {
"cpu": "1",
"memory": "5Mi"
}
}
}]
}
}
examples/limitrange/valid-pod.json
View file @ 8a03d236
{ {
"id": "valid-pod", "apiVersion":"v1beta3",
"kind": "Pod", "kind": "Pod",
"apiVersion":"v1beta2", "metadata": {
"name": "valid-pod",
"labels": { "labels": {
"name": "valid-pod" "name": "valid-pod"
}
}, },
"desiredState": { "spec": {
"manifest": {
"version": "v1beta1",
"id": "valid-pod",
"containers": [{ "containers": [{
"name": "kubernetes-serve-hostname", "name": "kubernetes-serve-hostname",
"image": "gcr.io/google_containers/serve_hostname", "image": "gcr.io/google_containers/serve_hostname",
"cpu": 1000, "resources": {
"memory": 5242880 "limits": {
}] "cpu": "1",
"memory": "6Mi"
} }
} }
}]
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment