Allow setting PAAS namespace GPU limits (#268)

OSC · Nov 27, 2024 · 9613d64 · 9613d64
1 parent ca9ea76
commit 9613d64
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/charts/paas/Chart.yaml b/charts/paas/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: paas
 description: OSC PAAS bootstrap Helm Chart
 type: application
-version: 0.3.0
+version: 0.4.0
 appVersion: "0.1.0"
 maintainers:
   - name: treydock

diff --git a/charts/paas/README.md b/charts/paas/README.md
@@ -1,6 +1,6 @@
 # paas
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
+![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square)
 
 OSC PAAS bootstrap Helm Chart
 
@@ -40,6 +40,7 @@ namespaces:
   cpuDefault: '1'
   memoryLimit: '16Gi'
   memoryDefault: '2Gi'
+  gpuLimit: '1'
   imagePullSecret:
     username: testuser
     password: password
@@ -58,6 +59,7 @@ namespaces:
 | cpuDefault | The default CPU request for this namespace | `1` |
 | memoryLimit | The max memory this namespace can consume | `8Gi` |
 | memoryDefault | The default memory request for this namespace | `2Gi` |
+| gpuLimit | The max GPUs this namespace can consume | `0` |
 | imagePullSecret.username | The username used to access the registry | **required** if `imagePullSecret` defined |
 | imagePullSecret.password | The password used to access the registry | **required** if `imagePullSecret` defined |
 
@@ -72,3 +74,4 @@ namespaces:
 | default.cpu | The default CPU request for PAAS namespace pods | `"1"` |
 | default.memoryLimit | The default memory limit for PAAS namespaces | `"8Gi"` |
 | default.memory | The default memory request for PAAS namespace pods | `"2Gi"` |
+| default.gpuLimit | The default GPU limit for PAAS namespaces | `"0"` |
diff --git a/charts/paas/README.md.gotmpl b/charts/paas/README.md.gotmpl
@@ -37,6 +37,7 @@ namespaces:
   cpuDefault: '1'
   memoryLimit: '16Gi'
   memoryDefault: '2Gi'
+  gpuLimit: '1'
   imagePullSecret:
     username: testuser
     password: password
@@ -55,6 +56,7 @@ namespaces:
 | cpuDefault | The default CPU request for this namespace | `1` |
 | memoryLimit | The max memory this namespace can consume | `8Gi` |
 | memoryDefault | The default memory request for this namespace | `2Gi` |
+| gpuLimit | The max GPUs this namespace can consume | `0` |
 | imagePullSecret.username | The username used to access the registry | **required** if `imagePullSecret` defined |
 | imagePullSecret.password | The password used to access the registry | **required** if `imagePullSecret` defined |
 

diff --git a/charts/paas/templates/quotas-limits.yaml b/charts/paas/templates/quotas-limits.yaml
@@ -13,8 +13,10 @@ spec:
   hard:
     requests.cpu: {{ $namespace.cpuLimit | default $.Values.default.cpuLimit | quote }}
     requests.memory: {{ $namespace.memoryLimit | default $.Values.default.memoryLimit | quote }}
+    requests.nvidia.com/gpu: {{ $namespace.gpuLimit | default $.Values.default.gpuLimit | quote }}
     limits.cpu: {{ $namespace.cpuLimit | default $.Values.default.cpuLimit | quote }}
     limits.memory: {{ $namespace.memoryLimit | default $.Values.default.memoryLimit | quote }}
+    limits.nvidia.com/gpu: {{ $namespace.gpuLimit | default $.Values.default.gpuLimit | quote }}
 ---
 apiVersion: v1
 kind: LimitRange

diff --git a/charts/paas/values.yaml b/charts/paas/values.yaml
@@ -20,3 +20,5 @@ default:
   memoryLimit: '8Gi'
   # -- The default memory request for PAAS namespace pods
   memory: '2Gi'
+  # -- The default GPU limit for PAAS namespaces
+  gpuLimit: '0'