From 5e6171790b910c49bcfcd1511843809b0bfcbf96 Mon Sep 17 00:00:00 2001
From: Matt Matejczyk <mmat@google.com>
Date: Wed, 6 Feb 2019 15:49:29 +0100
Subject: [PATCH] Propagate dump_systemd_journal to logexporter job.

Log exporter changes have been made in
https://github.com/kubernetes/test-infra/pull/11121 and new version has
been pushed in https://github.com/kubernetes/test-infra/pull/11149
---
 cluster/log-dump/log-dump.sh                | 1 +
 cluster/log-dump/logexporter-daemonset.yaml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cluster/log-dump/log-dump.sh b/cluster/log-dump/log-dump.sh
index 7e2e3dd372..3f0b00a7cd 100755
--- a/cluster/log-dump/log-dump.sh
+++ b/cluster/log-dump/log-dump.sh
@@ -349,6 +349,7 @@ function dump_nodes_with_logexporter() {
   sed -i'' -e "s@{{.CloudProvider}}@${cloud_provider}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml"
   sed -i'' -e "s@{{.GCSPath}}@${gcs_artifacts_dir}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml"
   sed -i'' -e "s@{{.EnableHollowNodeLogs}}@${enable_hollow_node_logs}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml"
+  sed -i'' -e "s@{{.DumpSystemdJournal}}@${dump_systemd_journal}@g" "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml"
 
   # Create the logexporter namespace, service-account secret and the logexporter daemonset within that namespace.
   KUBECTL="${KUBE_ROOT}/cluster/kubectl.sh"
diff --git a/cluster/log-dump/logexporter-daemonset.yaml b/cluster/log-dump/logexporter-daemonset.yaml
index 69a0d91fcd..661a2b3fca 100644
--- a/cluster/log-dump/logexporter-daemonset.yaml
+++ b/cluster/log-dump/logexporter-daemonset.yaml
@@ -36,7 +36,7 @@ spec:
     spec:
       containers:
       - name: logexporter-test
-        image: gcr.io/k8s-testimages/logexporter:v0.1.3
+        image: gcr.io/k8s-testimages/logexporter:v0.1.4
         env:
         - name: NODE_NAME
           valueFrom:
@@ -49,6 +49,7 @@ spec:
         - --gcs-path={{.GCSPath}}
         - --gcloud-auth-file-path=/etc/service-account/service-account.json
         - --enable-hollow-node-logs={{.EnableHollowNodeLogs}}
+        - --dump-systemd-journal={{.DumpSystemdJournal}}
         - --sleep-duration=24h
         - --alsologtostderr
         volumeMounts: