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

Automated cherry pick of #90554: kubelet: fix /stats/summary endpoint on Windows when #91103

Merged
merged 1 commit into from Jul 7, 2020
Merged

Automated cherry pick of #90554: kubelet: fix /stats/summary endpoint on Windows when #91103

merged 1 commit into from Jul 7, 2020

Conversation

vboulineau
Copy link
Contributor

Cherry pick of #90554 on release-1.17.

#90554: kubelet: fix /stats/summary endpoint on Windows when

For details on the cherry pick process, see the cherry pick requests page.

@vboulineau
kubelet: fix /stats/summary endpoint on Windows when init-container…
b1fe9ab 
…s are present on the node

Following changes in kubernetes#87730, Kubelet is directly hcsshim to gather stats.
However, unlike `docker stats` API that was used before, hcsshim does not
keep information about exited containers.

When the Kubelet lists containers (`docker_container.go:ListContainers()`),
it sets `All: true`, retrieving non-running containers.

When docker stats is called with such container id, it'll return a valid JSON
with all values set to 0. The non-running containers are filtered later on in the process.

When the hcsshim is called with such container id, it'll return an error, effectively
stopping the stats retrieval for all containers.
@k8s-ci-robot k8s-ci-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label May 14, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.17 milestone May 14, 2020
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 14, 2020
@k8s-ci-robot
Copy link
Contributor

@vboulineau: This cherry pick PR is for a release branch and has not yet been approved by the Patch Release Team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, please ping the kubernetes/patch-release-team in a comment, after it has been approved by the relevant OWNERS.
For details on the patch release process and schedule, see the Patch Releases page.

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.

@k8s-ci-robot k8s-ci-robot added needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels May 14, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @vboulineau. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 14, 2020
@k8s-ci-robot k8s-ci-robot added area/kubelet area/test sig/node Categorizes an issue or PR as relevant to SIG Node. sig/testing Categorizes an issue or PR as relevant to SIG Testing. sig/windows Categorizes an issue or PR as relevant to SIG Windows. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels May 14, 2020
@vboulineau
Copy link
Contributor Author

/kind bug
/priority critical-urgent
/assign @dchen1107

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels May 14, 2020
@feiskyer
Copy link
Member

feiskyer commented Jun 3, 2020

/ok-to-test

@derekwaynecarr @michmike could you help to approve and lgtm the cherry pick?

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 3, 2020
@marosset
Copy link
Contributor

@michmike @derekwaynecarr @dchen1107 can you help get this in by the cherry-pick deadline coming up in a few days?

michmike
michmike approved these changes Jun 10, 2020
View reviewed changes
Copy link
Contributor

@michmike michmike left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

@yujuhong, @derekwaynecarr or @dchen1107 , would it be possible for one of you to take a look at the 3 cherry picks i will tag you now for review. the deadline is coming up soon.
cc: @castrojo for contribx visibility

@marosset
Copy link
Contributor

/lgtm

@zhiweiv zhiweiv mentioned this pull request Jun 18, 2020
Closed
@dchen1107
Copy link
Member

kubelet change is lgtm.

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dchen1107, michmike, vboulineau

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 7, 2020
@tpepper tpepper added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jul 7, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Jul 7, 2020
@mrbobbytables
Copy link
Member

/retest

@k8s-ci-robot k8s-ci-robot merged commit 2d72335 into kubernetes:release-1.17 Jul 7, 2020
@feinoujc feinoujc mentioned this pull request Jul 16, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michmike michmike michmike approved these changes

@madhanrm madhanrm Awaiting requested review from madhanrm

@sjenning sjenning Awaiting requested review from sjenning

Assignees

@michmike michmike

@dchen1107 dchen1107

@marosset marosset

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet area/test cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/testing Categorizes an issue or PR as relevant to SIG Testing. sig/windows Categorizes an issue or PR as relevant to SIG Windows. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.17
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@vboulineau @k8s-ci-robot @feiskyer @marosset @michmike @dchen1107 @mrbobbytables @tpepper