From 6321a01c1e76f86a55de6c10a3bc3fe56bf73722 Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Tue, 25 Jun 2019 06:32:25 -0500 Subject: [PATCH] Fluentd: Add deployment conditional for probes This adds a conditional check on the deployment type of the Fluentd chart to determine whether to enable the current liveness and readiness probes or not. The current probes are designed around using fluentd as an aggregator and do not function properly when fluentd is deployed as a daemonset. When run as a daemonset and configured to tail files via the tail input plugin, fluentd will prioritize reading the entirety of those files before processing other input types, including opening the forward source socket required for the current probes to function correctly. This results in scenarios where the current probes will fail when in fact fluentd is functioning correctly. Daemonset focused probes to come as a follow on once a proper path forward has been determined Change-Id: I8a164bd47ce1950e0bd6c5043713f4cde9f85d79 Signed-off-by: Steve Wilkerson --- fluentd/templates/deployment-fluentd.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fluentd/templates/deployment-fluentd.yaml b/fluentd/templates/deployment-fluentd.yaml index b6ae52823..6654633b8 100644 --- a/fluentd/templates/deployment-fluentd.yaml +++ b/fluentd/templates/deployment-fluentd.yaml @@ -128,6 +128,7 @@ spec: containerPort: {{ tuple "fluentd" "internal" "service" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - name: metrics containerPort: {{ tuple "fluentd" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} +{{- if eq .Values.deployment.type "Deployment" }} readinessProbe: tcpSocket: port: {{ tuple "fluentd" "internal" "service" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} @@ -138,6 +139,7 @@ spec: port: {{ tuple "fluentd" "internal" "service" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} initialDelaySeconds: 60 timeoutSeconds: 10 +{{- end }} env: - name: NODE_NAME valueFrom: