Merge pull request #70 from aeciopires/issue-70

Issue 70

Chart.yaml

@@ -1,8 +1,9 @@
 ---
 apiVersion: v2
 name: zabbix
-version: 3.1.0
-appVersion: 6.2.0
+version: 3.1.1
+# LTS Zabbix version by default due to stability. See: https://www.zabbix.com/life_cycle_and_release_policy
+appVersion: 6.0.7
 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

README.md

@@ -1,6 +1,6 @@
 # Helm Chart For Zabbix.
 
-[![CircleCI](https://circleci.com/gh/cetic/helm-zabbix.svg?style=svg)](https://circleci.com/gh/cetic/helm-zabbix/tree/master) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![version](https://img.shields.io/github/tag/cetic/helm-zabbix.svg?label=release) ![Version: 3.1.0](https://img.shields.io/badge/Version-3.1.0-informational?style=flat-square)
+[![CircleCI](https://circleci.com/gh/cetic/helm-zabbix.svg?style=svg)](https://circleci.com/gh/cetic/helm-zabbix/tree/master) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![version](https://img.shields.io/github/tag/cetic/helm-zabbix.svg?label=release) ![Version: 3.1.1](https://img.shields.io/badge/Version-3.1.1-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.
 
@@ -10,6 +10,12 @@ This Helm chart installs [Zabbix](https://www.zabbix.com) in a Kubernetes cluste
 
 ### Important notes
 
+> **About the Zabbix version supported**
+* This helm chart is compatible with non-LTS version of Zabbix, that include important changes and functionalities.
+* But by default this helm chart will install the latest LTS version (example: 6.0.x).
+See more info in [Zabbix Life Cycle & Release Policy](https://www.zabbix.com/life_cycle_and_release_policy) page
+* When you want use a non-LTS version (example: 6.2.x), you have to set this in values.yaml yourself.
+
 > **Break change 3.0.0**
 * Will be used Postgresql 14.x and Zabbix 6.x.
 * This version removes the possibility to specify database username/password per
@@ -369,7 +375,7 @@ The following tables lists the configurable parameters of the chart and their de
 | route.hostName | string | `"chart-example.local"` | Host Name for the route. Can be left empty |
 | route.tls | object | `{"termination":"edge"}` | Openshift Route TLS settings |
 | tolerations | list | `[]` | Tolerations configurations |
-| zabbix_image_tag | string | `"ubuntu-6.2.0"` | zabbix components (server, agent, web frontend, ...) image tag to use. Overwritten by zabbixserver.image.tag etc. |
+| zabbix_image_tag | string | `"ubuntu-6.0.7"` | Zabbix components (server, agent, web frontend, ...) image tag to use. This helm chart is compatible with non-LTS version of Zabbix, that include important changes and functionalities. But by default this helm chart will install the latest LTS version (example: 6.0.x). See more info in [Zabbix Life Cycle & Release Policy](https://www.zabbix.com/life_cycle_and_release_policy) page When you want use a non-LTS version (example: 6.2.x), you have to set this yourself. You can change version here or overwrite in each component (example: zabbixserver.image.tag, etc). |
 | zabbixagent.ZBX_ACTIVE_ALLOW | bool | `true` | This variable is boolean (true or false) and enables or disables feature of active checks |
 | zabbixagent.ZBX_JAVAGATEWAY_ENABLE | bool | `false` | The variable enable communication with Zabbix Java Gateway to collect Java related checks. By default, value is false. |
 | zabbixagent.ZBX_PASSIVESERVERS | string | `"127.0.0.1"` | The variable is comma separated list of allowed Zabbix server or proxy hosts for connections to Zabbix agent container. |

README.md.gotmpl

@@ -10,6 +10,12 @@ This Helm chart installs [Zabbix](https://www.zabbix.com) in a Kubernetes cluste
 
 ### Important notes
 
+> **About the Zabbix version supported**
+* This helm chart is compatible with non-LTS version of Zabbix, that include important changes and functionalities. 
+* But by default this helm chart will install the latest LTS version (example: 6.0.x). 
+See more info in [Zabbix Life Cycle & Release Policy](https://www.zabbix.com/life_cycle_and_release_policy) page
+* When you want use a non-LTS version (example: 6.2.x), you have to set this in values.yaml yourself.
+
 > **Break change 3.0.0**
 * Will be used Postgresql 14.x and Zabbix 6.x.
 * This version removes the possibility to specify database username/password per

templates/deployment-zabbix-server.yaml

@@ -65,6 +65,14 @@ spec:
           volumeMounts:
             - name: init-waitschema-script
               mountPath: /script
+        {{- with .Values.zabbixserver.extraInitContainers }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- else if eq (.Values.zabbixserver.replicaCount | int) 1 }}
+      initContainers:
+        {{- with .Values.zabbixserver.extraInitContainers }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       {{- end }}
       containers:
         - name: zabbix-server
@@ -163,9 +171,6 @@ spec:
         {{- with .Values.zabbixserver.extraContainers }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- with .Values.zabbixserver.extraInitContainers }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
       imagePullSecrets:
       {{- range .Values.zabbixserver.image.pullSecrets }}
         - name: {{ . | quote }}

templates/deployment-zabbix-web.yaml

@@ -26,6 +26,10 @@ spec:
       {{- with .Values.zabbixweb.extraPodSpecs }}
       {{- toYaml . | nindent 6 }}
       {{- end }}
+      {{- with .Values.zabbixweb.extraInitContainers }}
+      initContainers:
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -99,9 +103,6 @@ spec:
       {{- with .Values.zabbixweb.extraContainers }}
       {{- toYaml . | nindent 6 }}
       {{- end }}
-      {{- with .Values.zabbixweb.extraInitContainers }}
-      {{- toYaml . | nindent 6 }}
-      {{- end }}
       imagePullSecrets:
       {{- range .Values.zabbixweb.image.pullSecrets }}
         - name: {{ . | quote }}

templates/deployment-zabbix-webservice.yaml

@@ -26,6 +26,10 @@ spec:
       {{- with .Values.zabbixwebservice.extraPodSpecs }}
       {{- toYaml . | nindent 6 }}
       {{- end }}
+      {{- with .Values.zabbixwebservice.extraInitContainers }}
+      initContainers:
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -82,9 +86,6 @@ spec:
       {{- with .Values.zabbixwebservice.extraContainers }}
       {{- toYaml . | nindent 6 }}
       {{- end }}
-      {{- with .Values.zabbixwebservice.extraInitContainers }}
-      {{- toYaml . | nindent 6 }}
-      {{- end }}
       imagePullSecrets:
       {{- range .Values.zabbixweb.image.pullSecrets }}
         - name: {{ . | quote }}

templates/statefulset-postgresql.yaml

@@ -48,6 +48,10 @@ spec:
       {{- with .Values.postgresql.extraPodSpecs }}
       {{- toYaml . | nindent 6 }}
       {{- end }}
+      {{- with .Values.postgresql.extraInitContainers }}
+      initContainers:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -98,9 +102,6 @@ spec:
       {{- with .Values.postgresql.extraContainers }}
       {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.postgresql.extraInitContainers }}
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
       volumes:
       {{- if .Values.postgresql.persistence.enabled }}
       {{- if .Values.postgresql.persistence.existing_claim_name }}

templates/statefulset-zabbix-proxy.yaml

@@ -29,6 +29,10 @@ spec:
       {{- toYaml . | nindent 6 }}
       {{- end }}
       {{- with .Values.nodeSelector }}
+      {{- with .Values.zabbixproxy.extraInitContainers }}
+      initContainers:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -132,9 +136,6 @@ spec:
         {{- with .Values.zabbixproxy.extraContainers }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- with .Values.zabbixproxy.extraInitContainers }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
       imagePullSecrets:
       {{- range .Values.zabbixagent.image.pullSecrets }}
         - name: {{ . | quote }}

values.yaml

@@ -2,8 +2,13 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-# -- zabbix components (server, agent, web frontend, ...) image tag to use. Overwritten by zabbixserver.image.tag etc.
-zabbix_image_tag: ubuntu-6.2.0
+# -- Zabbix components (server, agent, web frontend, ...) image tag to use.
+#This helm chart is compatible with non-LTS version of Zabbix, that include important changes and functionalities.
+#But by default this helm chart will install the latest LTS version (example: 6.0.x).
+#See more info in [Zabbix Life Cycle & Release Policy](https://www.zabbix.com/life_cycle_and_release_policy) page
+#When you want use a non-LTS version (example: 6.2.x), you have to set this yourself. You can change version
+#here or overwrite in each component (example: zabbixserver.image.tag, etc).
+zabbix_image_tag: ubuntu-6.0.7
 
 # **Zabbix DB access / credentials** configurations
 # with this dict, you can set unified DB access credentials, IP and so on for both Zabbix server and Zabbix web frontend