Merge pull request #62905 from serathius/event-exporter-region

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

[fluentd-gcp addon] Pass region in seperate field

This PR makes location passed to event-exporter based on `MULTIZONE` env.

Fixes https://github.com/kubernetes/kubernetes/issues/62399
```release-note
NONE
```
/cc @loburm

cluster/addons/fluentd-gcp/event-exporter.yaml

@@ -50,7 +50,7 @@ spec:
         image: k8s.gcr.io/event-exporter:v0.1.9
         command:
         - /event-exporter
-        - -sink-opts=-location={{ event_exporter_zone }}
+        - -sink-opts=-location={{ event_exporter_location }}
       # BEGIN_PROMETHEUS_TO_SD
       - name: prometheus-to-sd-exporter
         image: k8s.gcr.io/prometheus-to-sd:v0.2.4

cluster/gce/gci/configure-helper.sh

@@ -2143,7 +2143,12 @@ function update-prometheus-to-sd-parameters {
 
 # Updates parameters in yaml file for event-exporter configuration
 function update-event-exporter {
-    sed -i -e "s@{{ *event_exporter_zone *}}@${ZONE:-}@g" "$1"
+  if [[ "${MULTIMASTER:-}" == "true" ]]; then
+    local -r location=${REGION:-}
+  else
+    local -r location=${ZONE:-}
+  fi
+  sed -i -e "s@{{ *event_exporter_location *}}@${location}@g" "$1"
 }
 
 function update-dashboard-controller {

cluster/gce/util.sh

@@ -892,6 +892,7 @@ CONTAINER_RUNTIME_NAME: $(yaml-quote ${CONTAINER_RUNTIME_NAME:-})
 NODE_LOCAL_SSDS_EXT: $(yaml-quote ${NODE_LOCAL_SSDS_EXT:-})
 LOAD_IMAGE_COMMAND: $(yaml-quote ${LOAD_IMAGE_COMMAND:-})
 ZONE: $(yaml-quote ${ZONE})
+REGION: $(yaml-quote ${REGION})
 VOLUME_PLUGIN_DIR: $(yaml-quote ${VOLUME_PLUGIN_DIR})
 KUBELET_ARGS: $(yaml-quote ${KUBELET_ARGS})
 REQUIRE_METADATA_KUBELET_CONFIG_FILE: $(yaml-quote true)

test/e2e/instrumentation/logging/stackdrvier/basic.go

@@ -163,7 +163,7 @@ var _ = instrumentation.SIGDescribe("Cluster level logging implemented by Stackd
 
 			ginkgo.By("Waiting for events to ingest")
 			location := framework.TestContext.CloudConfig.Zone
-			if framework.TestContext.CloudConfig.MultiZone {
+			if framework.TestContext.CloudConfig.MultiMaster {
 				location = framework.TestContext.CloudConfig.Region
 			}
 			c := utils.NewLogChecker(p, utils.UntilFirstEntryFromLocation(location), utils.JustTimeout, "")