github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6092 from derekwaynecarr/limit_range_default

Browse Source 
Eliminate trailing commas
This commit is contained in:
Victor Marmol 2015-03-30 09:41:17 -07:00
commit 22670de524
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/kubernetes-namespaces/namespace-dev.json
View File

@ -6,5 +6,5 @@
"status": {}, "status": {},
"labels": { "labels": {
"name": "development" "name": "development"
}, }
} }

2
examples/kubernetes-namespaces/namespace-prod.json
View File

@ -6,5 +6,5 @@
"status": {}, "status": {},
"labels": { "labels": {
"name": "production" "name": "production"
}, }
} }

4
examples/kubernetes-namespaces/v1beta3/namespace-dev.json
View File

@ -2,10 +2,10 @@
"apiVersion":"v1beta3", "apiVersion":"v1beta3",
"kind": "Namespace", "kind": "Namespace",
"metadata": { "metadata": {
"name": "development", "name": "development"
}, },
"spec": {}, "spec": {},
"labels": { "labels": {
"name": "development" "name": "development"
}, }
} }

4
examples/kubernetes-namespaces/v1beta3/namespace-prod.json
View File

@ -2,10 +2,10 @@
"apiVersion":"v1beta3", "apiVersion":"v1beta3",
"kind": "Namespace", "kind": "Namespace",
"metadata": { "metadata": {
"name": "production", "name": "production"
}, },
"spec": {}, "spec": {},
"labels": { "labels": {
"name": "production" "name": "production"
}, }
} }

4
examples/limitrange/invalid-pod.json
View File

@ -11,8 +11,8 @@
"id": "invalid-pod", "id": "invalid-pod",
"containers": [{ "containers": [{
"name": "kubernetes-serve-hostname", "name": "kubernetes-serve-hostname",
"image": "kubernetes/serve_hostname", "image": "kubernetes/serve_hostname"
}] }]
} }
}, }
} }

8
examples/limitrange/limit-range.json
View File

@ -8,7 +8,7 @@
"type": "Pod", "type": "Pod",
"max": { "max": {
"memory": "1073741824", "memory": "1073741824",
"cpu": "2", "cpu": "2"
}, },
"min": { "min": {
"memory": "1048576", "memory": "1048576",
@ -19,13 +19,13 @@
"type": "Container", "type": "Container",
"max": { "max": {
"memory": "1073741824", "memory": "1073741824",
"cpu": "2", "cpu": "2"
}, },
"min": { "min": {
"memory": "1048576", "memory": "1048576",
"cpu": "0.25" "cpu": "0.25"
} }
}, }
], ]
} }
} }

4
examples/limitrange/v1beta3/invalid-pod.json
View File

@ -2,7 +2,7 @@
"apiVersion":"v1beta3", "apiVersion":"v1beta3",
"kind": "Pod", "kind": "Pod",
"metadata": { "metadata": {
"name": "invalid-pod", "name": "invalid-pod"
}, },
"labels": { "labels": {
"name": "invalid-pod" "name": "invalid-pod"
@ -10,7 +10,7 @@
"spec": { "spec": {
"containers": [{ "containers": [{
"name": "kubernetes-serve-hostname", "name": "kubernetes-serve-hostname",
"image": "kubernetes/serve_hostname", "image": "kubernetes/serve_hostname"
}] }]
} }
} }

10
examples/limitrange/v1beta3/limit-range.json
View File

@ -2,7 +2,7 @@
"apiVersion": "v1beta3", "apiVersion": "v1beta3",
"kind": "LimitRange", "kind": "LimitRange",
"metadata": { "metadata": {
"name": "limits", "name": "limits"
}, },
"spec": { "spec": {
"limits": [ "limits": [
@ -10,7 +10,7 @@
"type": "Pod", "type": "Pod",
"max": { "max": {
"memory": "1Gi", "memory": "1Gi",
"cpu": "2", "cpu": "2"
}, },
"min": { "min": {
"memory": "1Mi", "memory": "1Mi",
@ -21,13 +21,13 @@
"type": "Container", "type": "Container",
"max": { "max": {
"memory": "1Gi", "memory": "1Gi",
"cpu": "2", "cpu": "2"
}, },
"min": { "min": {
"memory": "1Mi", "memory": "1Mi",
"cpu": "250m" "cpu": "250m"
} }
}, }
], ]
} }
} }

12
examples/limitrange/v1beta3/valid-pod.json
View File

@ -2,7 +2,7 @@
"apiVersion":"v1beta3", "apiVersion":"v1beta3",
"kind": "Pod", "kind": "Pod",
"metadata": { "metadata": {
"name": "valid-pod", "name": "valid-pod"
}, },
"labels": { "labels": {
"name": "valid-pod" "name": "valid-pod"
@ -14,9 +14,9 @@
"resources": { "resources": {
"limits": { "limits": {
"cpu": "1", "cpu": "1",
"memory": "1Mi", "memory": "1Mi"
}, }
}, }
}] }]
}, }
} }