distributed: use zoneTpl.common for requestsLoadBalancer, fixed remote write url, while using vmsingle

fixes #2393
fixes #2390

Author: AndrewChubatiuk

charts/victoria-metrics-distributed/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Next release
 
-- TODO
+- merge zoneTpl.common with vmcluster.requestsLoadBalancer. See [#2393](https://github.com/VictoriaMetrics/helm-charts/issues/2393).
+- fixed remote write url, while using vmsingle. See [#2390](https://github.com/VictoriaMetrics/helm-charts/issues/2390).
 
 ## 0.21.3
 

charts/victoria-metrics-distributed/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: victoria-metrics-distributed
 description: A Helm chart for Running VMCluster on Multiple Availability Zones
 type: application
-version: 0.21.3
+version: 0.21.4
 appVersion: v1.125.1
 sources:
   - https://github.com/VictoriaMetrics/helm-charts

charts/victoria-metrics-distributed/templates/_helpers.tpl

@@ -5,6 +5,11 @@ Creates vmcluster spec map, insert zone's nodeselector and topologySpreadConstra
   {{- $ctx := (.helm) | default . }}
   {{- $Values := $ctx.Values }}
   {{- $zones := (dict) -}}
+  {{- $components := default dict }}
+  {{- $_ := set $components "vmstorage" (default list) }}
+  {{- $_ := set $components "vmselect" (default list) }}
+  {{- $_ := set $components "vminsert" (default list) }}
+  {{- $_ := set $components "requestsLoadBalancer" (list "spec") }}
   {{- $commonClusterSpec := ((($Values.common).vmcluster).spec) | default dict -}}
   {{- range $idx, $z := $Values.availabilityZones -}}
     {{- $rolloutZone := mergeOverwrite (deepCopy $.Values.zoneTpl) $z }}
@@ -16,8 +21,12 @@ Creates vmcluster spec map, insert zone's nodeselector and topologySpreadConstra
     {{- $commonSpec := $rolloutZone.common.spec | default dict -}}
     {{- $clusterSpec := mergeOverwrite (deepCopy $commonClusterSpec) (deepCopy $rolloutZone.vmcluster.spec) -}}
     {{- range $name, $config := $clusterSpec -}}
-      {{- if and (hasPrefix "vm" $name) (kindIs "map" $config) -}}
-        {{ $config = mergeOverwrite (deepCopy $commonSpec) (deepCopy $config) }}
+      {{- if and (hasKey $components $name) (kindIs "map" $config) -}}
+        {{- $mergeSpec := (deepCopy $commonSpec) }}
+        {{- range (reverse (get $components $name)) }}
+          {{- $mergeSpec = (dict . $mergeSpec) }}
+        {{- end }}
+        {{- $config = mergeOverwrite (deepCopy $mergeSpec) (deepCopy $config) }}
         {{- if not $config.nodeSelector }}
           {{- $_ := set $config "nodeSelector" (dict "topology.kubernetes.io/zone" "{{ (.zone).name }}") }}
         {{- end }}

charts/victoria-metrics-distributed/templates/per-az/vmagent.yaml

@@ -37,12 +37,8 @@ metadata:
     {{- else if ($rwZone.vmsingle).enabled -}}
       {{- $_ := set $rwZone.vmsingle "spec" (mergeOverwrite (deepCopy $.Values.common.vmsingle.spec) (deepCopy ($rwZone.common).spec) (deepCopy ($rwZone.vmsingle.spec))) -}}
       {{- $_ := set $urlCtx "appKey" (list "zone" "vmsingle" "spec") }}
-      {{- $replicas := (($rwZone.vmsingle).spec).replicaCount | default 1 }}
-      {{- range $id := until (int $replicas) -}}
-        {{- $_ := set $urlCtx "appIdx" $id -}}
-        {{- $remoteWrite := printf "%s/prometheus/api/v1/write" (include "vm.url" $urlCtx) -}}
-        {{- $remoteWrites = append $remoteWrites (dict "url" $remoteWrite) -}}
-      {{- end -}}
+      {{- $remoteWrite := printf "%s/prometheus/api/v1/write" (include "vm.url" $urlCtx) -}}
+      {{- $remoteWrites = append $remoteWrites (dict "url" $remoteWrite) -}}
     {{- end -}}
     {{- $_ := unset $urlCtx "style" }}
   {{- end }}

charts/victoria-metrics-distributed/values.yaml

@@ -141,7 +141,6 @@ zoneTpl:
     name: "{{ (.zone).name }}"
     # -- Spec for VMSingle CRD, see [here](https://docs.victoriametrics.com/operator/api#vmsinglespec)
     spec:
-      replicaCount: 1
       retentionPeriod: "14"
       resources: {}
       extraArgs: {}