From fc12b5ff2d086f62cda6145c41479451e7958b41 Mon Sep 17 00:00:00 2001 From: Andrii Chubatiuk Date: Mon, 11 Nov 2024 21:17:01 +0200 Subject: [PATCH] added configmap template --- charts/victoria-metrics-agent/CHANGELOG.md | 1 + charts/victoria-metrics-agent/templates/_helpers.tpl | 6 ++++++ .../victoria-metrics-agent/templates/configmap.yaml | 2 +- .../victoria-metrics-agent/templates/deployment.yaml | 2 +- .../templates/statefulset.yaml | 2 +- charts/victoria-metrics-agent/values.yaml | 2 +- charts/victoria-metrics-alert/CHANGELOG.md | 1 + charts/victoria-metrics-alert/templates/_helpers.tpl | 12 ++++++++++++ .../templates/alertmanager-configmap.yaml | 2 +- .../templates/alertmanager-deployment.yaml | 2 +- .../templates/server-alerts-configmap.yaml | 2 +- .../templates/server-deployment.yaml | 2 +- charts/victoria-metrics-gateway/CHANGELOG.md | 1 + .../victoria-metrics-gateway/templates/_helpers.tpl | 6 ++++++ .../templates/configmap.yaml | 5 ++--- .../templates/deployment.yaml | 2 +- 16 files changed, 38 insertions(+), 12 deletions(-) diff --git a/charts/victoria-metrics-agent/CHANGELOG.md b/charts/victoria-metrics-agent/CHANGELOG.md index 75d1d76b2..01289c52b 100644 --- a/charts/victoria-metrics-agent/CHANGELOG.md +++ b/charts/victoria-metrics-agent/CHANGELOG.md @@ -2,6 +2,7 @@ - set default DNS domain to `cluster.local.` - updated common dependency 0.0.19 -> 0.0.23 +- added template for configmap name ## 0.14.6 diff --git a/charts/victoria-metrics-agent/templates/_helpers.tpl b/charts/victoria-metrics-agent/templates/_helpers.tpl index c735c17d9..d8da2320f 100644 --- a/charts/victoria-metrics-agent/templates/_helpers.tpl +++ b/charts/victoria-metrics-agent/templates/_helpers.tpl @@ -42,3 +42,9 @@ {{- end -}} {{- toYaml $rwcm -}} {{- end -}} + +{{- define "vmagent.scrape.config.name" -}} + {{- $Values := (.helm).Values | default .Values -}} + {{- $fullname := include "vm.plain.fullname" . -}} + {{- $Values.configMap | default (printf "%s-config" $fullname) -}} +{{- end -}} diff --git a/charts/victoria-metrics-agent/templates/configmap.yaml b/charts/victoria-metrics-agent/templates/configmap.yaml index 12bee268d..ef0cbd521 100644 --- a/charts/victoria-metrics-agent/templates/configmap.yaml +++ b/charts/victoria-metrics-agent/templates/configmap.yaml @@ -6,7 +6,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ $fullname }}-config + name: {{ include "vmagent.scrape.config.name" $ctx }} namespace: {{ $ns }} labels: {{ include "vm.labels" $ctx | nindent 4 }} data: diff --git a/charts/victoria-metrics-agent/templates/deployment.yaml b/charts/victoria-metrics-agent/templates/deployment.yaml index 70071fae8..719938509 100644 --- a/charts/victoria-metrics-agent/templates/deployment.yaml +++ b/charts/victoria-metrics-agent/templates/deployment.yaml @@ -162,7 +162,7 @@ spec: {{- end }} - name: scrape-config configMap: - name: {{ .Values.configMap | default (printf "%s-config" $fullname) }} + name: {{ include "vmagent.scrape.config.name" $ctx }} {{- range .Values.extraHostPathMounts }} - name: {{ .name }} hostPath: diff --git a/charts/victoria-metrics-agent/templates/statefulset.yaml b/charts/victoria-metrics-agent/templates/statefulset.yaml index c2699e4ad..3f69089d1 100644 --- a/charts/victoria-metrics-agent/templates/statefulset.yaml +++ b/charts/victoria-metrics-agent/templates/statefulset.yaml @@ -174,7 +174,7 @@ spec: {{- end }} - name: scrape-config configMap: - name: {{ .Values.configMap | default (printf "%s-config" $fullname) }} + name: {{ include "vmagent.scrape.config.name" $ctx }} {{- range .Values.extraHostPathMounts }} - name: {{ .name }} hostPath: diff --git a/charts/victoria-metrics-agent/values.yaml b/charts/victoria-metrics-agent/values.yaml index e454fb6fe..e281965fb 100644 --- a/charts/victoria-metrics-agent/values.yaml +++ b/charts/victoria-metrics-agent/values.yaml @@ -95,7 +95,7 @@ podDisruptionBudget: # -- Generates `remoteWrite.*` flags and config maps with value content for values, that are of type list of map. # Each item should contain `url` param to pass validation. -remoteWrite: +remoteWrite: [] # - url: http://vm-insert:8480/insert/0/prometheus # urlRelabelConfig: # - action: keep diff --git a/charts/victoria-metrics-alert/CHANGELOG.md b/charts/victoria-metrics-alert/CHANGELOG.md index 7c18f8ed3..4b6f3d62f 100644 --- a/charts/victoria-metrics-alert/CHANGELOG.md +++ b/charts/victoria-metrics-alert/CHANGELOG.md @@ -5,6 +5,7 @@ - fix Deployment/StatefulSets when `serviceAccount.name` is empty and `serviceAccount.create: false`. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/1683). - set default DNS domain to `cluster.local.` - updated common dependency 0.0.19 -> 0.0.23 +- added template for configmap name. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/1734) ## 0.12.4 diff --git a/charts/victoria-metrics-alert/templates/_helpers.tpl b/charts/victoria-metrics-alert/templates/_helpers.tpl index 83faffeb3..e8d11dcaf 100644 --- a/charts/victoria-metrics-alert/templates/_helpers.tpl +++ b/charts/victoria-metrics-alert/templates/_helpers.tpl @@ -189,3 +189,15 @@ Create base alertmanager url for notifers {{- $args = mergeOverwrite $args $app.extraArgs -}} {{- toYaml (fromYaml (include "vm.args" $args)).args -}} {{- end -}} + +{{- define "vmalert.rules.config.name" -}} + {{- $Values := (.helm).Values | default .Values -}} + {{- $fullname := include "vm.plain.fullname" . -}} + {{- $Values.server.configMap | default (printf "%s-alert-rules-config" $fullname) -}} +{{- end -}} + +{{- define "alertmanager.config.name" -}} + {{- $Values := (.helm).Values | default .Values -}} + {{- $fullname := include "vm.plain.fullname" . -}} + {{- $Values.alertmanager.configMap | default (printf "%s-config" $fullname) -}} +{{- end -}} diff --git a/charts/victoria-metrics-alert/templates/alertmanager-configmap.yaml b/charts/victoria-metrics-alert/templates/alertmanager-configmap.yaml index 8be9c21bc..6279540d1 100644 --- a/charts/victoria-metrics-alert/templates/alertmanager-configmap.yaml +++ b/charts/victoria-metrics-alert/templates/alertmanager-configmap.yaml @@ -5,7 +5,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ $fullname }}-config + name: {{ include "alertmanager.config.name" $ctx }} namespace: {{ $ns }} labels: {{ include "vm.labels" $ctx | nindent 4 }} data: diff --git a/charts/victoria-metrics-alert/templates/alertmanager-deployment.yaml b/charts/victoria-metrics-alert/templates/alertmanager-deployment.yaml index f9b1e24a1..44c07777b 100644 --- a/charts/victoria-metrics-alert/templates/alertmanager-deployment.yaml +++ b/charts/victoria-metrics-alert/templates/alertmanager-deployment.yaml @@ -116,7 +116,7 @@ spec: {{- end }} - name: config configMap: - name: {{ $fullname }}-config + name: {{ include "alertmanager.config.name" $ctx }} {{- range $app.extraHostPathMounts }} - name: {{ .name }} hostPath: diff --git a/charts/victoria-metrics-alert/templates/server-alerts-configmap.yaml b/charts/victoria-metrics-alert/templates/server-alerts-configmap.yaml index 3a5152141..540196513 100644 --- a/charts/victoria-metrics-alert/templates/server-alerts-configmap.yaml +++ b/charts/victoria-metrics-alert/templates/server-alerts-configmap.yaml @@ -5,7 +5,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ $fullname }}-alert-rules-config + name: {{ include "vmalert.rules.config.name" $ctx }} namespace: {{ $ns }} labels: {{ include "vm.labels" $ctx | nindent 4 }} data: diff --git a/charts/victoria-metrics-alert/templates/server-deployment.yaml b/charts/victoria-metrics-alert/templates/server-deployment.yaml index 5ff877655..5a54fec98 100644 --- a/charts/victoria-metrics-alert/templates/server-deployment.yaml +++ b/charts/victoria-metrics-alert/templates/server-deployment.yaml @@ -115,7 +115,7 @@ spec: volumes: - name: alerts-config configMap: - name: {{ $fullname }}-alert-rules-config + name: {{ include "vmalert.rules.config.name" $ctx }} {{- range $app.extraHostPathMounts }} - name: {{ .name }} hostPath: diff --git a/charts/victoria-metrics-gateway/CHANGELOG.md b/charts/victoria-metrics-gateway/CHANGELOG.md index 7e6ed0d8b..ff5b252e6 100644 --- a/charts/victoria-metrics-gateway/CHANGELOG.md +++ b/charts/victoria-metrics-gateway/CHANGELOG.md @@ -2,6 +2,7 @@ - set default DNS domain to `cluster.local.` - updated common dependency 0.0.19 -> 0.0.23 +- added template for configmap name ## 0.5.5 diff --git a/charts/victoria-metrics-gateway/templates/_helpers.tpl b/charts/victoria-metrics-gateway/templates/_helpers.tpl index 6714c5f49..29b56567d 100644 --- a/charts/victoria-metrics-gateway/templates/_helpers.tpl +++ b/charts/victoria-metrics-gateway/templates/_helpers.tpl @@ -17,3 +17,9 @@ {{- $args = mergeOverwrite $args $Values.extraArgs -}} {{- toYaml (fromYaml (include "vm.args" $args)).args -}} {{- end -}} + +{{- define "vmgateway.config.name" -}} + {{- $Values := (.helm).Values | default .Values -}} + {{- $fullname := include "vm.plain.fullname" . -}} + {{- $Values.configMap | default (printf "%s-config" $fullname) -}} +{{- end -}} diff --git a/charts/victoria-metrics-gateway/templates/configmap.yaml b/charts/victoria-metrics-gateway/templates/configmap.yaml index b7bb8c1fb..eea1413d5 100644 --- a/charts/victoria-metrics-gateway/templates/configmap.yaml +++ b/charts/victoria-metrics-gateway/templates/configmap.yaml @@ -1,12 +1,11 @@ -{{- if eq .Values.configMap "" }} +{{- if empty .Values.configMap }} {{- if .Values.rateLimiter.enabled }} {{- $ctx := dict "helm" . }} -{{- $fullname := include "vm.plain.fullname" $ctx }} {{- $ns := include "vm.namespace" $ctx }} apiVersion: v1 kind: ConfigMap metadata: - name: {{ $fullname }} + name: {{ include "vmgateway.config.name" $ctx }} namespace: {{ $ns }} labels: {{ include "vm.labels" $ctx | nindent 4 }} data: diff --git a/charts/victoria-metrics-gateway/templates/deployment.yaml b/charts/victoria-metrics-gateway/templates/deployment.yaml index 28ae0987b..ae084653f 100644 --- a/charts/victoria-metrics-gateway/templates/deployment.yaml +++ b/charts/victoria-metrics-gateway/templates/deployment.yaml @@ -128,7 +128,7 @@ spec: {{- if .Values.rateLimiter.enabled }} - name: config configMap: - name: {{ $fullname }} + name: {{ include "vmgateway.config.name" $ctx }} {{- end }} {{- range .Values.extraHostPathMounts }} - name: {{ .name }}