Skip to content

Commit ce9e04c

Browse files
committed
feature/add-ns-quota
1 parent 24fa722 commit ce9e04c

6 files changed

Lines changed: 35 additions & 2 deletions

File tree

‎packages/apps/tenant/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ description: Separated tenant namespace
44
icon: /logos/tenant.svg
55

66
type: application
7-
version: 1.7.0
7+
version: 1.7.1

‎packages/apps/tenant/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,4 @@ tenant-u1
5858
| `ingress` | Deploy own Ingress Controller | `false` |
5959
| `seaweedfs` | Deploy own SeaweedFS | `false` |
6060
| `isolated` | Enforce tenant namespace with network policies | `false` |
61+
| `resources` | Tenant quotas | `{}` |
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{{- if .Values.resources }}
2+
apiVersion: v1
3+
kind: ResourceQuota
4+
metadata:
5+
name: tenant-quota
6+
namespace: {{ include "tenant.name" . }}
7+
spec:
8+
hard:
9+
{{- if and .Values.resources.requests.cpu .Values.resources.requests.memory }}
10+
requests.cpu: {{ .Values.resources.requests.cpu }}
11+
requests.memory: {{ .Values.resources.requests.memory }}
12+
{{- end }}
13+
{{- if and .Values.resources.limits.cpu .Values.resources.limits.memory }}
14+
limits.cpu: {{ .Values.resources.limits.cpu }}
15+
limits.memory: {{ .Values.resources.limits.memory }}
16+
{{- end }}
17+
{{- end }}

‎packages/apps/tenant/values.schema.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
"type": "boolean",
3232
"description": "Enforce tenant namespace with network policies",
3333
"default": false
34+
},
35+
"resources": {
36+
"type": "object",
37+
"description": "Tenant quotas",
38+
"default": {}
3439
}
3540
}
3641
}

‎packages/apps/tenant/values.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,18 @@
66
## @param ingress Deploy own Ingress Controller
77
## @param seaweedfs Deploy own SeaweedFS
88
## @param isolated Enforce tenant namespace with network policies
9+
## @param resources Tenant quotas
910
host: ""
1011
etcd: false
1112
monitoring: false
1213
ingress: false
1314
seaweedfs: false
1415
isolated: false
16+
resources: {}
17+
# resources:
18+
# limits:
19+
# cpu: 4000m
20+
# memory: 4Gi
21+
# requests:
22+
# cpu: 100m
23+
# memory: 512Mi

‎packages/apps/versions_map‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ tenant 1.6.5 f1e11451
103103
tenant 1.6.6 d4634797
104104
tenant 1.6.7 06afcf27
105105
tenant 1.6.8 4cc48e6f
106-
tenant 1.7.0 HEAD
106+
tenant 1.7.0 6c73e3f3
107+
tenant 1.7.1 HEAD
107108
virtual-machine 0.1.4 f2015d6
108109
virtual-machine 0.1.5 7cd7de7
109110
virtual-machine 0.2.0 5ca8823

0 commit comments

Comments
 (0)