[apm-server] allow customizing probes (#671)

This commit makes probes customizable using values. The values where already partly existing but weren't used in the deployment template.
elastic · Jun 18, 2020 · f57cdc7 · f57cdc7
1 parent 00f10e3
commit f57cdc7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git 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 }}
+      {{- end }}
diff --git 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