From e5ea6ae854eef6f82c7b1670d29f0706c61b7e97 Mon Sep 17 00:00:00 2001
From: Alex Robinson <arob@google.com>
Date: Wed, 1 Jul 2015 02:05:25 +0000
Subject: [PATCH] Run fluentd on the master node by default.

This involves adding the logging-write scope to the master when running on GCE.
---
 cluster/gce/coreos/helper.sh                       | 2 +-
 cluster/gce/debian/helper.sh                       | 2 +-
 cluster/saltbase/salt/fluentd-es/fluentd-es.yaml   | 2 +-
 cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml | 2 +-
 cluster/saltbase/salt/top.sls                      | 7 +++++++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cluster/gce/coreos/helper.sh b/cluster/gce/coreos/helper.sh
index 2fc38e1d790..bddf826926a 100644
--- a/cluster/gce/coreos/helper.sh
+++ b/cluster/gce/coreos/helper.sh
@@ -123,7 +123,7 @@ function create-master-instance {
     --image "${MASTER_IMAGE}" \
     --tags "${MASTER_TAG}" \
     --network "${NETWORK}" \
-    --scopes "storage-ro,compute-rw" \
+    --scopes "storage-ro,compute-rw,logging-write" \
     --can-ip-forward \
     --metadata-from-file \
       "startup-script=${KUBE_ROOT}/cluster/gce/configure-vm.sh,kube-env=${KUBE_TEMP}/master-kube-env.yaml" \
diff --git a/cluster/gce/debian/helper.sh b/cluster/gce/debian/helper.sh
index 142cab11787..eaa056ba370 100644
--- a/cluster/gce/debian/helper.sh
+++ b/cluster/gce/debian/helper.sh
@@ -105,7 +105,7 @@ function create-master-instance {
     --image "${MASTER_IMAGE}" \
     --tags "${MASTER_TAG}" \
     --network "${NETWORK}" \
-    --scopes "storage-ro,compute-rw" \
+    --scopes "storage-ro,compute-rw,logging-write" \
     --can-ip-forward \
     --metadata-from-file \
       "startup-script=${KUBE_ROOT}/cluster/gce/configure-vm.sh,kube-env=${KUBE_TEMP}/master-kube-env.yaml" \
diff --git a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
index 7c16cce73f7..55651722ea5 100644
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: fluentd-elasticsearch
-    image: gcr.io/google_containers/fluentd-elasticsearch:1.5
+    image: gcr.io/google_containers/fluentd-elasticsearch:1.6
     resources:
       limits:
         cpu: 100m
diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
index 7433852be58..ca6d557ca1e 100644
--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   containers:
   - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.7
+    image: gcr.io/google_containers/fluentd-gcp:1.8
     resources:
       limits:
         cpu: 100m
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
index 642461b7302..30c42dd4538 100644
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -38,6 +38,13 @@ base:
     - kube-client-tools
     - kube-master-addons
     - kube-admission-controls
+{% if pillar.get('enable_node_logging', '').lower() == 'true' and pillar['logging_destination'] is defined %}
+  {% if pillar['logging_destination'] == 'elasticsearch' %}
+    - fluentd-es
+  {% elif pillar['logging_destination'] == 'gcp' %}
+    - fluentd-gcp
+  {% endif %}
+{% endif %}
 {% if grains['cloud'] is defined and grains['cloud'] != 'vagrant' %}
     - logrotate
 {% endif %}