github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-19 08:40:42 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2018-05-11 06:00:44 -07:00 committed by GitHub
commit b617748f7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-gcp/event-exporter.yaml
View File

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

7
cluster/gce/gci/configure-helper.sh
View File

@ -2143,7 +2143,12 @@ function update-prometheus-to-sd-parameters {
# Updates parameters in yaml file for event-exporter configuration # Updates parameters in yaml file for event-exporter configuration
function update-event-exporter { 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 { function update-dashboard-controller {

1
cluster/gce/util.sh
View File

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

2
test/e2e/instrumentation/logging/stackdrvier/basic.go
View File

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