added ability to override default headless service

VictoriaMetrics · Feb 5, 2025 · c600fa7 · c600fa7
1 parent 3d7ca44
commit c600fa7
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 25 deletions.
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/Chart.yaml b/charts/victoria-logs-single/Chart.yaml
@@ -3,7 +3,7 @@ type: application
 appVersion: v1.6.1
 description: Victoria Logs Single version - high-performance, cost-effective and scalable logs storage
 name: victoria-logs-single
-version: 0.8.14
+version: 0.8.15
 sources:
   - https://github.com/VictoriaMetrics/helm-charts
 icon: https://avatars.githubusercontent.com/u/43720803?s=200&v=4

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 and (eq $type "ClusterIP") $app.statefulSet.enabled }}
+  {{- 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,6 @@
 ## Next release
 
-- TODO
+- added ability to override default headless service .Values.vmselect.service.clusterIP with empty value
 
 ## 0.17.4
 

diff --git a/charts/victoria-metrics-cluster/Chart.yaml b/charts/victoria-metrics-cluster/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 type: application
 description: Victoria Metrics Cluster version - high-performance, cost-effective and scalable TSDB, long-term remote storage for Prometheus
 name: victoria-metrics-cluster
-version: 0.17.4
+version: 0.17.5
 appVersion: v1.110.0
 sources:
   - https://github.com/VictoriaMetrics/helm-charts

diff --git a/charts/victoria-metrics-cluster/README.md b/charts/victoria-metrics-cluster/README.md
@@ -2632,7 +2632,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 and (eq $type "ClusterIP") ($app.statefulSet).enabled }}
+  {{- with $service.clusterIP }}
+  clusterIP: {{. }}
   {{- end }}
-  {{- with $clusterIP }}
-  clusterIP: {{ . }}
   {{- end }}
   {{- with $service.externalIPs }}
   externalIPs: {{ toYaml . | nindent 4 }}

diff --git a/charts/victoria-metrics-cluster/values.yaml b/charts/victoria-metrics-cluster/values.yaml
@@ -220,7 +220,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-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/Chart.yaml b/charts/victoria-metrics-single/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 type: application
 description: Victoria Metrics Single version - high-performance, cost-effective and scalable TSDB, long-term remote storage for Prometheus
 name: victoria-metrics-single
-version: 0.13.8
+version: 0.13.9
 appVersion: v1.110.0
 sources:
   - https://github.com/VictoriaMetrics/helm-charts

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 and (eq $type "ClusterIP") $app.statefulSet.enabled }}
+  {{- 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