@@ -197,4 +197,14 @@ spec:
 EOF
   kubectl wait hr/tenant-test -n tenant-root --timeout=1m --for=condition=ready
   kubectl wait namespace tenant-test --timeout=20s --for=jsonpath='{.status.phase}'=Active
+  # Wait for ResourceQuota to appear and assert values
+  timeout 60 sh -ec 'until [ "$(kubectl get quota -n tenant-test --no-headers 2>/dev/null | wc -l)" -ge 1 ]; do sleep 1; done'
+  kubectl get quota -n tenant-test \
+    -o jsonpath='{range .items[*]}{.spec.hard.requests\.memory}{" "}{.spec.hard.requests\.storage}{"\n"}{end}' \
+    | grep -qx '64Gi 100Gi'
+
+  # Assert LimitRange defaults for containers
+  kubectl get limitrange -n tenant-test \
+  -o jsonpath='{range .items[*].spec.limits[*]}{.default.cpu}{" "}{.default.memory}{" "}{.defaultRequest.cpu}{" "}{.defaultRequest.memory}{"\n"}{end}' \
+  | grep -qx '250m 1Gi 100m 128Mi'
 }
@@ -16,10 +16,13 @@ metadata:
 spec:
   limits:
     - default:
-        cpu: "250m"
-        memory: "1Gi"
+        cpu: {{ .Values.limitRange.defaults.cpu | default "250m" | quote }}
+        memory: {{ .Values.limitRange.defaults.memory | default "1Gi" | quote }}
       defaultRequest:
-        cpu: "100m"
-        memory: "128Mi"
+        cpu: {{ .Values.limitRange.defaultRequests.cpu | default "100m" | quote }}
+        memory: {{ .Values.limitRange.defaultRequests.memory | default "128Mi" | quote }}
+        {{- if hasKey .Values.resourceQuotas "ephemeral-storage" }}
+        ephemeral-storage: {{ .Values.limitRange.defaultRequests.ephemeralStorage | default "128Mi" | quote }}
+        {{- end }}
       type: Container
 {{- end }}