From 42bb7a6092cb8f090eb3fd637b2545986c070ad7 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Fri, 27 Dec 2019 13:37:56 +0100 Subject: [PATCH 1/2] [filebeat] allow override readiness and liveness probes commands --- filebeat/templates/daemonset.yaml | 14 -------------- filebeat/values.yaml | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/filebeat/templates/daemonset.yaml b/filebeat/templates/daemonset.yaml index 3168fafb7..e47472e74 100644 --- a/filebeat/templates/daemonset.yaml +++ b/filebeat/templates/daemonset.yaml @@ -94,22 +94,8 @@ spec: - "-E" - "http.enabled=true" livenessProbe: - exec: - command: - - sh - - -c - - | - #!/usr/bin/env bash -e - curl --fail 127.0.0.1:5066 {{ toYaml .Values.livenessProbe | indent 10 }} readinessProbe: - exec: - command: - - sh - - -c - - | - #!/usr/bin/env bash -e - filebeat test output {{ toYaml .Values.readinessProbe | indent 10 }} resources: {{ toYaml .Values.resources | indent 10 }} diff --git a/filebeat/values.yaml b/filebeat/values.yaml index b1f2d941b..4435674cc 100755 --- a/filebeat/values.yaml +++ b/filebeat/values.yaml @@ -39,12 +39,26 @@ imagePullPolicy: "IfNotPresent" imagePullSecrets: [] livenessProbe: + exec: + command: + - sh + - -c + - | + #!/usr/bin/env bash -e + curl --fail 127.0.0.1:5066 failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 10 timeoutSeconds: 5 readinessProbe: + exec: + command: + - sh + - -c + - | + #!/usr/bin/env bash -e + filebeat test output failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 10 From 4d6cad64a738d1128d53b31fe54bce33636ac5f9 Mon Sep 17 00:00:00 2001 From: Julien Mailleret Date: Fri, 27 Dec 2019 13:40:54 +0100 Subject: [PATCH 2/2] [metricbeat] allow override readiness and liveness probes commands --- metricbeat/templates/daemonset.yaml | 14 -------------- metricbeat/templates/deployment.yaml | 15 +-------------- metricbeat/values.yaml | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 28 deletions(-) diff --git a/metricbeat/templates/daemonset.yaml b/metricbeat/templates/daemonset.yaml index 6bc6441e3..3c030a2fd 100644 --- a/metricbeat/templates/daemonset.yaml +++ b/metricbeat/templates/daemonset.yaml @@ -93,22 +93,8 @@ spec: - "-E" - "http.enabled=true" livenessProbe: - exec: - command: - - sh - - -c - - | - #!/usr/bin/env bash -e - curl --fail 127.0.0.1:5066 {{ toYaml .Values.livenessProbe | indent 10 }} readinessProbe: - exec: - command: - - sh - - -c - - | - #!/usr/bin/env bash -e - metricbeat test output {{ toYaml .Values.readinessProbe | indent 10 }} resources: {{ toYaml .Values.resources | indent 10 }} diff --git a/metricbeat/templates/deployment.yaml b/metricbeat/templates/deployment.yaml index 69ae29573..6c1dc6bd0 100644 --- a/metricbeat/templates/deployment.yaml +++ b/metricbeat/templates/deployment.yaml @@ -68,21 +68,8 @@ spec: - "-E" - "http.enabled=true" livenessProbe: - exec: - command: - - sh - - -c - - | - #!/usr/bin/env bash -e - curl --fail 127.0.0.1:5066 +{{ toYaml .Values.livenessProbe | indent 10 }} readinessProbe: - exec: - command: - - sh - - -c - - | - #!/usr/bin/env bash -e - metricbeat test output {{ toYaml .Values.readinessProbe | indent 10 }} resources: {{ toYaml .Values.resources | indent 10 }} diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 4e8b501f6..6f8591a73 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -91,12 +91,26 @@ imagePullPolicy: "IfNotPresent" imagePullSecrets: [] livenessProbe: + exec: + command: + - sh + - -c + - | + #!/usr/bin/env bash -e + curl --fail 127.0.0.1:5066 failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 10 timeoutSeconds: 5 readinessProbe: + exec: + command: + - sh + - -c + - | + #!/usr/bin/env bash -e + metricbeat test output failureThreshold: 3 initialDelaySeconds: 10 periodSeconds: 10