Merge pull request #81681 from zhenglol/sd_test_endpoint

override stackdriver endpoint in event-exporter in test cluster
This commit is contained in:
Kubernetes Prow Robot 2019-09-10 14:32:00 -07:00 committed by GitHub
commit f48659e9fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions

View File

@ -29,11 +29,11 @@ subjects:
apiVersion: apps/v1
kind: Deployment
metadata:
name: event-exporter-v0.2.5
name: event-exporter-v0.3.0
namespace: kube-system
labels:
k8s-app: event-exporter
version: v0.2.5
version: v0.3.0
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
spec:
@ -41,20 +41,20 @@ spec:
selector:
matchLabels:
k8s-app: event-exporter
version: v0.2.5
version: v0.3.0
template:
metadata:
labels:
k8s-app: event-exporter
version: v0.2.5
version: v0.3.0
spec:
serviceAccountName: event-exporter-sa
containers:
- name: event-exporter
image: k8s.gcr.io/event-exporter:v0.2.5
image: k8s.gcr.io/event-exporter:v0.3.0
command:
- /event-exporter
- -sink-opts=-stackdriver-resource-model={{ exporter_sd_resource_model }}
- -sink-opts=-stackdriver-resource-model={{ exporter_sd_resource_model }} -endpoint={{ exporter_sd_endpoint }}
# BEGIN_PROMETHEUS_TO_SD
- name: prometheus-to-sd-exporter
image: k8s.gcr.io/prometheus-to-sd:v0.5.0

View File

@ -2548,6 +2548,7 @@ function update-daemon-set-prometheus-to-sd-parameters {
function update-event-exporter {
local -r stackdriver_resource_model="${LOGGING_STACKDRIVER_RESOURCE_TYPES:-old}"
sed -i -e "s@{{ exporter_sd_resource_model }}@${stackdriver_resource_model}@g" "$1"
sed -i -e "s@{{ exporter_sd_endpoint }}@${STACKDRIVER_TEST_ENDPOINT:-}@g" "$1"
}
function update-dashboard-controller {