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.

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

Bump cAdvisor to v0.23.4 #27591

Merged
merged 1 commit into from
Jun 18, 2016
Merged

Conversation

dchen1107
Copy link
Member

@dchen1107 dchen1107 commented Jun 17, 2016

Check for thin_is binary in path for devicemapper when using ThinPoolWatcher and fix uint64 overflow issue for CPU stats

Fix #27194 #27573

@dchen1107
Copy link
Member Author

cc/ @pmorie @Random-Liu

@dchen1107 dchen1107 added sig/node Categorizes an issue or PR as relevant to SIG Node. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jun 17, 2016
@dchen1107 dchen1107 added this to the v1.3 milestone Jun 17, 2016
@dchen1107 dchen1107 added the priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. label Jun 17, 2016
@dchen1107
Copy link
Member Author

#27573

@Random-Liu
Copy link
Member

Random-Liu commented Jun 17, 2016

@dchen1107

FAILED   ./hack/../hack/verify-godep-licenses.sh    8s
Verifying ./hack/../hack/verify-godeps.sh
Checking for 'Godeps/' changes against 'remote/master'
Starting to download all kubernetes godeps. This takes a while
Download finished
Your Godeps.json is different:
--- /go/src/k8s.io/kubernetes/Godeps/Godeps.json    2016-06-16 20:45:21.803968809 -0700
+++ /tmp/gopath.Xqs4LH/src/k8s.io/kubernetes/Godeps/Godeps.json 2016-06-16 21:03:24.052705064 -0700
@@ -2145,10 +2150,6 @@
            "ImportPath": "k8s.io/heapster/metrics/apis/metrics/v1alpha1",
            "Comment": "v1.1.0-beta2",
            "Rev": "9cb18ac0ceb193eb530a1fe339355c94ea454d85"
-       },
-       {
-           "ImportPath": "github.com/vishvananda/netns",
-           "Rev": "8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
        }
    ]
 }
Godeps Verify failed.
Removing /tmp/gopath.Xqs4LH
FAILED   ./hack/../hack/verify-godeps.sh    406s

@dchen1107
Copy link
Member Author

Godep was killing me yesterday. :-( Looking into it now.

@dchen1107
Copy link
Member Author

Ok, including the license for github.com/vishvananda/netns and I think this should fix above godep license issue. cc/ @matchstick

@Random-Liu
Copy link
Member

LGTM. Let's wait for the test result. Godeps is really hard to use...

@dchen1107
Copy link
Member Author

All scripts passed finally.

@Random-Liu Random-Liu added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 18, 2016
@Random-Liu
Copy link
Member

LGTM!

@k8s-bot
Copy link

k8s-bot commented Jun 18, 2016

GCE e2e build/test passed for commit 1ea5c46.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit a521a16 into kubernetes:master Jun 18, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cAdvisor /stats/summary endpoint in kubelet returns incorrect cpu usage numbers
5 participants