Skip to content

Commit c2aa748

Browse files
AndrewChubatiukvictoriametrics-bot
AndrewChubatiuk
and
victoriametrics-bot
authored
Automatic update CHANGELOGs and READMEs (#1973) (#1975)
Co-authored-by: Github Actions <[email protected]>
1 parent fabb12e commit c2aa748

22 files changed

+73
-35
lines changed

‎charts/victoria-logs-single/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## Next release
22

3+
- added ability to override default headless service .Values.server.service.clusterIP with empty value
34
- vector chart 0.37.x -> 0.40.x
45

56
## 0.8.14

‎charts/victoria-logs-single/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ readOnlyRootFilesystem: true
910910
<td>server.service.clusterIP</td>
911911
<td>string</td>
912912
<td><pre class="helm-vars-default-value language-yaml" lang="">
913-
<code class="language-yaml">""
913+
<code class="language-yaml">None
914914
</code>
915915
</pre>
916916
</td>

‎charts/victoria-logs-single/templates/server-service.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ spec:
2020
{{- end }}
2121
type: {{ $type }}
2222
{{- $clusterIP := $service.clusterIP }}
23-
{{- if and (not $clusterIP) (eq $type "ClusterIP") $app.statefulSet.enabled }}
24-
{{- $clusterIP = "None" }}
25-
{{- end }}
26-
{{- with $clusterIP }}
23+
{{- if eq $type "ClusterIP" }}
24+
{{- with $service.clusterIP }}
2725
clusterIP: {{ . }}
2826
{{- end }}
27+
{{- end }}
2928
{{- with $service.externalIPs }}
3029
externalIPs: {{ toYaml . | nindent 4 }}
3130
{{- end }}

‎charts/victoria-logs-single/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ server:
252252
# -- Service labels
253253
labels: {}
254254
# -- Service ClusterIP
255-
clusterIP: ""
255+
clusterIP: None
256256
# -- Service external IPs. Details are [here]( https://kubernetes.io/docs/user-guide/services/#external-ips)
257257
externalIPs: []
258258
# -- Service load balancer IP

‎charts/victoria-metrics-cluster/CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## Next release
22

3-
- TODO
3+
- added ability to override default headless service `.Values.vmselect.service.clusterIP` with empty value
4+
- added `.Values.common.image.tag` to set the same tag for all cluster components.
45

56
## 0.17.4
67

‎charts/victoria-metrics-cluster/README.md

+25-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,19 @@ Change the values according to the need of the environment in ``victoria-metrics
145145
</code>
146146
</pre>
147147
</td>
148-
<td></td>
148+
<td><p>use SRV discovery for storageNode and selectNode flags for enterprise version</p>
149+
</td>
150+
</tr>
151+
<tr>
152+
<td>common.image</td>
153+
<td>object</td>
154+
<td><pre class="helm-vars-default-value language-yaml" lang="plaintext">
155+
<code class="language-yaml">tag: ""
156+
</code>
157+
</pre>
158+
</td>
159+
<td><p>common for all components image configuration</p>
160+
</td>
149161
</tr>
150162
<tr>
151163
<td>extraObjects</td>
@@ -200,6 +212,17 @@ Change the values according to the need of the environment in ``victoria-metrics
200212
</pre>
201213
</td>
202214
<td><p>Image registry, that can be shared across multiple helm charts</p>
215+
</td>
216+
</tr>
217+
<tr>
218+
<td>global.image.vm.tag</td>
219+
<td>string</td>
220+
<td><pre class="helm-vars-default-value language-yaml" lang="">
221+
<code class="language-yaml">""
222+
</code>
223+
</pre>
224+
</td>
225+
<td><p>Image tag for all vm charts</p>
203226
</td>
204227
</tr>
205228
<tr>
@@ -2632,7 +2655,7 @@ timeoutSeconds: 5
26322655
<td>vmselect.service.clusterIP</td>
26332656
<td>string</td>
26342657
<td><pre class="helm-vars-default-value language-yaml" lang="">
2635-
<code class="language-yaml">""
2658+
<code class="language-yaml">None
26362659
</code>
26372660
</pre>
26382661
</td>

‎charts/victoria-metrics-cluster/templates/service.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@ spec:
2222
{{- $type = "ClusterIP" }}
2323
{{- end }}
2424
type: {{ $type }}
25-
{{- $clusterIP := $service.clusterIP }}
26-
{{- if and (not $clusterIP) (eq $type "ClusterIP") ($app.statefulSet).enabled }}
27-
{{- $clusterIP = "None" }}
25+
{{- if eq $type "ClusterIP" }}
26+
{{- with $service.clusterIP }}
27+
clusterIP: {{. }}
2828
{{- end }}
29-
{{- with $clusterIP }}
30-
clusterIP: {{ . }}
3129
{{- end }}
3230
{{- with $service.externalIPs }}
3331
externalIPs: {{ toYaml . | nindent 4 }}

‎charts/victoria-metrics-cluster/templates/vmauth-deployment.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{{- $app := .Values.vmauth -}}
1+
{{- $app := merge (deepCopy .Values.vmauth) (deepCopy .Values.common) -}}
2+
{{- $_ := set .Values "vmauth" $app }}
23
{{- if $app.enabled -}}
34
{{- $ctx := dict "helm" . "appKey" "vmauth" }}
45
{{- $fullname := include "vm.plain.fullname" $ctx }}

‎charts/victoria-metrics-cluster/templates/vminsert-deployment.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{{- $app := .Values.vminsert -}}
1+
{{- $app := merge (deepCopy .Values.vminsert) (deepCopy .Values.common) -}}
2+
{{- $_ := set .Values "vminsert" $app }}
23
{{- if $app.enabled -}}
34
{{- $ctx := dict "helm" . "appKey" "vminsert" }}
45
{{- $fullname := include "vm.plain.fullname" $ctx }}

‎charts/victoria-metrics-cluster/templates/vmselect-deployment.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{{- $app := .Values.vmselect -}}
1+
{{- $app := merge (deepCopy .Values.vmselect) (deepCopy .Values.common) -}}
2+
{{- $_ := set .Values "vmselect" $app }}
23
{{- if and $app.enabled (not $app.statefulSet.enabled) -}}
34
{{- $ctx := dict "helm" . "appKey" "vmselect" }}
45
{{- $fullname := include "vm.plain.fullname" $ctx }}

‎charts/victoria-metrics-cluster/templates/vmselect-statefulset.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{{- $app := .Values.vmselect }}
1+
{{- $app := merge (deepCopy .Values.vmselect) (deepCopy .Values.common) -}}
2+
{{- $_ := set .Values "vmselect" $app }}
23
{{- if and $app.enabled $app.statefulSet.enabled -}}
34
{{- $ctx := dict "helm" . "appKey" "vmselect" }}
45
{{- $fullname := include "vm.plain.fullname" $ctx }}

‎charts/victoria-metrics-cluster/templates/vmstorage-statefulset.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{{- $app := .Values.vmstorage }}
1+
{{- $app := merge (deepCopy .Values.vmstorage) (deepCopy .Values.common) -}}
2+
{{- $_ := set .Values "vmstorage" $app }}
23
{{- if $app.enabled -}}
34
{{- $ctx := dict "helm" . "appKey" "vmstorage" }}
45
{{- $fullname := include "vm.plain.fullname" $ctx }}

‎charts/victoria-metrics-cluster/tests/__snapshot__/service_test.yaml.snap

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ service should match snapshot:
6161
name: RELEASE-NAME-victoria-metrics-cluster-vmselect
6262
namespace: NAMESPACE
6363
spec:
64+
clusterIP: None
6465
ports:
6566
- name: http
6667
port: 8481
@@ -170,6 +171,7 @@ service should match snapshot with fullnameOverride and extraLabels:
170171
name: vmselect-node
171172
namespace: NAMESPACE
172173
spec:
174+
clusterIP: None
173175
ports:
174176
- name: http
175177
port: 8481

‎charts/victoria-metrics-cluster/values.yaml

+10-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ global:
77
image:
88
# -- Image registry, that can be shared across multiple helm charts
99
registry: ""
10+
vm:
11+
# -- Image tag for all vm charts
12+
tag: ""
1013
# -- Openshift security context compatibility configuration
1114
compatibility:
1215
openshift:
@@ -18,9 +21,14 @@ global:
1821
# -- Print information after deployment
1922
printNotes: true
2023

21-
# use SRV discovery for storageNode and selectNode flags for enterprise version
24+
# -- use SRV discovery for storageNode and selectNode flags for enterprise version
2225
autoDiscovery: false
2326

27+
common:
28+
# -- common for all components image configuration
29+
image:
30+
tag: ""
31+
2432
serviceAccount:
2533
# -- Specifies whether a service account should be created
2634
create: true
@@ -220,7 +228,7 @@ vmselect:
220228
# -- Service labels
221229
labels: {}
222230
# -- Service ClusterIP
223-
clusterIP: ""
231+
clusterIP: None
224232
# -- Service external IPs. Details are [here](https://kubernetes.io/docs/user-guide/services/#external-ips)
225233
externalIPs: []
226234
# -- Extra service ports

‎charts/victoria-metrics-common/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Next release
44

5-
- TODO
5+
- Fix overwrite per service empty registry
66

77
## 0.0.38
88

‎charts/victoria-metrics-common/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
type: library
33
description: Victoria Metrics Common - contains shared templates for all Victoria Metrics helm charts
44
name: victoria-metrics-common
5-
version: 0.0.38
5+
version: 0.0.39
66
sources:
77
- https://github.com/VictoriaMetrics/helm-charts
88
kubeVersion: ">=1.23.0-0"

‎charts/victoria-metrics-common/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
![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)
3+
![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)
44
![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)
55
![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)
66
![Slack](https://img.shields.io/badge/Join-4A154B?logo=slack&link=https%3A%2F%2Fslack.victoriametrics.com)

‎charts/victoria-metrics-common/templates/_image.tpl

+6-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@ Victoria Metrics Image
5050
{{- end -}}
5151
{{- end -}}
5252
{{- $image := ternary $ctx.image $values.image (hasKey $ctx "image") -}}
53-
{{- if and (not $image.registry) (hasKey $image "registry") -}}
54-
{{- $_ := unset $image "registry" -}}
53+
{{- if not $image.registry }}
54+
{{- if (($Values.global).image).registry -}}
55+
{{- $_ := set $image "registry" (($Values.global).image).registry -}}
56+
{{- else if hasKey $image "registry" -}}
57+
{{- $_ := unset $image "registry" -}}
58+
{{- end -}}
5559
{{- end -}}
56-
{{- $image = mergeOverwrite (deepCopy (($Values.global).image | default dict)) ($image | default dict) -}}
5760
{{- toYaml (dict "image" $image) -}}
5861
{{- end -}}

‎charts/victoria-metrics-single/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Next release
22

3-
- TODO
3+
- added ability to override default headless service .Values.server.service.clusterIP with empty value
44

55
## 0.13.8
66

‎charts/victoria-metrics-single/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ scrape_configs:
12061206
<td>server.service.clusterIP</td>
12071207
<td>string</td>
12081208
<td><pre class="helm-vars-default-value language-yaml" lang="">
1209-
<code class="language-yaml">""
1209+
<code class="language-yaml">None
12101210
</code>
12111211
</pre>
12121212
</td>

‎charts/victoria-metrics-single/templates/server-service.yaml

+3-5
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ spec:
2121
{{- $type = "ClusterIP" }}
2222
{{- end }}
2323
type: {{ $type }}
24-
{{- $clusterIP := $service.clusterIP }}
25-
{{- if and (not $clusterIP) (eq $type "ClusterIP") $app.statefulSet.enabled }}
26-
{{- $clusterIP = "None" }}
27-
{{- end }}
28-
{{- with $clusterIP }}
24+
{{- if eq $type "ClusterIP" }}
25+
{{- with $service.clusterIP }}
2926
clusterIP: {{ . }}
3027
{{- end }}
28+
{{- end }}
3129
{{- with $service.externalIPs }}
3230
externalIPs: {{ toYaml . | nindent 4 }}
3331
{{- end }}

‎charts/victoria-metrics-single/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ server:
351351
# -- Service labels
352352
labels: {}
353353
# -- Service ClusterIP
354-
clusterIP: ""
354+
clusterIP: "None"
355355
# -- Service external IPs. Details are [here](https://kubernetes.io/docs/user-guide/services/#external-ips)
356356
externalIPs: []
357357
# -- Service load balancer IP

0 commit comments

Comments
 (0)