diff --git a/cluster/addons/fluentd-gcp/event-exporter.yaml b/cluster/addons/fluentd-gcp/event-exporter.yaml index 64b05c879aa..0491f0d947f 100644 --- a/cluster/addons/fluentd-gcp/event-exporter.yaml +++ b/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 diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 50a11bc2494..1d803410f30 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -2112,7 +2112,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 { diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 7159a5581c6..ee470475f21 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -890,6 +890,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) diff --git a/test/e2e/instrumentation/logging/stackdrvier/basic.go b/test/e2e/instrumentation/logging/stackdrvier/basic.go index 865c9bf1a18..e8a30379ec0 100644 --- a/test/e2e/instrumentation/logging/stackdrvier/basic.go +++ b/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, "")