diff --git a/examples/limitrange/README.md b/examples/limitrange/README.md new file mode 100644 index 00000000000..1b983bb3e05 --- /dev/null +++ b/examples/limitrange/README.md @@ -0,0 +1 @@ +Please refer to this [doc](https://github.com/GoogleCloudPlatform/kubernetes/blob/620af168920b773ade28e27211ad684903a1db21/docs/design/admission_control_limit_range.md#kubectl). diff --git a/examples/limitrange/invalid-pod.json b/examples/limitrange/invalid-pod.json index 0d341c77faf..3c622859f81 100644 --- a/examples/limitrange/invalid-pod.json +++ b/examples/limitrange/invalid-pod.json @@ -1,20 +1,22 @@ { - "id": "invalid-pod", + "apiVersion":"v1beta3", "kind": "Pod", - "apiVersion":"v1beta2", - "labels": { - "name": "invalid-pod" + "metadata": { + "name": "invalid-pod", + "labels": { + "name": "invalid-pod" + } }, - "desiredState": { - "manifest": { - "version": "v1beta1", - "id": "invalid-pod", + "spec": { "containers": [{ "name": "kubernetes-serve-hostname", "image": "gcr.io/google_containers/serve_hostname", - "cpu": 10, - "memory": 1048576 - }] - } + "resources": { + "limits": { + "cpu": "10m", + "memory": "5Mi" + } + } + }] } } diff --git a/examples/limitrange/limit-range.json b/examples/limitrange/limit-range.json index c86638f0fd3..c27e9f14fe1 100644 --- a/examples/limitrange/limit-range.json +++ b/examples/limitrange/limit-range.json @@ -1,34 +1,36 @@ { - "id": "limits", + "apiVersion": "v1beta3", "kind": "LimitRange", - "apiVersion": "v1beta1", + "metadata": { + "name": "limits" + }, "spec": { "limits": [ { "type": "Pod", "max": { - "memory": "1073741824", + "memory": "1Gi", "cpu": "2" }, "min": { - "memory": "5242880", - "cpu": "0.25" + "memory": "6Mi", + "cpu": "250m" } }, { "type": "Container", "max": { - "memory": "1073741824", + "memory": "1Gi", "cpu": "2" }, "min": { - "memory": "5242880", - "cpu": "0.25" + "memory": "6Mi", + "cpu": "250m" }, "default": { - "memory": "5242880", - "cpu": "0.25" - } + "memory": "6Mi", + "cpu": "250m" + } } ] } diff --git a/examples/limitrange/v1beta3/invalid-pod.json b/examples/limitrange/v1beta3/invalid-pod.json deleted file mode 100644 index 36260f3728a..00000000000 --- a/examples/limitrange/v1beta3/invalid-pod.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "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" - } - } - }] - } -} diff --git a/examples/limitrange/v1beta3/limit-range.json b/examples/limitrange/v1beta3/limit-range.json deleted file mode 100644 index 264ee922bfc..00000000000 --- a/examples/limitrange/v1beta3/limit-range.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "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" - } - } - ] - } -} diff --git a/examples/limitrange/v1beta3/valid-pod.json b/examples/limitrange/v1beta3/valid-pod.json deleted file mode 100644 index 89d836ec083..00000000000 --- a/examples/limitrange/v1beta3/valid-pod.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "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" - } - } - }] - } -} diff --git a/examples/limitrange/valid-pod.json b/examples/limitrange/valid-pod.json index 82e1123ef12..350a844d2ca 100644 --- a/examples/limitrange/valid-pod.json +++ b/examples/limitrange/valid-pod.json @@ -1,20 +1,22 @@ { - "id": "valid-pod", + "apiVersion":"v1beta3", "kind": "Pod", - "apiVersion":"v1beta2", - "labels": { - "name": "valid-pod" - }, - "desiredState": { - "manifest": { - "version": "v1beta1", - "id": "valid-pod", - "containers": [{ - "name": "kubernetes-serve-hostname", - "image": "gcr.io/google_containers/serve_hostname", - "cpu": 1000, - "memory": 5242880 - }] + "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": "6Mi" + } + } + }] } }