Merge pull request #50840 from Amrita42/2022076new

 correct placement of ephemeral resources

Author: EricPonvelle

modules/quotas-resources-managed.adoc

@@ -24,26 +24,18 @@ A pod is in a terminal state if `status.phase in (Failed, Succeeded)` is true.
 |`memory`
 |The sum of memory requests across all pods in a non-terminal state cannot exceed this value. `memory` and `requests.memory` are the same value and can be used interchangeably.
 
-|`ephemeral-storage`
-|The sum of local ephemeral storage requests across all pods in a non-terminal state cannot exceed this value. `ephemeral-storage` and `requests.ephemeral-storage` are the same value and can be used interchangeably.
-
 |`requests.cpu`
 |The sum of CPU requests across all pods in a non-terminal state cannot exceed this value. `cpu` and `requests.cpu` are the same value and can be used interchangeably.
 
 |`requests.memory`
 |The sum of memory requests across all pods in a non-terminal state cannot exceed this value. `memory` and `requests.memory` are the same value and can be used interchangeably.
 
-|`requests.ephemeral-storage`
-|The sum of ephemeral storage requests across all pods in a non-terminal state cannot exceed this value. `ephemeral-storage` and `requests.ephemeral-storage` are the same value and can be used interchangeably.
-
 |`limits.cpu`
 |The sum of CPU limits across all pods in a non-terminal state cannot exceed this value.
 
 |`limits.memory`
 |The sum of memory limits across all pods in a non-terminal state cannot exceed this value.
 
-|`limits.ephemeral-storage`
-|The sum of ephemeral storage limits across all pods in a non-terminal state cannot exceed this value.
 |===
 
 .Storage resources managed by quota
@@ -63,6 +55,15 @@ A pod is in a terminal state if `status.phase in (Failed, Succeeded)` is true.
 
 |`<storage-class-name>.storageclass.storage.k8s.io/persistentvolumeclaims`
 |The total number of persistent volume claims with a matching storage class that can exist in the project.
+
+|`ephemeral-storage`
+|The sum of local ephemeral storage requests across all pods in a non-terminal state cannot exceed this value. `ephemeral-storage` and `requests.ephemeral-storage` are the same value and can be used interchangeably.
+
+|`requests.ephemeral-storage`
+|The sum of ephemeral storage requests across all pods in a non-terminal state cannot exceed this value. `ephemeral-storage` and `requests.ephemeral-storage` are the same value and can be used interchangeably.
+
+|`limits.ephemeral-storage`
+|The sum of ephemeral storage limits across all pods in a non-terminal state cannot exceed this value.
 |===
 
 [id="quotas-object-counts-managed_{context}"]

modules/quotas-sample-resource-quotas-def.adoc

@@ -54,18 +54,16 @@ spec:
     pods: "4" <1>
     requests.cpu: "1" <2>
     requests.memory: 1Gi <3>
-    requests.ephemeral-storage: 2Gi <4>
-    limits.cpu: "2" <5>
-    limits.memory: 2Gi <6>
-    limits.ephemeral-storage: 4Gi <7>
+    limits.cpu: "2" <4>
+    limits.memory: 2Gi <5>
+    
 ----
 <1> The total number of pods in a non-terminal state that can exist in the project.
 <2> Across all pods in a non-terminal state, the sum of CPU requests cannot exceed 1 core.
 <3> Across all pods in a non-terminal state, the sum of memory requests cannot exceed 1Gi.
-<4> Across all pods in a non-terminal state, the sum of ephemeral storage requests cannot exceed 2Gi.
-<5> Across all pods in a non-terminal state, the sum of CPU limits cannot exceed 2 cores.
-<6> Across all pods in a non-terminal state, the sum of memory limits cannot exceed 2Gi.
-<7> Across all pods in a non-terminal state, the sum of ephemeral storage limits cannot exceed 4Gi.
+<4> Across all pods in a non-terminal state, the sum of CPU limits cannot exceed 2 cores.
+<5> Across all pods in a non-terminal state, the sum of memory limits cannot exceed 2Gi.
+
 
 .`besteffort.yaml`
 [source,yaml]
@@ -139,6 +137,8 @@ spec:
     silver.storageclass.storage.k8s.io/persistentvolumeclaims: "5" <5>
     bronze.storageclass.storage.k8s.io/requests.storage: "0" <6>
     bronze.storageclass.storage.k8s.io/persistentvolumeclaims: "0" <7>
+    requests.ephemeral-storage: 2Gi <8>
+    limits.ephemeral-storage: 4Gi <9>
 ----
 <1> The total number of persistent volume claims in a project
 <2> Across all persistent volume claims in a project, the sum of storage requested cannot exceed this value.
@@ -147,3 +147,5 @@ spec:
 <5> Across all persistent volume claims in a project, the total number of claims in the silver storage class cannot exceed this value.
 <6> Across all persistent volume claims in a project, the sum of storage requested in the bronze storage class cannot exceed this value. When this is set to `0`, it means bronze storage class cannot request storage.
 <7> Across all persistent volume claims in a project, the sum of storage requested in the bronze storage class cannot exceed this value. When this is set to `0`, it means bronze storage class cannot create claims.
+<8> Across all pods in a non-terminal state, the sum of ephemeral storage requests cannot exceed 2Gi.
+<9> Across all pods in a non-terminal state, the sum of ephemeral storage limits cannot exceed 4Gi.

modules/quotas-scopes.adoc

@@ -45,6 +45,3 @@ to tracking the following resources:
 - `cpu`
 - `requests.cpu`
 - `limits.cpu`
-- `ephemeral-storage`
-- `requests.ephemeral-storage`
-- `limits.ephemeral-storage`