From e453a1feb7310bd93227aaf69fd124b56d295c06 Mon Sep 17 00:00:00 2001
From: Antoni Zawodny <zawodny@google.com>
Date: Wed, 23 Sep 2020 17:05:57 +0200
Subject: [PATCH] Enable per-zone logexporter pods creation

---
 cluster/log-dump/log-dump.sh                | 4 ++++
 cluster/log-dump/logexporter-daemonset.yaml | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/cluster/log-dump/log-dump.sh b/cluster/log-dump/log-dump.sh
index 8622f03b650..a267ff9950a 100755
--- a/cluster/log-dump/log-dump.sh
+++ b/cluster/log-dump/log-dump.sh
@@ -503,6 +503,9 @@ function dump_nodes_with_logexporter() {
   local -r cloud_provider="${KUBERNETES_PROVIDER}"
   local -r enable_hollow_node_logs="${ENABLE_HOLLOW_NODE_LOGS:-false}"
   local -r logexport_sleep_seconds="$(( 90 + NUM_NODES / 3 ))"
+  if [[ -z "${ZONE_NODE_SELECTOR_DISABLED:-}" ]]; then
+    local -r node_selector="${ZONE_NODE_SELECTOR_LABEL:-topology.kubernetes.io/zone}: ${ZONE}"
+  fi
 
   # Fill in the parameters in the logexporter daemonset template.
   local -r tmp="${KUBE_TEMP}/logexporter"
@@ -510,6 +513,7 @@ function dump_nodes_with_logexporter() {
   mkdir -p "${tmp}"
   cp "${KUBE_ROOT}/cluster/log-dump/logexporter-daemonset.yaml" "${manifest_yaml}"
 
+  sed -i'' -e "s@{{.NodeSelector}}@${node_selector:-}@g" "${manifest_yaml}"
   sed -i'' -e "s@{{.LogexporterNamespace}}@${logexporter_namespace}@g" "${manifest_yaml}"
   sed -i'' -e "s@{{.ServiceAccountCredentials}}@${service_account_credentials}@g" "${manifest_yaml}"
   sed -i'' -e "s@{{.CloudProvider}}@${cloud_provider}@g" "${manifest_yaml}"
diff --git a/cluster/log-dump/logexporter-daemonset.yaml b/cluster/log-dump/logexporter-daemonset.yaml
index 5bbbab520fc..8279ae62f68 100644
--- a/cluster/log-dump/logexporter-daemonset.yaml
+++ b/cluster/log-dump/logexporter-daemonset.yaml
@@ -67,6 +67,8 @@ spec:
           requests:
             cpu: 10m
             memory: 10Mi
+      nodeSelector:
+        {{.NodeSelector}}
       volumes:
       - name: service
         secret: