New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New event exporter config with support for new stackdriver resources #63918

Merged
merged 1 commit into from May 18, 2018

Conversation

Projects
None yet
5 participants
@cezarygerard
Contributor

cezarygerard commented May 16, 2018

New event exporter, with support for use new and old stackdriver resource model.

This should also be cherry-picked to release-1.10 branch, as all fluentd-gcp components support new and stackdriver resource model.

Update event-exporter to version v0.2.0  that supports old (gke_container/gce_instance) and new (k8s_container/k8s_node/k8s_pod) stackdriver resources.
@cezarygerard

This comment has been minimized.

Contributor

cezarygerard commented May 16, 2018

@cezarygerard

This comment has been minimized.

Contributor

cezarygerard commented May 16, 2018

@k8s-ci-robot k8s-ci-robot requested review from MaciekPytel and x13n May 16, 2018

local -r location=${ZONE:-}
fi
sed -i -e "s@{{ *event_exporter_location *}}@${location}@g" "$1"
stackdriver_resource_model="${LOGGING_STACKDRIVER_RESOURCE_TYPES:-old}"

This comment has been minimized.

@x13n

x13n May 16, 2018

Member

local -r?

@x13n

This comment has been minimized.

Member

x13n commented May 16, 2018

/ok-to-test

command:
- /event-exporter
- -sink-opts=-location={{ event_exporter_location }}
- -sink-opts=-stackdriver-resource-model={{ exporter_sd_resource_model }}

This comment has been minimized.

@MaciekPytel

MaciekPytel May 16, 2018

Contributor

It the location parameter no longer required? I understand why you add the new parameter, but it's not obvious why you're also removing the old one.

This comment has been minimized.

@cezarygerard

cezarygerard May 16, 2018

Contributor

event exporter now uses metadata server to figure out location. Metadata gives you correct location for regional, zonal and regular clusters.

@MaciekPytel

This comment has been minimized.

Contributor

MaciekPytel commented May 16, 2018

/approve
For cluster/gce.

@cezarygerard

This comment has been minimized.

Contributor

cezarygerard commented May 16, 2018

/test pull-kubernetes-e2e-gce

@x13n

This comment has been minimized.

Member

x13n commented May 16, 2018

/lgtm

@cezarygerard

This comment has been minimized.

Contributor

cezarygerard commented May 16, 2018

/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold and removed lgtm labels May 16, 2018

@cezarygerard

This comment has been minimized.

Contributor

cezarygerard commented May 17, 2018

/hold cancel

spec:
serviceAccountName: event-exporter-sa
containers:
- name: event-exporter
image: k8s.gcr.io/event-exporter:v0.1.9
image: k8s.gcr.io/event-exporter:v0.2.1

This comment has been minimized.

@x13n

x13n May 17, 2018

Member

If you're bumping this to 2.1, bump Deployment version as well.

@cezarygerard

This comment has been minimized.

Contributor

cezarygerard commented May 17, 2018

/test pull-kubernetes-e2e-gce

@cezarygerard

This comment has been minimized.

Contributor

cezarygerard commented May 18, 2018

/test pull-kubernetes-e2e-kops-aws

@cezarygerard

This comment has been minimized.

Contributor

cezarygerard commented May 18, 2018

@x13n @MaciekPytel can you approve and lgtm?

@MaciekPytel

This comment has been minimized.

Contributor

MaciekPytel commented May 18, 2018

I already approved (changes remove lgtm, not approval). I'll leave proper review and lgtm to people with more context.

@x13n

This comment has been minimized.

Member

x13n commented May 18, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label May 18, 2018

@k8s-ci-robot

This comment has been minimized.

Contributor

k8s-ci-robot commented May 18, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cezarygerard, MaciekPytel, x13n

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@cezarygerard

This comment has been minimized.

Contributor

cezarygerard commented May 18, 2018

/test pull-kubernetes-e2e-gce

@k8s-merge-robot

This comment has been minimized.

Contributor

k8s-merge-robot commented May 18, 2018

Automatic merge from submit-queue (batch tested with PRs 63569, 63918, 63980, 63295, 63989). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-merge-robot k8s-merge-robot merged commit f105ae3 into kubernetes:master May 18, 2018

18 checks passed

Submit Queue Queued to run github e2e tests a second time.
Details
cla/linuxfoundation cezarygerard authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke Job succeeded.
Details
pull-kubernetes-e2e-kops-aws Job succeeded.
Details
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped
pull-kubernetes-local-e2e-containerized Skipped
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details

k8s-merge-robot added a commit that referenced this pull request May 30, 2018

Merge pull request #64076 from cezarygerard/automated-cherry-pick-of-#…
…63918-upstream-release-1.10

Automatic merge from submit-queue.

Automated cherry pick of #63918: new event exporter config with support for new stackdriver

Cherry pick of #63918 on release-1.10.

#63918: new event exporter config with support for new stackdriver
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment