Skip to content

Commit

Permalink
Merge pull request kubernetes#6092 from derekwaynecarr/limit_range_de…
Browse files Browse the repository at this point in the history
…fault

Eliminate trailing commas
  • Loading branch information
vmarmol committed Mar 30, 2015
2 parents a4daa88 + 84667ac commit 22670de
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion examples/kubernetes-namespaces/namespace-dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"status": {},
"labels": {
"name": "development"
},
}
}
2 changes: 1 addition & 1 deletion examples/kubernetes-namespaces/namespace-prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"status": {},
"labels": {
"name": "production"
},
}
}
4 changes: 2 additions & 2 deletions examples/kubernetes-namespaces/v1beta3/namespace-dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"apiVersion":"v1beta3",
"kind": "Namespace",
"metadata": {
"name": "development",
"name": "development"
},
"spec": {},
"labels": {
"name": "development"
},
}
}
4 changes: 2 additions & 2 deletions examples/kubernetes-namespaces/v1beta3/namespace-prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"apiVersion":"v1beta3",
"kind": "Namespace",
"metadata": {
"name": "production",
"name": "production"
},
"spec": {},
"labels": {
"name": "production"
},
}
}
4 changes: 2 additions & 2 deletions examples/limitrange/invalid-pod.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"id": "invalid-pod",
"containers": [{
"name": "kubernetes-serve-hostname",
"image": "kubernetes/serve_hostname",
"image": "kubernetes/serve_hostname"
}]
}
},
}
}
8 changes: 4 additions & 4 deletions examples/limitrange/limit-range.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"type": "Pod",
"max": {
"memory": "1073741824",
"cpu": "2",
"cpu": "2"
},
"min": {
"memory": "1048576",
Expand All @@ -19,13 +19,13 @@
"type": "Container",
"max": {
"memory": "1073741824",
"cpu": "2",
"cpu": "2"
},
"min": {
"memory": "1048576",
"cpu": "0.25"
}
},
],
}
]
}
}
4 changes: 2 additions & 2 deletions examples/limitrange/v1beta3/invalid-pod.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"apiVersion":"v1beta3",
"kind": "Pod",
"metadata": {
"name": "invalid-pod",
"name": "invalid-pod"
},
"labels": {
"name": "invalid-pod"
},
"spec": {
"containers": [{
"name": "kubernetes-serve-hostname",
"image": "kubernetes/serve_hostname",
"image": "kubernetes/serve_hostname"
}]
}
}
10 changes: 5 additions & 5 deletions examples/limitrange/v1beta3/limit-range.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"apiVersion": "v1beta3",
"kind": "LimitRange",
"metadata": {
"name": "limits",
"name": "limits"
},
"spec": {
"limits": [
{
"type": "Pod",
"max": {
"memory": "1Gi",
"cpu": "2",
"cpu": "2"
},
"min": {
"memory": "1Mi",
Expand All @@ -21,13 +21,13 @@
"type": "Container",
"max": {
"memory": "1Gi",
"cpu": "2",
"cpu": "2"
},
"min": {
"memory": "1Mi",
"cpu": "250m"
}
},
],
}
]
}
}
10 changes: 5 additions & 5 deletions examples/limitrange/v1beta3/valid-pod.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"apiVersion":"v1beta3",
"kind": "Pod",
"metadata": {
"name": "valid-pod",
"name": "valid-pod"
},
"labels": {
"name": "valid-pod"
Expand All @@ -14,9 +14,9 @@
"resources": {
"limits": {
"cpu": "1",
"memory": "1Mi",
},
},
"memory": "1Mi"
}
}
}]
},
}
}

0 comments on commit 22670de

Please sign in to comment.