diff --git a/charts/zabbix/Chart.yaml b/charts/zabbix/Chart.yaml index bc84b7d..60b2dbf 100644 --- a/charts/zabbix/Chart.yaml +++ b/charts/zabbix/Chart.yaml @@ -1,9 +1,9 @@ --- apiVersion: v2 # Don't change this name: zabbix -version: 4.1.1 # helm chart version +version: 4.2.0 # helm chart version # LTS Zabbix version by default due to stability. See: https://www.zabbix.com/life_cycle_and_release_policy -appVersion: 6.0.26 # zabbix version +appVersion: 6.0.27 # zabbix version description: Zabbix is a mature and effortless enterprise-class open source monitoring solution for network monitoring and application monitoring of millions of metrics. keywords: - zabbix diff --git a/charts/zabbix/README.md b/charts/zabbix/README.md index f3c7260..1f83688 100644 --- a/charts/zabbix/README.md +++ b/charts/zabbix/README.md @@ -1,6 +1,6 @@ # Helm chart for Zabbix. -[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 4.1.1](https://img.shields.io/badge/Version-4.1.1-informational?style=flat-square) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 4.2.0](https://img.shields.io/badge/Version-4.2.0-informational?style=flat-square) Zabbix is a mature and effortless enterprise-class open source monitoring solution for network monitoring and application monitoring of millions of metrics. diff --git a/charts/zabbix/docs/example/kind/values.yaml b/charts/zabbix/docs/example/kind/values.yaml index 29ce3f0..6f3d167 100644 --- a/charts/zabbix/docs/example/kind/values.yaml +++ b/charts/zabbix/docs/example/kind/values.yaml @@ -1,6 +1,6 @@ # Custom values for zabbix. -zabbixImageTag: 6.4.11-alpine +zabbixImageTag: 6.4.12-alpine postgresAccess: useUnifiedSecret: true diff --git a/charts/zabbix/templates/deployment-zabbix-server.yaml b/charts/zabbix/templates/deployment-zabbix-server.yaml index 5d6fea7..d00d307 100644 --- a/charts/zabbix/templates/deployment-zabbix-server.yaml +++ b/charts/zabbix/templates/deployment-zabbix-server.yaml @@ -13,6 +13,11 @@ metadata: {{- if .Values.zabbixServer.deploymentLabels }} {{- toYaml .Values.zabbixServer.deploymentLabels | nindent 4 }} {{- end }} + {{- if and .Values.zabbixAgent.enabled .Values.zabbixAgent.runAsSidecar }} + {{- if .Values.zabbixAgent.deploymentLabels }} + {{- toYaml .Values.zabbixAgent.deploymentLabels | nindent 4 }} + {{- end }} + {{- end }} annotations: {{- range $key,$value := .Values.zabbixServer.deploymentAnnotations }} {{ $key }}: {{ $value | quote }} @@ -37,6 +42,11 @@ spec: {{- if .Values.zabbixServer.containerLabels }} {{- toYaml .Values.zabbixServer.containerLabels | nindent 8 }} {{- end }} + {{- if and .Values.zabbixAgent.enabled .Values.zabbixAgent.runAsSidecar }} + {{- if .Values.zabbixAgent.containerLabels }} + {{- toYaml .Values.zabbixAgent.containerLabels | nindent 8 }} + {{- end }} + {{- end }} spec: serviceAccountName: {{ template "zabbix.serviceAccountName" . }} {{- with .Values.zabbixServer.extraPodSpecs }} diff --git a/charts/zabbix/templates/statefulset-zabbix-proxy.yaml b/charts/zabbix/templates/statefulset-zabbix-proxy.yaml index a768f4e..4ab15e6 100644 --- a/charts/zabbix/templates/statefulset-zabbix-proxy.yaml +++ b/charts/zabbix/templates/statefulset-zabbix-proxy.yaml @@ -13,6 +13,11 @@ metadata: {{- if .Values.zabbixProxy.statefulSetLabels }} {{- toYaml .Values.zabbixProxy.statefulSetLabels | nindent 4 }} {{- end }} + {{- if and .Values.zabbixAgent.enabled .Values.zabbixAgent.runAsSidecar }} + {{- if .Values.zabbixAgent.deploymentLabels }} + {{- toYaml .Values.zabbixAgent.deploymentLabels | nindent 4 }} + {{- end }} + {{- end }} annotations: {{- range $key,$value := .Values.zabbixProxy.statefulSetAnnotations }} {{ $key }}: {{ $value | quote }} @@ -38,6 +43,11 @@ spec: {{- if .Values.zabbixProxy.containerLabels }} {{- toYaml .Values.zabbixProxy.containerLabels | nindent 8 }} {{- end }} + {{- if and .Values.zabbixAgent.enabled .Values.zabbixAgent.runAsSidecar }} + {{- if .Values.zabbixAgent.containerLabels }} + {{- toYaml .Values.zabbixAgent.containerLabels | nindent 8 }} + {{- end }} + {{- end }} spec: serviceAccountName: {{ template "zabbix.serviceAccountName" . }} {{- with .Values.zabbixProxy.extraPodSpecs }}