distributed: upgraded k8s-stack dependency, add default nodeSelector only of no selector is set

Author: AndrewChubatiuk

charts/victoria-metrics-distributed/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Next release
 
-- TODO
+- add default node selector only of none are defined. See [#2362](https://github.com/VictoriaMetrics/helm-charts/issues/2362).
+- upgrade k8s-stack to 0.59.1
 
 ## 0.20.3
 

charts/victoria-metrics-distributed/Chart.lock

@@ -4,6 +4,6 @@ dependencies:
   version: 0.0.42
 - name: victoria-metrics-k8s-stack
   repository: https://victoriametrics.github.io/helm-charts
-  version: 0.48.1
-digest: sha256:6dcb833baa76914e5375cb42c72db3d3a1093395949173c2f4e4d8f93d6b30f7
-generated: "2025-05-17T00:37:06.076492+03:00"
+  version: 0.59.2
+digest: sha256:86c171547209f61573f6f9b1f63f05a37c1ac427727c175159403f1ad9e78db5
+generated: "2025-08-19T12:01:09.118488+03:00"

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.20.3
+version: 0.21.0
 appVersion: v1.124.0
 sources:
   - https://github.com/VictoriaMetrics/helm-charts
@@ -36,6 +36,6 @@ dependencies:
     version: "0.0.*"
     repository: https://victoriametrics.github.io/helm-charts
   - name: victoria-metrics-k8s-stack
-    version: "0.48.*"
+    version: "0.59.*"
     repository: https://victoriametrics.github.io/helm-charts
     condition: victoria-metrics-k8s-stack.enabled

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

@@ -18,6 +18,9 @@ Creates vmcluster spec map, insert zone's nodeselector and topologySpreadConstra
     {{- range $name, $config := $clusterSpec -}}
       {{- if and (hasPrefix "vm" $name) (kindIs "map" $config) -}}
         {{ $config = mergeOverwrite (deepCopy $commonSpec) (deepCopy $config) }}
+        {{- if not $config.nodeSelector }}
+          {{- $_ := set $config "nodeSelector" (dict "topology.kubernetes.io/zone" "{{ (.zone).name }}") }}
+        {{- end }}
         {{- $_ := set $clusterSpec $name $config -}}
       {{- end -}}
     {{- end -}}
@@ -47,6 +50,9 @@ Creates vmsingle spec map, insert zone's nodeselector and topologySpreadConstrai
     {{- $commonSpec := $rolloutZone.common.spec | default dict -}}
     {{- $singleSpec := mergeOverwrite (deepCopy $commonSingleSpec) (deepCopy $rolloutZone.vmsingle.spec) -}}
     {{- $singleSpec := mergeOverwrite (deepCopy $commonSpec) (deepCopy $singleSpec) }}
+    {{- if not $singleSpec.nodeSelector }}
+      {{- $_ := set $singleSpec "nodeSelector" (dict "topology.kubernetes.io/zone" "{{ (.zone).name }}") }}
+    {{- end }}
     {{- $singleSpec = fromYaml (tpl (toYaml $singleSpec) (dict "zone" $rolloutZone)) -}}
     {{- if $rolloutZone.vmsingle.enabled -}}
       {{- $_ := set $zones $fullname $singleSpec -}}

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

@@ -56,6 +56,9 @@ metadata:
   {{- $remoteWriteSettings := (dict "useMultiTenantMode" true) }}
   {{- $_ := set $zone.vmagent.spec "remoteWriteSettings" (mergeOverwrite (deepCopy ($zone.vmagent.spec.remoteWriteSettings | default dict)) $remoteWriteSettings) }}
 {{- end }}
+{{- if not $zone.vmagent.spec.nodeSelector }}
+  {{- $_ := set $zone.vmagent.spec "nodeSelector" (dict "topology.kubernetes.io/zone" "{{ (.zone).name }}") }}
+{{- end }}
 spec: {{ tpl (toYaml $zone.vmagent.spec) $ctx | nindent 2 }}
 {{- end }}
 {{- end }}

charts/victoria-metrics-distributed/templates/per-az/vmauth-read-proxy.yaml

@@ -48,6 +48,9 @@ metadata:
   {{- $firstUrlMapItem := mergeOverwrite (deepCopy $defaultUrlMapItem) (deepCopy (index $urlMap 0)) }}
   {{- $_ := set $accessSpec "url_map" (prepend (slice $urlMap 1) $firstUrlMapItem) }}
   {{- $_ := set $spec "unauthorizedUserAccessSpec" $accessSpec }}
+  {{- if not $spec.nodeSelector }}
+    {{- $_ := set $spec "nodeSelector" (dict "topology.kubernetes.io/zone" "{{ (.zone).name }}") }}
+  {{- end }}
 spec: {{ tpl (toYaml $spec) $ctx | nindent 2 }}
   {{- end }}
 {{- end }}

charts/victoria-metrics-distributed/values.yaml

@@ -70,8 +70,8 @@ zoneTpl:
     # [VMCluster](https://docs.victoriametrics.com/operator/api/#vmclusterspec) spec params, like nodeSelector,
     # affinity, topologySpreadConstraint, etc
     spec:
-      nodeSelector:
-        topology.kubernetes.io/zone: '{{ (.zone).name }}'
+      nodeSelector: {}
+        # topology.kubernetes.io/zone: '{{ (.zone).name }}'
       affinity: {}
         # preferredDuringSchedulingIgnoredDuringExecution:
         # - weight: 1