merge the v1beta3 json file in the resource quota example

pull/6/head
Chao Xu 2015-05-07 13:54:24 -07:00
parent e5b9f7421e
commit cf8426d844
2 changed files with 6 additions and 23 deletions

View File

@ -1,17 +1,19 @@
{
"id": "quota",
"apiVersion": "v1beta3",
"kind": "ResourceQuota",
"apiVersion": "v1beta1",
"metadata": {
"name": "quota"
},
"spec": {
"hard": {
"memory": "1073741824",
"memory": "1Gi",
"cpu": "20",
"pods": "10",
"services": "5",
"replicationcontrollers":"20",
"resourcequotas":"1",
"secrets":"10",
"persistentvolumeclaims":"10"
"persistentvolumeclaims":"10"
}
}
}

View File

@ -1,19 +0,0 @@
{
"apiVersion": "v1beta3",
"kind": "ResourceQuota",
"metadata": {
"name": "quota"
},
"spec": {
"hard": {
"memory": "1Gi",
"cpu": "20",
"pods": "10",
"services": "5",
"replicationcontrollers":"20",
"resourcequotas":"1",
"secrets":"10",
"persistentvolumeclaims":"10"
}
}
}