updated text and diagrams

2026-09-11 11:45:48 +00:00 · 2018-09-13 12:40:19 -07:00
parent 54a6e65783
commit 57dbc2dead
5 changed files with 10 additions and 16 deletions
@@ -17,10 +17,11 @@ Resource quotas in Rancher work similarly to how they do in the [native version
 In a standard Kubernetes deployment, resource quotas are applied to individual namespaces. However, you cannot apply the quota to multiple namespaces with a single action. Instead, the resource quota must be applied each namespace, which can be tedious. The following diagram depict resource quotas in a native Kubernetes deployment. Notice that:

 - Resource quotas apply only to namespaces they are directly assigned to.
- Quotas are applied to individual namespaces, rather than collectively.
+- Quotas are applied to individual namespaces, rather than collectively. Even though each quota sets the same limits, a unique quota is applied to each namespace.

-<sup>Native Kubernetes Resource Quota Implementation Example</sup>
 ![Native Kubernetes Resource Quota Implementation]({{< baseurl >}}/img/rancher/kubernetes-resource-quota.svg)
+<sup>Native Kubernetes Resource Quota Implementation Example</sup>
+

 In Rancher's implementation of resource quotas, the quota is applied to a [project]({{< baseurl >}}/rancher/v2.x/en/k8s-in-rancher/projects-and-namespaces/#projects) instead. The resource quota includes two limits:

@@ -38,10 +39,11 @@ The following diagram depict resource quotas in a native Kubernetes deployment.

 - The resource quota is applied to the entire project.
 - The project limit sets what resources are available for the entire project.
- Each namespace in the project inherits namespace default limit, which sets the cap for resources available for each individual namespace. You don't have to apply it to each namespace.
+- Each namespace in the project inherits the namespace default limit, which sets the cap for resources available for each individual namespace. The same namespace default limit is automatically applied to each namespace.

-<sup>Rancher Resource Quota Implementation Example</sup>
 ![Rancher Resource Quota Implementation]({{< baseurl >}}/img/rancher/rancher-resource-quota.svg)
+<sup>Rancher Resource Quota Implementation Example</sup>
+
    
 The following table explains the key differences between the two quota types.

@@ -51,18 +53,10 @@ Rancher Resource Quotas | Native Kubernetes Resource Quotas
 Applies resource limits to the project and all its namespaces. | Applies resource limits to individual namespaces. 
 Applies resource quotas to namespaces through inheritance. | Apply only to the assigned namespace.

-<<<<<<< HEAD
-## Project Quota Resource Pool
-
-When you create a resource quota, you are configuring the pool of resources available to the project. You can set limits for a variety of different resources, for both your project and your namespaces.
-
-
-=======
 ## Resource Quota Types

 When you create a resource quota, you are configuring the pool of resources available to the project. You can set limits for a variety of different resources, for both your project and your namespaces.

->>>>>>> change per denise
 ### Namespace Default Limit Overrides

 Although each namespace in a project inherits the **Namespace Default Limit**, you can also override this setting for specific namespaces that require additional (or fewer) resources.
@@ -1 +1 @@
-<mxfile userAgent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36" version="9.1.3" editor="www.draw.io" type="device"><diagram id="e390a0ea-10c4-4c32-dbd2-2c5d3ea7f96f" name="Page-1">7VjbcpswEP0aHtMBZMf4MSaXzrTppM1k+iyDDJoIRIWwnX59VyBxMZAwqZukM44fwGd3Je3qnN2MLeQn+xuBs/iWh4RZrh3uLXRpua67QB48FPJUIZ5zXgGRoGEFOQ1wT38TDdoaLWhI8o6j5JxJmnXBgKcpCWQHw0LwXddtw1l31wxHpAfcB5j10Z80lLHOYm43+GdCo9js7NjassbBYyR4ker9LBdtyr/KnGCzlvbPYxzyXQtCVxbyBeeyekv2PmGqtqZsVdz1iLU+tyCpnBLgVgFbzApiTnzOIHQV0q06n3zSNTn/VahDrSTZyzPMaJRa6EJdAexEBLyArSx1Ks/y8kKV1fGyfRMLb5F+lnso5/IWGRedTaBsKFSffuw3LOmWQNSXYk1ESiTwxLV9VuTlMaqFIeFq7e5+AJdpGdTtZOiW90ZUZRww72IqyX2GA2XdAc8Bi2XCtLm+OfUl4AkN4F0VIZeCPxK/zgktPH/pX9cWQyhXFYAy1vK07cX8wgNc1/dSFxettkRICvy80AbJM12/a5xQpmSW8SyjKRB/xfCasFXNRLNBylNIZcUhJSpVBLLrKrQZo0mktiT7FqQZdEN4QqR4AhetbqTJvGukMl9qLG7JBBnWYy3PqF6qoSi8aJaOUNwboOzBRaq8s5Es6qaB18bdHqlBP2G9kOkDOn9noACQbb8AzjEKMJR/W07TJUaCjb1xhiSWkLwkPgj4BUmtxYDIuo7PquwfKwrNZsv51aFUBF9zyTXa9nbUZ0h/kcAhJY2z1tIAcbwR3o2qZ9YnjzMbUI93BO4sXuDOQL8/bOj2hIb+ylV+kJwXoqTdd7Dg0neMZn1k6sRiZCPHUwDipwbz7x7A/ytNqKxC52rO28AiRtXQuXvIW6xvR45NnGe1dPwEbknCS65VOajCuzN43NLVqw5+nBMO9owpZfpo81o30KndxfSiidP9r5qLsdoD3WVoNC2OMZqX7z+aoYF/mr/jdDZrvNF4dl9oKafxPMizDp+WH2Y81/96n+bzaT6f5vN/MZ9f2V3eYD7D1+aHpNLW+rUOXf0B</diagram></mxfile>
+<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36" version="9.1.3" editor="www.draw.io" type="device"><diagram id="e390a0ea-10c4-4c32-dbd2-2c5d3ea7f96f" name="Page-1">7VrbcpswEP0aP6YDCGz8GJNLZ9p00mYyfZZBxpoIRIV8Sb++KxAYbIip49rOFPsB+ezqsquze2YYD5AXre8FTuYPPCBsYBnBeoBuBpZlDu0RPBTymiOOjXIgFDTQThvgif4mGjQ0uqABSWuOknMmaVIHfR7HxJc1DAvBV3W3GWf1XRMckh3gycdsF/1JAznPUdcxNvhnQsN5sbNpaMsU+y+h4ItY7zew0Cz75OYIF2tp/3SOA76qQOh2gDzBucxH0dojTOW2SFs+767FWp5bkFh2mWDlE5aYLUhx4iGDqZOALtX55KvOyfDXQh1qIslaXmFGw3iArtUVwE5EwABsWapjeZVmF6qsppusN3NhFOpntodyzm6RcVHbBNKGAvXdnfsNS7okMOvLYkpETCTwxDI8tkizY+QLQ8D52vX9AM7CKlCrFqGV3RtRmTHBvJpTSZ4S7CvrCngO2FxGTJvLm1M/fB5RH8YqCakU/IV4ZUxo5Hpj7660FISyVAIoYxVPwxg51y7gOr83OrlosiRCUuDntTZInuj83eGIMlVmCU8SGgPxJwxPCZuUTCw2iHkMoUw4hESlmoGMMgtVxmgSqS3JugJpBt0THhEpXsFFVzfSZF5tSsUZa2xeKRM00iDW5RmWS20oCgPN0haKuw2U3bpIFXfSPbCyj+BpsYLRHLCeVfQBHb+7Gz8Euxu/aR0h/qbwq9XUvcKIPzNmZlOFRSTNeA/1u6eipqKhxuqObxbZPy4oZNtj53a7UgSfcsk1WvU21bep/EKBA0o2zrqUGijmtnCstXjsXfKYdkPxuEfgzmgPdxra/XY/Nzr08wNX+UFSvhAZ7b6DBWf0U/5tVNtFuooWIzPZHgaQPy4w7/EZ/L/SiMp8qqOk3gAmMap05/E5rTC/OrNNdN6sp+MH8EAinvEtj0El37Lh8UAnBx38OCds7Btd0nRpkq2baNcOU/SjjgL/rgZTWI2GDtMkT0dR5/H51Rma+CfnfAJdrHEihbb2dJReobdoNm7h2UUodFkFH0airV6ie4nuJfqwDnMOiW5859Mu0Z31uEHN/0Kiy0VOo9HopBpt9xq9V6MbeFblU07Sy9Bo+6NptN1rdK/R/71GH9hhzqLRzvk1eusl94kFenhSgUa9QL9boJ3LEegP954b9QLdC3Qv0Id1mBMINPzc/Ccjs1X++IJu/wA=</diagram></mxfile>
@@ -1 +1 @@
-<mxfile userAgent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36" version="9.1.3" editor="www.draw.io" type="device"><diagram id="e390a0ea-10c4-4c32-dbd2-2c5d3ea7f96f" name="Page-1">7VpLc+MoEP41Ps6UBJYtHWMn2T1splKTmtrZI5awzAwSWoxjZ379gADJ6BFrHDuPKtsHoYYGuvvjo8EewXm2+4ujYnXHEkxHwEt2I3g9AgBMYSgfSvKkJX7kT7Qk5SQxslrwQH5hI/SMdEMSvHYaCsaoIIUrjFme41g4MsQ527rNloy6oxYoxS3BQ4xoW/ovScRKS8PAq+V/Y5Ku7Mi+Z2oWKP6ZcrbJzXgjAJflR1dnyPZl2q9XKGHbPRG8GcE5Z0zoUrabY6qca92m9W57aqt5c5yLIQpAKzwiusF2xhMqVWcJeVTzE0/GJ5P/N2pSM4F34hOiJM1H8EqFQI6EuSzIutLVufi0LgOqav2w2NW6spSaZzmGalxGkTLuDCLdBhP1bet+RXm8Kgec0826HFp3Jo3U/bljSHFpipUCxypQxgorb/iyersiAj8UKFa1WwluKVuJjJrqKlrqJWYZiWVZGb4WnP3E88oOOA3n0fy2qrEgAspoQuleS8+bBlehlBufXhuHwtkj5oJITF6ZCsEK47NblBGq1lbBioLkEuwzihaYzir02QFylktTZkyaRITSgF7lBdU/3vUCx6/gKNc5ZhkW/Ek22dbrIYgMild7a2FslwIyazCtdGscyoKBYjcs4QeG5T1nPxQnXWD5mrA0CjDQGmbjsYS9D1rQAVoITgDaaS9oDaDaqG3C0h8AyyN7+YIyvC4hpGzVPS64rb3GS7Shqvt/SEbEuuyp2ahfMnRVUrwU/QbK6eVWNr//ZiejVQPFK54EGCWK+++/rfeW0r5m3wp7djme3oA7nLESmdoGGRYPjOXjjsyOmvhpZtgO3UA3vTd+wvHSW/pN4uFswQQz0r3WcDyOgpvhbHYCJgqnDhMBMGlRkT/uoKLwBExk02iHihoRlEEpVHFJ8e5KpcxuzBrujiIEUdjhWF99pRzviPhudFX5PxXiz4F6y+Xsv5uIly91nYOM/kiaA4IP/hAzKUcJwfWEzbajfYGT1hmgEVvpL7bhMXboXSCeYhurwylSR4StjGOKBHl0J9EVdjPCPSPlBmCPWeOxi7BJAzl68kZr/wzQ7ChqdOQ3OtImtzoqUViZPQyY/gWYrwHM6E2BCRvUN50cB0xo+dFeI4TB2YDZlbw1gKlS2KJ3ZzBXEWhhm1d3BYNzV+iaKwPS3jJC0I6b7zX8csyeER3IXocfkczW/GwGCg7kY515yh9kJGfOPqp8Ylj2YbmolX08ywOH0o9pN5osejrAc7Z8IzgCPEccS84Mmg+cxr4IMUYjaiPGJrFdu8SLABO+P7qt7nBfhW67HHA+uvUvdPtiuu1J9t+CbicXuv0IdNuDmDeg20PJ3eVq8nI1ebmafGckc7arycg9n/s++Hy+3Uu+1j9n65N5/acBePMb</diagram></mxfile>
+<mxfile userAgent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36" version="9.1.3" editor="www.draw.io" type="device"><diagram id="e390a0ea-10c4-4c32-dbd2-2c5d3ea7f96f" name="Page-1">7Zvdd6I4FMD/Gh9nDiSg8FhtO/Mw3dOdnjk78xglamYCYTFWu3/9JhDAQFBU/Oip7UPh5ovc/O5NbpL24Chcf0lQPH9iAaY9YAXrHrzvAWD3nYH4IyVvhQRmkllCAiUrBS/kP6yElpIuSYAXWkbOGOUk1oUTFkV4wjUZShK20rNNGdVbjdEM1wQvE0Tr0n9IwOeZ1HOtUv4Vk9k8b9m2VMoYTf7MEraMVHs9AKfpT5YcorwulX8xRwFbbYjgQw+OEsZ49hSuR5hK5eZqy8o9NqQW353giLcpALICr4gucf7FfSqKDgPyKr+Pvymd9P9dyo8acrzmnxAls6gH7+QQiJZwIh5EWqrqiH9apAMqU20vXpdlxdNM/U3bkJnTUaQs0RoRaoOB/K2X/Y6iyTxtcESXi7TprDLRyaw+vQ0hTruSS4HWK5COFZbasEXyak44fonRRKauBNxCNuchVcnFaMmXCQvJRDzLji94wv7gUdEPOPBG/uixSMkhArLThNKNnJY1cO88IVc6vVcKhcNXnHAimLxTCZzFSmePKCRU2lbM4phEAvYhRWNMhwV9eQMRi0RXhkx0iXBZAlqFFjYpUeDIJvF6Q6So+YJZiHnyJrKsSntwfUXxfMMW3BxtpGxwVpQtORQPCkUzlvAdY/mcsN/SJ92wPCeWKhW6WQk18eQOexNaYIDWgR1Aaw8M1FbGVaohbt/PYoZD47wGa3v/844oBYj+1jRge6CuAdtyj9eA32i2JhPYZmZ4MrWmdt3M/kIhXqSGACyww8TGicHo9Ixbre7EFgYdx3cfqqaTsDHjTEk3c9vy12SPswQFBJeZlW0ZIBs0UFanKafHAI9jMB+vC+txD4CnDkV98O/xFC2pJO0bCckuv3wsNBdw1cpW2oKUY1cD6ShiVKpfJ8YbGBYJXQDjXZ+7LeKAs7hbkwJO527tm7vdz916DZRdh7vt39zt1bnb9sSc393my+ZGYAxBWTXqAqao6ztesGWS0vS3SEFp3g/GgjmmapylanNZIyB9T5uffNswPRk8DOgkHmoOB/aN4psideGGolbk2SbyikhduSoNvKzq7UF7t50x+sIj2qN4yhs3QIwK0dVqXD4cqOrR8w9NzRaw5FLJEhZDidzLe/6x2L1j0v2YXJOOnnDIUtvV1OQIC7aeSPP8uJd2PqIDPWpDKZ9O8wU+NCzwT7VGK762XYTTOpzZZwKpRjjQBZ/PuaW05YTiFEEOvAU5O4OcHQuSKwpytpwj3IKcMwY5BxJzgSDHubzHHVzY4R6yD3u4w3VuDvdoh+tcj8O97Sq9C4fbQMwFNvFbLHGFumP5OKV4fScv9+ijUVGk7yOIvC22h9eE/1Rl5fMvOXjCxYq3SHz9TzWW6UuZpo158xipq0w22JOG9rvKSj3Zllk2YWQijpIZVrnUzgsOtGtO2y9zmO5yKFmCKeLkFWufYBp21cIzI+mssM6XYXoQBQZ9vYqsN6pUCU+tIuhUjlu8yoSX6aBWUUph0e12YJq2O29gHgumd11gOo4OZr/i0tqCCfxKRXalou7ABC1umXx4MCt8HUJqptaLkekCDSjh+T5XfF1rp+nqd6Jg36lW1SGdLQ7lL0Bn+forX6q9czrdS9JpV+Zh4B/qN/N74aoixwGnItPkNrvYte+mlv2in/Kgqh7p1CX7nYW0Oe+onea42w5z2p/aNIRz3XegctQiRsWSMVHlnOVUx03HHgB+mGD2XKc6xb7FCfZIxGv57xyZ3yr/aQY+/A8=</diagram></mxfile>