From 168f6f7ecd8c22c5112c24f72ddf9eb713155ea1 Mon Sep 17 00:00:00 2001
From: Zihong Zheng <zihongz@google.com>
Date: Fri, 28 Oct 2016 15:23:18 -0700
Subject: [PATCH] Expose addon manager's log by logging in file

---
 cluster/log-dump.sh                                    |  2 +-
 .../saltbase/salt/kube-addons/kube-addon-manager.yaml  | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cluster/log-dump.sh b/cluster/log-dump.sh
index afea2aa6583..f3948b34b31 100755
--- a/cluster/log-dump.sh
+++ b/cluster/log-dump.sh
@@ -33,7 +33,7 @@ readonly use_kubectl="${LOG_DUMP_USE_KUBECTL:-}"
 readonly master_ssh_supported_providers="gce aws kubemark"
 readonly node_ssh_supported_providers="gce gke aws"
 
-readonly master_logfiles="kube-apiserver kube-scheduler rescheduler kube-controller-manager etcd glbc cluster-autoscaler"
+readonly master_logfiles="kube-apiserver kube-scheduler rescheduler kube-controller-manager etcd glbc cluster-autoscaler kube-addon-manager"
 readonly node_logfiles="kube-proxy"
 readonly aws_logfiles="cloud-init-output"
 readonly gce_logfiles="startupscript"
diff --git a/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml b/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
index 081ce096feb..ce7fb339dd9 100644
--- a/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
+++ b/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
@@ -12,6 +12,10 @@ spec:
   - name: kube-addon-manager
     # When updating version also bump it in cluster/images/hyperkube/static-pods/addon-manager.json
     image: gcr.io/google-containers/kube-addon-manager:v5.2
+    command:
+    - /bin/bash
+    - -c
+    - /opt/kube-addons.sh 1>>/var/log/kube-addon-manager.log 2>&1
     resources:
       requests:
         cpu: 5m
@@ -20,7 +24,13 @@ spec:
     - mountPath: /etc/kubernetes/
       name: addons
       readOnly: true
+    - mountPath: /var/log
+      name: varlog
+      readOnly: false
   volumes:
   - hostPath:
       path: /etc/kubernetes/
     name: addons
+  - hostPath:
+      path: /var/log
+    name: varlog