Accept valuesOverrides for tenant monitoring

Signed-off-by: Timofei Larkin <lllamnyp@gmail.com>

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

packages/apps/tenant/templates/monitoring.yaml

@@ -1,3 +1,28 @@
+{{- define "tenant.monitoring.defaultValues" }}
+metricsStorages:
+- name: shortterm
+  retentionPeriod: "3d"
+  deduplicationInterval: "15s"
+  storage: 10Gi
+  vminsert:
+    resources: {}
+  vmselect:
+    resources: {}
+  vmstorage:
+    resources: {}
+- name: longterm
+  retentionPeriod: "14d"
+  deduplicationInterval: "5m"
+  storage: 10Gi
+  vminsert:
+    resources: {}
+  vmselect:
+    resources: {}
+  vmstorage:
+    resources: {}
+oncall:
+  enabled: false
+{{- end }}
 {{- if .Values.monitoring }}
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
@@ -23,27 +48,9 @@ spec:
   interval: 1m0s
   timeout: 5m0s
   values:
-    metricsStorages:
-    - name: shortterm
-      retentionPeriod: "3d"
-      deduplicationInterval: "15s"
-      storage: 10Gi
-      vminsert:
-        resources: {}
-      vmselect:
-        resources: {}
-      vmstorage:
-        resources: {}
-    - name: longterm
-      retentionPeriod: "14d"
-      deduplicationInterval: "5m"
-      storage: 10Gi
-      vminsert:
-        resources: {}
-      vmselect:
-        resources: {}
-      vmstorage:
-        resources: {}
-    oncall:
-      enabled: false
+    {{- if .Values.monitoring.valuesOverride }}
+      {{- toYaml (deepCopy .Values.monitoring.valuesOverride | mergeOverwrite (fromYaml (include "tenant.monitoring.defaultValues" .))) | nindent 4 }}
+    {{- else }}
+      {{- include "tenant.monitoring.defaultValues" . | nindent 4 }}
+    {{- end }}
 {{- end }}

packages/apps/versions_map

@@ -114,7 +114,8 @@ tcp-balancer 0.2.0 53f2365e
 tcp-balancer 0.3.0 93bdf411
 tcp-balancer 0.4.0 6130f43d
 tcp-balancer 0.4.1 HEAD
-tenant 1.10.0 HEAD
+tenant 1.10.0 62cb694d
+tenant 1.11.0 HEAD
 virtual-machine 0.1.4 f2015d65
 virtual-machine 0.1.5 263e47be
 virtual-machine 0.2.0 c0685f43