github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 13:12:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7918 from caesarxuchao/resource-quota-example

Browse Source 
merge the v1beta3 json file in the resource quota example
This commit is contained in:
Derek Carr
2015-05-12 10:25:52 -04:00
parent d80b43838c cf8426d844
commit c0f04f3672
2 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/resourcequota/resource-quota.json
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"
}
}
}

19
examples/resourcequota/v1beta3/resource-quota.json
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"
}
}
}