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

Update cAdvisor version to v0.26.0 #46816

Merged
merged 2 commits into from
Jun 5, 2017
Merged

Update cAdvisor version to v0.26.0 #46816

merged 2 commits into from
Jun 5, 2017
+5,949 −1,734

Conversation

dashpole
Copy link
Contributor

@dashpole dashpole commented Jun 2, 2017

issue: #46658

I have requested a 1 day exception for code freeze.

/assign @dchen1107

Fix disk partition discovery for brtfs
Add ZFS support
Add overlay2 storage driver support

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 2, 2017
@dchen1107
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 2, 2017
@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jun 2, 2017
@calebamiles calebamiles added this to the v1.7 milestone Jun 2, 2017
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 2, 2017
@dashpole
Copy link
Contributor Author

dashpole commented Jun 2, 2017

As an update, I had to modify staging/src/k8s.io/apiserver/pkg/storage/etcd/metrics/metrics.go in order to update the prometheus godeps. The counter.Set method was removed, so I recreate the counter instead of setting its value to 0. See the second commit for these changes.

This should be all good to go, and just needs a new LGTM @dchen1107

@dchen1107
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 2, 2017
@dashpole
Copy link
Contributor Author

dashpole commented Jun 4, 2017

@k8s-bot pull-kubernetes-federation-e2e-gce test this

2 similar comments
@dashpole
Copy link
Contributor Author

dashpole commented Jun 4, 2017

@k8s-bot pull-kubernetes-federation-e2e-gce test this

@dashpole
Copy link
Contributor Author

dashpole commented Jun 4, 2017

@k8s-bot pull-kubernetes-federation-e2e-gce test this

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 4, 2017
@dashpole
Copy link
Contributor Author

dashpole commented Jun 4, 2017

@dchen1107 rebase removed lgtm

@dashpole
Copy link
Contributor Author

dashpole commented Jun 4, 2017

@k8s-bot pull-kubernetes-federation-e2e-gce test this

2 similar comments
@dashpole
Copy link
Contributor Author

dashpole commented Jun 4, 2017

@k8s-bot pull-kubernetes-federation-e2e-gce test this

@dashpole
Copy link
Contributor Author

dashpole commented Jun 4, 2017

@k8s-bot pull-kubernetes-federation-e2e-gce test this

@k8s-ci-robot
Copy link
Contributor

@dashpole: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
pull-kubernetes-federation-e2e-gce 56f53b9 link @k8s-bot pull-kubernetes-federation-e2e-gce test this

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@dashpole
Copy link
Contributor Author

dashpole commented Jun 5, 2017

@k8s-bot pull-kubernetes-federation-e2e-gce test this

1 similar comment
@dashpole
Copy link
Contributor Author

dashpole commented Jun 5, 2017

@k8s-bot pull-kubernetes-federation-e2e-gce test this

@dchen1107
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 5, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dashpole, dchen1107

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 46550, 46663, 46816, 46820, 46460)

@k8s-github-robot k8s-github-robot merged commit 39d548f into kubernetes:master Jun 5, 2017
@dashpole dashpole mentioned this pull request Jun 6, 2017
Closed
@dashpole dashpole deleted the update_godep branch June 6, 2017 18:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dchen1107 dchen1107

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.
5 participants
@dashpole @dchen1107 @k8s-ci-robot @k8s-github-robot @calebamiles