Merge pull request #35832 from MrHohn/addon-manager-logs

Automatic merge from submit-queue Expose addon manager's log by logging to file Fixes #35823. Use the same way as how [`kube-proxy`](https://github.com/kubernetes/kubernetes/blob/master/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest) deals with logging. We would be able to check Addon Manager's logs for Jenkins tests after this. Would like to see the Jenkins test result to examine. @mikedanese

Merge pull request #35832 from MrHohn/addon-manager-logs
54274807 · Kubernetes Submit Queue · GitHub · c640eeb8 · 168f6f7e · 54274807
Commit 54274807 authored Nov 08, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

log-dump.sh cluster/log-dump.sh +1 -1

kube-addon-manager.yaml cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml +10 -0

No files found.
--- 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"

--- 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