Merge pull request #6092 from derekwaynecarr/limit_range_default

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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