diff --git a/charts/victoria-logs-single/README.md b/charts/victoria-logs-single/README.md index b12ca7df0..52ad3a066 100644 --- a/charts/victoria-logs-single/README.md +++ b/charts/victoria-logs-single/README.md @@ -1,5 +1,5 @@ -![Version: 0.6.3](https://img.shields.io/badge/Version-0.6.3-informational?style=flat-square) + ![Version: 0.6.3](https://img.shields.io/badge/Version-0.6.3-informational?style=flat-square) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/victoriametrics)](https://artifacthub.io/packages/helm/victoriametrics/victoria-logs-single) [![Slack](https://img.shields.io/badge/join%20slack-%23victoriametrics-brightgreen.svg)](https://slack.victoriametrics.com/) diff --git a/charts/victoria-metrics-distributed/CHANGELOG.md b/charts/victoria-metrics-distributed/CHANGELOG.md index 4c6d3a1f6..cb86f8d33 100644 --- a/charts/victoria-metrics-distributed/CHANGELOG.md +++ b/charts/victoria-metrics-distributed/CHANGELOG.md @@ -1,6 +1,8 @@ ## Next release - Do not truncate datasource name +- Support customizing vmauthQueryGlobal spec. Thanks to @olivierbouffet for [the pull request](https://github.com/VictoriaMetrics/helm-charts/pull/1511). +- Support overriding the default name for extra vmagent and vmcluster per zone. ## 0.3.0 diff --git a/charts/victoria-metrics-distributed/Chart.lock b/charts/victoria-metrics-distributed/Chart.lock index c94c251e9..ea7cdf613 100644 --- a/charts/victoria-metrics-distributed/Chart.lock +++ b/charts/victoria-metrics-distributed/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: victoria-metrics-common repository: https://victoriametrics.github.io/helm-charts - version: 0.0.9 + version: 0.0.13 - name: victoria-metrics-k8s-stack repository: https://victoriametrics.github.io/helm-charts - version: 0.25.15 -digest: sha256:e3de52694b1f4f429343d301af18f8c8b1a6674323c2f5bf1757874752c81a6e -generated: "2024-09-07T09:10:18.966418+03:00" + version: 0.25.16 +digest: sha256:70b3cd33db0ca6256a8abc353dbaa0deae4264d8b9664a3ceab5ab7225ab8a99 +generated: "2024-09-19T12:53:54.22191+08:00" diff --git a/charts/victoria-metrics-distributed/Chart.yaml b/charts/victoria-metrics-distributed/Chart.yaml index 6808c084e..766bd1141 100644 --- a/charts/victoria-metrics-distributed/Chart.yaml +++ b/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.3.0 +version: 0.3.1 appVersion: "v1.103.0" sources: - https://github.com/VictoriaMetrics/helm-charts diff --git a/charts/victoria-metrics-distributed/README.md b/charts/victoria-metrics-distributed/README.md index 353834cf0..b1945f658 100644 --- a/charts/victoria-metrics-distributed/README.md +++ b/charts/victoria-metrics-distributed/README.md @@ -1,5 +1,5 @@ -![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) +![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/victoriametrics)](https://artifacthub.io/packages/helm/victoriametrics/victoria-metrics-distributed) [![Slack](https://img.shields.io/badge/join%20slack-%23victoriametrics-brightgreen.svg)](https://slack.victoriametrics.com/) @@ -403,6 +403,16 @@ spec: {}
override the name of the vmauth object
++"" ++
override the name of the vmcluster, by default is vmcluster-
vmagent only meant to proxy write requests to each az, doesn’t support customized remote write address
++"" ++
override the name of the vmcluster, by default is vmcluster-
enabled: true
+name: test-vmagent
spec:
selectAllByDefault: true
diff --git a/charts/victoria-metrics-distributed/templates/_helpers.tpl b/charts/victoria-metrics-distributed/templates/_helpers.tpl
index 6e2a28f6b..07ed1f6b9 100644
--- a/charts/victoria-metrics-distributed/templates/_helpers.tpl
+++ b/charts/victoria-metrics-distributed/templates/_helpers.tpl
@@ -149,7 +149,8 @@ Creates vmclusterSpec map, insert zone's nodeselector and topologySpreadConstrai
{{- $newvmclusterSpec := dict "vminsert" $newvminsert "vmstorage" $newvmstorage "vmselect" $newvmselect }}
{{- $vmclusterSpec = mergeOverwrite (deepCopy $vmclusterSpec) $newvmclusterSpec }}
-{{- $_ := set $zonesMap $rolloutZone.name $vmclusterSpec -}}
+{{- $vmclusterName := default (printf "vmcluster-%s" $rolloutZone.name) $rolloutZone.vmcluster.name }}
+{{- $_ := set $zonesMap $vmclusterName $vmclusterSpec -}}
{{- end -}}
{{- $zonesMap | toYaml }}
{{- end }}
diff --git a/charts/victoria-metrics-distributed/templates/extra-vmagent.yaml b/charts/victoria-metrics-distributed/templates/extra-vmagent.yaml
index 488584a62..75c4631dc 100644
--- a/charts/victoria-metrics-distributed/templates/extra-vmagent.yaml
+++ b/charts/victoria-metrics-distributed/templates/extra-vmagent.yaml
@@ -4,7 +4,7 @@ apiVersion: operator.victoriametrics.com/v1beta1
kind: VMAgent
metadata:
labels: {{ include "victoria-metrics-distributed.labels" . | nindent 4 }}
- name: test-vmagent
+ name: {{ .Values.extraVMAgent.name }}
namespace: {{ include "vm.namespace" . }}
spec: {{ include "victoria-metrics-distributed.extravmagentSpec" . | nindent 2 }}
{{- end }}
diff --git a/charts/victoria-metrics-distributed/templates/per-az/vmcluster.yaml b/charts/victoria-metrics-distributed/templates/per-az/vmcluster.yaml
index f72575ffe..81e725d5b 100644
--- a/charts/victoria-metrics-distributed/templates/per-az/vmcluster.yaml
+++ b/charts/victoria-metrics-distributed/templates/per-az/vmcluster.yaml
@@ -7,7 +7,7 @@ metadata:
{{- with $rolloutZone.annotations }}
annotations: {{ toYaml . | nindent 4 }}
{{- end }}
- name: vmcluster-{{ $zoneName }}
+ name: {{ $zoneName }}
namespace: {{ include "vm.namespace" $ }}
labels: {{ include "victoria-metrics-distributed.labels" $ | nindent 4 }}
spec:
diff --git a/charts/victoria-metrics-distributed/values.yaml b/charts/victoria-metrics-distributed/values.yaml
index 528ef3733..4cf24322c 100644
--- a/charts/victoria-metrics-distributed/values.yaml
+++ b/charts/victoria-metrics-distributed/values.yaml
@@ -72,6 +72,7 @@ availabilityZones:
spec: {}
vmcluster:
enabled: true
+ # -- override the name of the vmcluster, by default is vmcluster-
[]
++8080 +
ClusterIP+
+9443 +