diff --git a/charts/victoria-metrics-alert/CHANGELOG.md b/charts/victoria-metrics-alert/CHANGELOG.md
index 1737aa7a3..dd1e0fa36 100644
--- a/charts/victoria-metrics-alert/CHANGELOG.md
+++ b/charts/victoria-metrics-alert/CHANGELOG.md
@@ -3,6 +3,7 @@
## Next release
- Added ability to override deployment namespace using `namespaceOverride` and `global.namespaceOverride` variables
+- updated alertmanager args for IPv6 compatibility. See [this issue](https://github.com/VictoriaMetrics/helm-charts/issues/856)
## 0.11.0
diff --git a/charts/victoria-metrics-alert/README.md b/charts/victoria-metrics-alert/README.md
index 1dbe8d3f1..3114f6679 100644
--- a/charts/victoria-metrics-alert/README.md
+++ b/charts/victoria-metrics-alert/README.md
@@ -354,6 +354,16 @@ Prefix
|
+
+ alertmanager.initContainers |
+ list |
+
+[]
+
+ |
+ Additional initContainers to initialize the pod
+ |
+
alertmanager.listenAddress |
string |
diff --git a/charts/victoria-metrics-alert/templates/_helpers.tpl b/charts/victoria-metrics-alert/templates/_helpers.tpl
index 62d229186..8a7dfdfeb 100644
--- a/charts/victoria-metrics-alert/templates/_helpers.tpl
+++ b/charts/victoria-metrics-alert/templates/_helpers.tpl
@@ -237,7 +237,7 @@ http://{{- include "vmalert.alertmanager.fullname" . -}}:9093{{ .Values.alertman
{{- $_ := set $args "storage.path" (ternary $app.persistentVolume.mountPath "/data" $app.persistentVolume.enabled) -}}
{{- $_ := set $args "data.retention" $app.retention -}}
{{- $_ := set $args "web.listen-address" $app.listenAddress -}}
- {{- $_ := set $args "cluster.advertise-address" "$(POD_IP):6783" -}}
+ {{- $_ := set $args "cluster.advertise-address" "[$(POD_IP)]:6783" -}}
{{- with $app.baseURL -}}
{{- $_ := set $args "web.external-url" $app.baseURL -}}
{{- end -}}
diff --git a/charts/victoria-metrics-alert/templates/alertmanager-configmap.yaml b/charts/victoria-metrics-alert/templates/alertmanager-configmap.yaml
index 3865ccd31..b7d9a69e0 100644
--- a/charts/victoria-metrics-alert/templates/alertmanager-configmap.yaml
+++ b/charts/victoria-metrics-alert/templates/alertmanager-configmap.yaml
@@ -4,13 +4,10 @@ kind: ConfigMap
metadata:
name: {{ include "vmalert.alertmanager.configname" .}}
namespace: {{include "vm.namespace" .}}
- labels: {{- include "vmalert.alertmanager.labels" . | nindent 4}}
+ labels: {{ include "vmalert.alertmanager.labels" . | nindent 4 }}
data:
- alertmanager.yaml: |
- {{ toYaml .Values.alertmanager.config | nindent 4 }}
-
-{{- range $key, $value := .Values.alertmanager.templates }}
- {{ $key }}: |-
- {{- $value | nindent 4 }}
+ alertmanager.yaml: |{{ toYaml .Values.alertmanager.config | nindent 4 }}
+ {{- range $key, $value := .Values.alertmanager.templates }}
+ {{ $key }}: |{{ $value | nindent 4 }}
{{- end }}
{{- end }}
diff --git a/charts/victoria-metrics-alert/templates/alertmanager-deployment.yaml b/charts/victoria-metrics-alert/templates/alertmanager-deployment.yaml
index cb91fddff..7fcb412b0 100644
--- a/charts/victoria-metrics-alert/templates/alertmanager-deployment.yaml
+++ b/charts/victoria-metrics-alert/templates/alertmanager-deployment.yaml
@@ -33,6 +33,9 @@ spec:
{{- with ($app.imagePullSecrets | default .Values.global.imagePullSecrets) }}
imagePullSecrets: {{ toYaml . | nindent 8 }}
{{- end }}
+ {{- with $app.initContainers }}
+ initContainers: {{ toYaml . | nindent 8 }}
+ {{- end }}
containers:
- name: alertmanager
{{- if $app.securityContext.enabled }}
diff --git a/charts/victoria-metrics-alert/templates/alertmanager-service.yaml b/charts/victoria-metrics-alert/templates/alertmanager-service.yaml
index 68aab19a6..b1b92de66 100644
--- a/charts/victoria-metrics-alert/templates/alertmanager-service.yaml
+++ b/charts/victoria-metrics-alert/templates/alertmanager-service.yaml
@@ -5,8 +5,7 @@ kind: Service
metadata:
namespace: {{ include "vm.namespace" . }}
{{- with $app.service.annotations }}
- annotations:
- {{- toYaml . | nindent 4 }}
+ annotations: {{ toYaml . | nindent 4 }}
{{- end }}
{{- $ctx := merge (deepCopy .) (dict "extraLabels" $app.service.labels) }}
labels: {{ include "vmalert.alertmanager.labels" $ctx | nindent 4 }}
diff --git a/charts/victoria-metrics-alert/templates/clusterrolebinding.yaml b/charts/victoria-metrics-alert/templates/clusterrolebinding.yaml
index 782689c66..155eb8703 100644
--- a/charts/victoria-metrics-alert/templates/clusterrolebinding.yaml
+++ b/charts/victoria-metrics-alert/templates/clusterrolebinding.yaml
@@ -4,15 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ include "vmalert.server.fullname" . }}-clusterrolebinding
namespace: {{ include "vm.namespace" . }}
- labels:
- {{- include "vmalert.server.labels" . | nindent 4 }}
-{{- with .Values.rbac.extraLabels }}
-{{ toYaml . | indent 4}}
-{{- end }}
-{{- with .Values.rbac.annotations }}
- annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
+ labels: {{ include "vmalert.server.labels" . | nindent 4 }}
+ {{- with .Values.rbac.extraLabels }}
+ {{- toYaml . | nindent 4}}
+ {{- end }}
+ {{- with .Values.rbac.annotations }}
+ annotations: {{ toYaml . | nindent 4 }}
+ {{- end }}
subjects:
- kind: ServiceAccount
name: {{ include "vmalert.serviceAccountName" . }}
diff --git a/charts/victoria-metrics-alert/templates/server-deployment.yaml b/charts/victoria-metrics-alert/templates/server-deployment.yaml
index 3b47ecb33..6d04a12a4 100644
--- a/charts/victoria-metrics-alert/templates/server-deployment.yaml
+++ b/charts/victoria-metrics-alert/templates/server-deployment.yaml
@@ -43,8 +43,7 @@ spec:
imagePullSecrets: {{ toYaml . | nindent 8 }}
{{- end }}
{{- with $app.initContainers }}
- initContainers:
- {{- toYaml . | nindent 8 }}
+ initContainers: {{ toYaml . | nindent 8 }}
{{- end }}
containers:
- name: vmalert
diff --git a/charts/victoria-metrics-alert/templates/serviceaccount.yaml b/charts/victoria-metrics-alert/templates/serviceaccount.yaml
index f3df41358..a2501a4d2 100644
--- a/charts/victoria-metrics-alert/templates/serviceaccount.yaml
+++ b/charts/victoria-metrics-alert/templates/serviceaccount.yaml
@@ -4,10 +4,8 @@ kind: ServiceAccount
metadata:
name: {{ include "vmalert.serviceAccountName" . }}
namespace: {{ include "vm.namespace" . }}
- labels:
- {{- include "vmalert.common.metaLabels" . | nindent 4 }}
+ labels: {{ include "vmalert.common.metaLabels" . | nindent 4 }}
{{- with .Values.serviceAccount.annotations }}
- annotations:
- {{- toYaml . | nindent 4 }}
+ annotations: {{ toYaml . | nindent 4 }}
{{- end }}
{{- end -}}
diff --git a/charts/victoria-metrics-alert/templates/vpa.yaml b/charts/victoria-metrics-alert/templates/vpa.yaml
index f1d79c09d..1af2308d3 100644
--- a/charts/victoria-metrics-alert/templates/vpa.yaml
+++ b/charts/victoria-metrics-alert/templates/vpa.yaml
@@ -5,22 +5,17 @@ metadata:
name: {{ include "vmalert.server.fullname" . }}
namespace: {{ include "vm.namespace" . }}
spec:
- {{- if .Values.server.verticalPodAutoscaler.recommenders }}
- recommenders:
- {{- range .Values.server.verticalPodAutoscaler.recommenders }}
- - name: {{ .name }}
- {{- end }}
+ {{- with .Values.server.verticalPodAutoscaler.recommenders }}
+ recommenders: {{ toYaml . | nindent 4 }}
{{- end }}
targetRef:
apiVersion: apps/v1
kind: Deployment
name: {{ include "vmalert.server.fullname" . }}
- {{- if .Values.server.verticalPodAutoscaler.updatePolicy }}
- updatePolicy:
- {{- toYaml .Values.server.verticalPodAutoscaler.updatePolicy | nindent 4 }}
+ {{- with .Values.server.verticalPodAutoscaler.updatePolicy }}
+ updatePolicy: {{ toYaml . | nindent 4 }}
{{- end }}
- {{- if .Values.server.verticalPodAutoscaler.resourcePolicy }}
- resourcePolicy:
- {{- toYaml .Values.server.verticalPodAutoscaler.resourcePolicy | nindent 4 }}
+ {{- with .Values.server.verticalPodAutoscaler.resourcePolicy }}
+ resourcePolicy: {{ toYaml . | nindent 4 }}
{{- end }}
{{- end }}
diff --git a/charts/victoria-metrics-alert/values.yaml b/charts/victoria-metrics-alert/values.yaml
index 1ee2f8dc1..3b5d39a6a 100644
--- a/charts/victoria-metrics-alert/values.yaml
+++ b/charts/victoria-metrics-alert/values.yaml
@@ -484,6 +484,9 @@ alertmanager:
#- name: config-reloader
# image: reloader-image
+ # -- Additional initContainers to initialize the pod
+ initContainers: []
+
# -- Add extra specs dynamically to this chart
extraObjects: []