From 7176af34360b184e73e58b80cf694d7c14d72d98 Mon Sep 17 00:00:00 2001
From: groundhog2k <10630407+groundhog2k@users.noreply.github.com>
Date: Sun, 24 Jan 2021 14:37:43 +0100
Subject: [PATCH] Fixed issues #192, #191, #169 for Elastic (#200)

* Fixed issues #192, #191, #169 forRabbitMQ

* Fixed issues #192, #191, #169 for Redis

* Fixed issues #192, #169 for Postgres

* Fixed issues #192, #191, #169 for MongoDB

* Fixed issues #192, #191, #169 for MariaDB

* Fixed missing headless service

* Fixed issues #192, #191, #169 for Elastic
---
 charts/elasticsearch/Chart.yaml                 |  2 +-
 charts/elasticsearch/README.md                  |  4 +++-
 charts/elasticsearch/templates/statefulset.yaml | 14 +++++++++++---
 charts/elasticsearch/values.yaml                |  6 ++++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/charts/elasticsearch/Chart.yaml b/charts/elasticsearch/Chart.yaml
index 55b33738..e2ed3c49 100644
--- a/charts/elasticsearch/Chart.yaml
+++ b/charts/elasticsearch/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.1.0
+version: 0.1.1
 
 appVersion: 7.10.1
diff --git a/charts/elasticsearch/README.md b/charts/elasticsearch/README.md
index 3a991e56..14a61135 100644
--- a/charts/elasticsearch/README.md
+++ b/charts/elasticsearch/README.md
@@ -1,6 +1,6 @@
 # Elasticsearch
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.10.1](https://img.shields.io/badge/AppVersion-7.10.1-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.10.1](https://img.shields.io/badge/AppVersion-7.10.1-informational?style=flat-square)
 
 A Helm chart for Elasticsearch on Kubernetes
 
@@ -60,6 +60,8 @@ $ helm uninstall my-release
 | imagePullSecrets | list | `[]` | Image pull secrets |
 | livenessProbe | object | `see values.yaml` | Liveness probe configuration |
 | readinessProbe | object | `see values.yaml` | Readiness probe configuration |
+| customLivenessProbe | object | `{}` | Custom liveness probe (overwrites default liveness probe configuration) |
+| customReadinessProbe | object | `{}` | Custom readiness probe (overwrites default readiness probe configuration) |
 | resources | object | `{}` | Resource limits and requests |
 | nodeSelector | object | `{}` | Deployment node selector |
 | podAnnotations | object | `{}` | Additional pod annotations |
diff --git a/charts/elasticsearch/templates/statefulset.yaml b/charts/elasticsearch/templates/statefulset.yaml
index 193a129a..3da552f0 100644
--- a/charts/elasticsearch/templates/statefulset.yaml
+++ b/charts/elasticsearch/templates/statefulset.yaml
@@ -66,7 +66,11 @@ spec:
                   fieldPath: metadata.name
           {{- with .Values.env }}
             {{- toYaml . | nindent 12 }}
-          {{- end }}                  
+          {{- end }}
+          {{- if .Values.customLivenessProbe }}
+          livenessProbe:
+            {{- toYaml .Values.customLivenessProbe | nindent 12 }}
+          {{- else }}
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
@@ -83,6 +87,11 @@ spec:
             periodSeconds: {{ .periodSeconds }}
             {{- end }}
           {{- end }}
+          {{- end }}
+          {{- if .Values.customReadinessProbe }}
+          readinessProbe:
+            {{- toYaml .Values.customReadinessProbe | nindent 12 }}
+          {{- else }}
           {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
             httpGet:
@@ -99,6 +108,7 @@ spec:
             periodSeconds: {{ .periodSeconds }}
             {{- end }}
           {{- end }}
+          {{- end }}
           {{- with .Values.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
@@ -149,8 +159,6 @@ spec:
   volumeClaimTemplates:
     - metadata:
         name: elasticsearch-volume
-        labels:
-          {{- include "elasticsearch.labels" . | nindent 10 }}
       spec:
         {{- with .Values.storage.accessModes }}
         accessModes:
diff --git a/charts/elasticsearch/values.yaml b/charts/elasticsearch/values.yaml
index c9d27bff..fe3a9765 100644
--- a/charts/elasticsearch/values.yaml
+++ b/charts/elasticsearch/values.yaml
@@ -89,6 +89,9 @@ tolerations: []
 affinity: {}
 
 
+## Custom liveness probe (overwrites default liveness probe)
+customLivenessProbe: {}
+
 ## Default liveness probe
 livenessProbe:
   enabled: true
@@ -98,6 +101,9 @@ livenessProbe:
   successThreshold: 1
   periodSeconds: 10
 
+## Custom readiness probe (overwrites default readiness probe)
+customReadinessProbe: {}
+
 ## Default readiness probe
 readinessProbe:
   enabled: true
-- 
GitLab