diff --git a/packages/apps/tenant/Chart.yaml b/packages/apps/tenant/Chart.yaml index 555af0ab..b11ee15c 100644 --- a/packages/apps/tenant/Chart.yaml +++ b/packages/apps/tenant/Chart.yaml @@ -4,4 +4,4 @@ description: Separated tenant namespace icon: /logos/tenant.svg type: application -version: 1.10.0 +version: 1.11.0 diff --git a/packages/apps/tenant/templates/quota.yaml b/packages/apps/tenant/templates/quota.yaml index 8daf0607..43941f56 100644 --- a/packages/apps/tenant/templates/quota.yaml +++ b/packages/apps/tenant/templates/quota.yaml @@ -6,5 +6,5 @@ metadata: namespace: {{ include "tenant.name" . }} spec: hard: - {{- toYaml .Values.resourceQuotas | nindent 4 }} + {{- include "cozy-lib.resources.flatten" (list .Values.resourceQuotas $) | nindent 6 }} {{- end }} diff --git a/packages/apps/tenant/values.yaml b/packages/apps/tenant/values.yaml index 4b3b5df9..7c64b278 100644 --- a/packages/apps/tenant/values.yaml +++ b/packages/apps/tenant/values.yaml @@ -15,9 +15,7 @@ seaweedfs: false isolated: true resourceQuotas: {} # resourceQuotas: -# requests.cpu: "1" -# requests.memory: "1Gi" -# limits.cpu: "2" -# limits.memory: "2Gi" -# requests.nvidia.com/gpu: 4 -# requests.storage: 100Gi +# cpu: "1" +# memory: "1Gi" +# nvidia.com/gpu: 4 +# storage: 100Gi diff --git a/packages/apps/versions_map b/packages/apps/versions_map index cd801ee3..94ad7700 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -126,7 +126,8 @@ tcp-balancer 0.3.0 93bdf411 tcp-balancer 0.4.0 6130f43d tcp-balancer 0.4.1 62cb694d tcp-balancer 0.4.2 HEAD -tenant 1.10.0 HEAD +tenant 1.10.0 4369b031 +tenant 1.11.0 HEAD virtual-machine 0.1.4 f2015d65 virtual-machine 0.1.5 263e47be virtual-machine 0.2.0 c0685f43