Automatic update CHANGELOGs and READMEs (#1973) (#1975)

AndrewChubatiuk · victoriametrics-bot · web-flow · commit c2aa74853e9c · 2025-02-06T00:05:32.000+02:00
Co-authored-by: Github Actions &lt;133988544+victoriametrics-bot@users.noreply.github.com&gt;
diff --git a/charts/victoria-logs-single/CHANGELOG.md b/charts/victoria-logs-single/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Next release
 
+- added ability to override default headless service .Values.server.service.clusterIP with empty value
 - vector chart 0.37.x -> 0.40.x
 
 ## 0.8.14
diff --git a/charts/victoria-logs-single/README.md b/charts/victoria-logs-single/README.md
@@ -910,7 +910,7 @@ readOnlyRootFilesystem: true
       <td>server.service.clusterIP</td>
       <td>string</td>
       <td><pre class="helm-vars-default-value language-yaml" lang="">
-<code class="language-yaml">""
+<code class="language-yaml">None
 </code>
 </pre>
 </td>
diff --git a/charts/victoria-logs-single/templates/server-service.yaml b/charts/victoria-logs-single/templates/server-service.yaml
@@ -20,12 +20,11 @@ spec:
   {{- end }}
   type: {{ $type }}
   {{- $clusterIP := $service.clusterIP }}
-  {{- if and (not $clusterIP) (eq $type "ClusterIP") $app.statefulSet.enabled }}
-    {{- $clusterIP = "None" }}
-  {{- end }}
-  {{- with $clusterIP }}
+  {{- if eq $type "ClusterIP" }}
+  {{- with $service.clusterIP }}
   clusterIP: {{ . }}
   {{- end }}
+  {{- end }}
   {{- with $service.externalIPs }}
   externalIPs: {{ toYaml . | nindent 4 }}
   {{- end }}
diff --git a/charts/victoria-logs-single/values.yaml b/charts/victoria-logs-single/values.yaml
@@ -252,7 +252,7 @@ server:
     # -- Service labels
     labels: {}
     # -- Service ClusterIP
-    clusterIP: ""
+    clusterIP: None
     # -- Service external IPs. Details are [here]( https://kubernetes.io/docs/user-guide/services/#external-ips)
     externalIPs: []
     # -- Service load balancer IP
diff --git a/charts/victoria-metrics-cluster/CHANGELOG.md b/charts/victoria-metrics-cluster/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Next release
 
-- TODO
+- added ability to override default headless service `.Values.vmselect.service.clusterIP` with empty value
+- added `.Values.common.image.tag` to set the same tag for all cluster components.
 
 ## 0.17.4
 
diff --git a/charts/victoria-metrics-cluster/README.md b/charts/victoria-metrics-cluster/README.md
@@ -145,7 +145,19 @@ Change the values according to the need of the environment in ``victoria-metrics
 </code>
 </pre>
 </td>
-      <td></td>
+      <td><p>use SRV discovery for storageNode and selectNode flags for enterprise version</p>
+</td>
+    </tr>
+    <tr>
+      <td>common.image</td>
+      <td>object</td>
+      <td><pre class="helm-vars-default-value language-yaml" lang="plaintext">
+<code class="language-yaml">tag: ""
+</code>
+</pre>
+</td>
+      <td><p>common for all components image configuration</p>
+</td>
     </tr>
     <tr>
       <td>extraObjects</td>
@@ -200,6 +212,17 @@ Change the values according to the need of the environment in ``victoria-metrics
 </pre>
 </td>
       <td><p>Image registry, that can be shared across multiple helm charts</p>
+</td>
+    </tr>
+    <tr>
+      <td>global.image.vm.tag</td>
+      <td>string</td>
+      <td><pre class="helm-vars-default-value language-yaml" lang="">
+<code class="language-yaml">""
+</code>
+</pre>
+</td>
+      <td><p>Image tag for all vm charts</p>
 </td>
     </tr>
     <tr>
@@ -2632,7 +2655,7 @@ timeoutSeconds: 5
       <td>vmselect.service.clusterIP</td>
       <td>string</td>
       <td><pre class="helm-vars-default-value language-yaml" lang="">
-<code class="language-yaml">""
+<code class="language-yaml">None
 </code>
 </pre>
 </td>
diff --git a/charts/victoria-metrics-cluster/templates/service.yaml b/charts/victoria-metrics-cluster/templates/service.yaml
@@ -22,12 +22,10 @@ spec:
     {{- $type = "ClusterIP" }}
   {{- end }}
   type: {{ $type }}
-  {{- $clusterIP := $service.clusterIP }}
-  {{- if and (not $clusterIP) (eq $type "ClusterIP") ($app.statefulSet).enabled }}
-    {{- $clusterIP = "None" }}
+  {{- if eq $type "ClusterIP" }}
+  {{- with $service.clusterIP }}
+  clusterIP: {{. }}
   {{- end }}
-  {{- with $clusterIP }}
-  clusterIP: {{ . }}
   {{- end }}
   {{- with $service.externalIPs }}
   externalIPs: {{ toYaml . | nindent 4 }}
diff --git a/charts/victoria-metrics-cluster/templates/vmauth-deployment.yaml b/charts/victoria-metrics-cluster/templates/vmauth-deployment.yaml
@@ -1,4 +1,5 @@
-{{- $app := .Values.vmauth -}}
+{{- $app := merge (deepCopy .Values.vmauth) (deepCopy .Values.common) -}}
+{{- $_ := set .Values "vmauth" $app }}
 {{- if $app.enabled -}}
 {{- $ctx := dict "helm" . "appKey" "vmauth" }}
 {{- $fullname := include "vm.plain.fullname" $ctx }}
diff --git a/charts/victoria-metrics-cluster/templates/vminsert-deployment.yaml b/charts/victoria-metrics-cluster/templates/vminsert-deployment.yaml
@@ -1,4 +1,5 @@
-{{- $app := .Values.vminsert -}}
+{{- $app := merge (deepCopy .Values.vminsert) (deepCopy .Values.common) -}}
+{{- $_ := set .Values "vminsert" $app }}
 {{- if $app.enabled -}}
 {{- $ctx := dict "helm" . "appKey" "vminsert" }}
 {{- $fullname := include "vm.plain.fullname" $ctx }}
diff --git a/charts/victoria-metrics-cluster/templates/vmselect-deployment.yaml b/charts/victoria-metrics-cluster/templates/vmselect-deployment.yaml
@@ -1,4 +1,5 @@
-{{- $app := .Values.vmselect -}}
+{{- $app := merge (deepCopy .Values.vmselect) (deepCopy .Values.common) -}}
+{{- $_ := set .Values "vmselect" $app }}
 {{- if and $app.enabled (not $app.statefulSet.enabled) -}}
 {{- $ctx := dict "helm" . "appKey" "vmselect" }}
 {{- $fullname := include "vm.plain.fullname" $ctx }}
diff --git a/charts/victoria-metrics-cluster/templates/vmselect-statefulset.yaml b/charts/victoria-metrics-cluster/templates/vmselect-statefulset.yaml
@@ -1,4 +1,5 @@
-{{- $app := .Values.vmselect }}
+{{- $app := merge (deepCopy .Values.vmselect) (deepCopy .Values.common) -}}
+{{- $_ := set .Values "vmselect" $app }}
 {{- if and $app.enabled $app.statefulSet.enabled -}}
 {{- $ctx := dict "helm" . "appKey" "vmselect" }}
 {{- $fullname := include "vm.plain.fullname" $ctx }}
diff --git a/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml b/charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml
@@ -1,4 +1,5 @@
-{{- $app := .Values.vmstorage }}
+{{- $app := merge (deepCopy .Values.vmstorage) (deepCopy .Values.common) -}}
+{{- $_ := set .Values "vmstorage" $app }}
 {{- if $app.enabled -}}
 {{- $ctx := dict "helm" . "appKey" "vmstorage" }}
 {{- $fullname := include "vm.plain.fullname" $ctx }}
diff --git a/charts/victoria-metrics-cluster/tests/__snapshot__/service_test.yaml.snap b/charts/victoria-metrics-cluster/tests/__snapshot__/service_test.yaml.snap
@@ -61,6 +61,7 @@ service should match snapshot:
       name: RELEASE-NAME-victoria-metrics-cluster-vmselect
       namespace: NAMESPACE
     spec:
+      clusterIP: None
       ports:
         - name: http
           port: 8481
@@ -170,6 +171,7 @@ service should match snapshot with fullnameOverride and extraLabels:
       name: vmselect-node
       namespace: NAMESPACE
     spec:
+      clusterIP: None
       ports:
         - name: http
           port: 8481
diff --git a/charts/victoria-metrics-cluster/values.yaml b/charts/victoria-metrics-cluster/values.yaml
@@ -7,6 +7,9 @@ global:
   image:
     # -- Image registry, that can be shared across multiple helm charts
     registry: ""
+    vm:
+      # -- Image tag for all vm charts
+      tag: ""
   # -- Openshift security context compatibility configuration
   compatibility:
     openshift:
@@ -18,9 +21,14 @@ global:
 # -- Print information after deployment
 printNotes: true
 
-# use SRV discovery for storageNode and selectNode flags for enterprise version
+# -- use SRV discovery for storageNode and selectNode flags for enterprise version
 autoDiscovery: false
 
+common:
+  # -- common for all components image configuration
+  image:
+    tag: ""
+
 serviceAccount:
   # -- Specifies whether a service account should be created
   create: true
@@ -220,7 +228,7 @@ vmselect:
     # -- Service labels
     labels: {}
     # -- Service ClusterIP
-    clusterIP: ""
+    clusterIP: None
     # -- Service external IPs. Details are [here](https://kubernetes.io/docs/user-guide/services/#external-ips)
     externalIPs: []
     # -- Extra service ports
diff --git a/charts/victoria-metrics-common/CHANGELOG.md b/charts/victoria-metrics-common/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Next release
 
-- TODO
+- Fix overwrite per service empty registry
 
 ## 0.0.38
 
diff --git a/charts/victoria-metrics-common/Chart.yaml b/charts/victoria-metrics-common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 type: library
 description: Victoria Metrics Common - contains shared templates for all Victoria Metrics helm charts
 name: victoria-metrics-common
-version: 0.0.38
+version: 0.0.39
 sources:
   - https://github.com/VictoriaMetrics/helm-charts
 kubeVersion: ">=1.23.0-0"
diff --git a/charts/victoria-metrics-common/README.md b/charts/victoria-metrics-common/README.md
@@ -1,6 +1,6 @@
 
 
-![Version](https://img.shields.io/badge/0.0.38-gray?logo=Helm&labelColor=gray&link=https%3A%2F%2Fdocs.victoriametrics.com%2Fhelm%2Fvictoria-metrics-common%2Fchangelog%2F%230038)
+![Version](https://img.shields.io/badge/0.0.39-gray?logo=Helm&labelColor=gray&link=https%3A%2F%2Fdocs.victoriametrics.com%2Fhelm%2Fvictoria-metrics-common%2Fchangelog%2F%230039)
 ![ArtifactHub](https://img.shields.io/badge/ArtifactHub-informational?logoColor=white&color=417598&logo=artifacthub&link=https%3A%2F%2Fartifacthub.io%2Fpackages%2Fhelm%2Fvictoriametrics%2Fvictoria-metrics-common)
 ![License](https://img.shields.io/github/license/VictoriaMetrics/helm-charts?labelColor=green&label=&link=https%3A%2F%2Fgithub.com%2FVictoriaMetrics%2Fhelm-charts%2Fblob%2Fmaster%2FLICENSE)
 ![Slack](https://img.shields.io/badge/Join-4A154B?logo=slack&link=https%3A%2F%2Fslack.victoriametrics.com)
diff --git a/charts/victoria-metrics-common/templates/_image.tpl b/charts/victoria-metrics-common/templates/_image.tpl
@@ -50,9 +50,12 @@ Victoria Metrics Image
     {{- end -}}
   {{- end -}}
   {{- $image := ternary $ctx.image $values.image (hasKey $ctx "image") -}}
-  {{- if and (not $image.registry) (hasKey $image "registry") -}}
-    {{- $_ := unset $image "registry" -}}
+  {{- if not $image.registry }}
+    {{- if (($Values.global).image).registry -}}
+      {{- $_ := set $image "registry" (($Values.global).image).registry -}}
+    {{- else if hasKey $image "registry" -}}
+      {{- $_ := unset $image "registry" -}}
+    {{- end -}}
   {{- end -}}
-  {{- $image = mergeOverwrite (deepCopy (($Values.global).image | default dict)) ($image | default dict) -}}
   {{- toYaml (dict "image" $image) -}}
 {{- end -}}
diff --git a/charts/victoria-metrics-single/CHANGELOG.md b/charts/victoria-metrics-single/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Next release
 
-- TODO
+- added ability to override default headless service .Values.server.service.clusterIP with empty value
 
 ## 0.13.8
 
diff --git a/charts/victoria-metrics-single/README.md b/charts/victoria-metrics-single/README.md
@@ -1206,7 +1206,7 @@ scrape_configs:
       <td>server.service.clusterIP</td>
       <td>string</td>
       <td><pre class="helm-vars-default-value language-yaml" lang="">
-<code class="language-yaml">""
+<code class="language-yaml">None
 </code>
 </pre>
 </td>
diff --git a/charts/victoria-metrics-single/templates/server-service.yaml b/charts/victoria-metrics-single/templates/server-service.yaml
@@ -21,13 +21,11 @@ spec:
     {{- $type = "ClusterIP" }}
   {{- end }}
   type: {{ $type }}
-  {{- $clusterIP := $service.clusterIP }}
-  {{- if and (not $clusterIP) (eq $type "ClusterIP") $app.statefulSet.enabled }}
-    {{- $clusterIP = "None" }}
-  {{- end }}
-  {{- with $clusterIP }}
+  {{- if eq $type "ClusterIP" }}
+  {{- with $service.clusterIP }}
   clusterIP: {{ . }}
   {{- end }}
+  {{- end }}
   {{- with $service.externalIPs }}
   externalIPs: {{ toYaml . | nindent 4 }}
   {{- end }}
diff --git a/charts/victoria-metrics-single/values.yaml b/charts/victoria-metrics-single/values.yaml
@@ -351,7 +351,7 @@ server:
     # -- Service labels
     labels: {}
     # -- Service ClusterIP
-    clusterIP: ""
+    clusterIP: "None"
     # -- Service external IPs. Details are [here](https://kubernetes.io/docs/user-guide/services/#external-ips)
     externalIPs: []
     # -- Service load balancer IP
