From 60284cdc6771f3a253e0fe20d641563946f26838 Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Thu, 18 Jun 2020 12:44:24 +0200
Subject: [PATCH] [apm-server] allow customizing probes

This commit makes probes customizable using values.
The values where already partly existing but weren't used
in the deployment template.
---
 apm-server/templates/deployment.yaml | 12 +++---------
 apm-server/values.yaml               |  8 ++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/apm-server/templates/deployment.yaml b/apm-server/templates/deployment.yaml
index 87a1bc085..8ffd5ee39 100644
--- a/apm-server/templates/deployment.yaml
+++ b/apm-server/templates/deployment.yaml
@@ -88,15 +88,9 @@ spec:
 {{ toYaml .Values.podSecurityContext | indent 10 }}
 {{- end }}
         livenessProbe:
-          httpGet:
-            path: /
-            port: http
-          initialDelaySeconds: 30
+{{ toYaml .Values.livenessProbe | indent 10 }}
         readinessProbe:
-          httpGet:
-            path: /
-            port: http
-          initialDelaySeconds: 30
+{{ toYaml .Values.readinessProbe | indent 10 }}
         ports:
           - containerPort: {{ .Values.service.port }}
             name: http
@@ -125,4 +119,4 @@ spec:
 {{- end }}
       {{- if .Values.extraContainers }}
 {{ tpl .Values.extraContainers . | indent 6 }}
-      {{- end }}
\ No newline at end of file
+      {{- end }}
diff --git a/apm-server/values.yaml b/apm-server/values.yaml
index 5c1b926bd..f05190d8e 100755
--- a/apm-server/values.yaml
+++ b/apm-server/values.yaml
@@ -80,12 +80,20 @@ podSecurityContext:
   privileged: false
 
 livenessProbe:
+  httpGet:
+    path: /
+    port: http
+  initialDelaySeconds: 30
   failureThreshold: 3
   initialDelaySeconds: 10
   periodSeconds: 10
   timeoutSeconds: 5
 
 readinessProbe:
+  httpGet:
+    path: /
+    port: http
+  initialDelaySeconds: 30
   failureThreshold: 3
   initialDelaySeconds: 10
   periodSeconds: 10