From 436b9110af75556bbdacee20967be4437bd40c68 Mon Sep 17 00:00:00 2001 From: Alex Robinson Date: Fri, 3 Jun 2016 11:54:01 -0400 Subject: [PATCH] Don't run fluentd-es on GCI masters --- cluster/gce/gci/configure-helper.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 642911eb1c1..d365e699f6f 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -764,7 +764,9 @@ function start-fluentd { if [[ "${ENABLE_NODE_LOGGING:-}" == "true" ]]; then if [[ "${LOGGING_DESTINATION:-}" == "gcp" ]]; then cp "${KUBE_HOME}/kube-manifests/kubernetes/fluentd-gcp.yaml" /etc/kubernetes/manifests/ - elif [[ "${LOGGING_DESTINATION:-}" == "elasticsearch" ]]; then + elif [[ "${LOGGING_DESTINATION:-}" == "elasticsearch" && "${KUBERNETES_MASTER:-}" != "true" ]]; then + # Running fluentd-es on the master is pointless, as it can't communicate + # with elasticsearch from there in the default configuration. cp "${KUBE_HOME}/kube-manifests/kubernetes/fluentd-es.yaml" /etc/kubernetes/manifests/ fi fi