Skip to content
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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
May 18, 2018
Merged

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

merged 1 commit into from
May 18, 2018

Conversation

cezarygerard
Copy link
Contributor

@cezarygerard cezarygerard commented May 16, 2018 •
edited
Loading

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.

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 16, 2018
@k8s-ci-robot k8s-ci-robot requested review from mwielgus and piosz May 16, 2018 12:51
@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 16, 2018
@cezarygerard
Copy link
Contributor Author

cezarygerard commented May 16, 2018 •
edited
Loading

/cc @kawych @serathius

@cezarygerard
Copy link
Contributor Author

/cc @x13n @MaciekPytel

@k8s-ci-robot k8s-ci-robot requested review from MaciekPytel and x13n May 16, 2018 13:03
x13n
x13n reviewed May 16, 2018
View reviewed changes
cluster/gce/gci/configure-helper.sh Outdated
local -r location=${ZONE:-}
fi
sed -i -e "s@{{ *event_exporter_location *}}@${location}@g" "$1"
stackdriver_resource_model="${LOGGING_STACKDRIVER_RESOURCE_TYPES:-old}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

local -r?

@x13n
Copy link
Member

x13n commented May 16, 2018

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 16, 2018
MaciekPytel
MaciekPytel reviewed May 16, 2018
View reviewed changes
cluster/addons/fluentd-gcp/event-exporter.yaml Outdated
command:
- /event-exporter
- -sink-opts=-location={{ event_exporter_location }}
- -sink-opts=-stackdriver-resource-model={{ exporter_sd_resource_model }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

@cezarygerard cezarygerard May 16, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@MaciekPytel
Copy link
Contributor

/approve
For cluster/gce.

@cezarygerard
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce

@x13n
Copy link
Member

x13n commented May 16, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 16, 2018
@cezarygerard
Copy link
Contributor Author

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 16, 2018
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 17, 2018
@cezarygerard
Copy link
Contributor Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 17, 2018
x13n
x13n reviewed May 17, 2018
View reviewed changes
cluster/addons/fluentd-gcp/event-exporter.yaml
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@cezarygerard
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce

@cezarygerard
Copy link
Contributor Author

/test pull-kubernetes-e2e-kops-aws

@cezarygerard
Copy link
Contributor Author

@x13n @MaciekPytel can you approve and lgtm?

@MaciekPytel
Copy link
Contributor

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

@x13n
Copy link
Member

x13n commented May 18, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 18, 2018
@k8s-ci-robot
Copy link
Contributor

[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
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce

@k8s-github-robot
Copy link

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-github-robot k8s-github-robot merged commit f105ae3 into kubernetes:master May 18, 2018
@cezarygerard cezarygerard mentioned this pull request May 20, 2018
Merged
k8s-github-robot pushed a commit that referenced this pull request May 30, 2018
Merge pull request #64076 from cezarygerard/automated-cherry-pick-of-…
4435309 
…#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
Reviewers

@MaciekPytel MaciekPytel MaciekPytel left review comments

@x13n x13n x13n left review comments

@mwielgus mwielgus Awaiting requested review from mwielgus

@piosz piosz Awaiting requested review from piosz

Assignees

@x13n x13n

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@cezarygerard @x13n @MaciekPytel @k8s-ci-robot @k8s-github-robot