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

kubelet: Implement support for Windows podAndContainerStatsFromCRI #116968

Merged
merged 2 commits into from
Jul 18, 2023
Merged

kubelet: Implement support for Windows podAndContainerStatsFromCRI #116968

merged 2 commits into from
Jul 18, 2023

Conversation

mansikulkarni96
Copy link
Contributor

@mansikulkarni96 mansikulkarni96 commented Mar 28, 2023 •
edited
Loading

What type of PR is this?

/kind feature

What this PR does / why we need it:

Part of kubernetes/enhancements#2371

Follow up to the initial work introducing CRI API fields for Windows metrics collection #110754

Windows equivalent work for adding support for Windows podAndContainerStatsFromCRI #103095, which will allow users to get Windows pod and container stats only from CRI.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Allows users to specify Kubelet PodAndContainerStatsFromCRI featuregate that will get Windows pod and container stats only from CRI.

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

[KEP]: https://github.com/kubernetes/enhancements/issues/2371

/sig windows
/sig-node

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. kind/feature Categorizes issue or PR as related to a new feature. labels Mar 28, 2023
@k8s-ci-robot
Copy link
Contributor

Please note that we're already in Test Freeze for the release-1.27 branch. This means every merged PR will be automatically fast-forwarded via the periodic ci-fast-forward job to the release branch of the upcoming v1.27.0 release.

Fast forwards are scheduled to happen every 6 hours, whereas the most recent run was: Tue Mar 28 16:29:22 UTC 2023.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Mar 28, 2023
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Mar 28, 2023 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: mansikulkarni96 / name: Mansi Kulkarni (a9d959a81ddaf189043daa50896b74117b7b9eec)

@k8s-ci-robot k8s-ci-robot added sig/node Categorizes an issue or PR as relevant to SIG Node. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Mar 28, 2023
@k8s-ci-robot
Copy link
Contributor

Welcome @mansikulkarni96!

It looks like this is your first PR to kubernetes/kubernetes 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kubernetes has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@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. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 28, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @mansikulkarni96. 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 cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Mar 28, 2023
@mansikulkarni96 mansikulkarni96 force-pushed the windowsStatsFromCRI branch 2 times, most recently from c0dd701 to e855e49 Compare March 29, 2023 04:58
@mansikulkarni96
Copy link
Contributor Author

/cc: @jsturtevant

@jsturtevant
Copy link
Contributor

/priority important soon
/traige accepted
/milestone v1.28

@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Mar 31, 2023
@k8s-ci-robot
Copy link
Contributor

@jsturtevant: The label(s) priority/important, priority/soon cannot be applied, because the repository doesn't have them.

In response to this:

/priority important soon
/traige accepted
/milestone v1.28

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.

@jsturtevant
Copy link
Contributor

/priority important-soon

@jsturtevant
Copy link
Contributor

Merged some changes that should fix the nodes coming online
/test pull-kubernetes-e2e-capz-windows-alpha-features

@jsturtevant
Copy link
Contributor

nodes made it further, going to run one more time
/test pull-kubernetes-e2e-capz-windows-alpha-features

This was referenced Jun 10, 2023
Merged
Merged
@jsturtevant
Copy link
Contributor

I was able to get the tests to pass after fixes in containerd/containerd#8671

@zelenushechka
Copy link
Member

Hello @jsturtevant 😊 ! I would like to reach out and confirm if this issue is still on track for the 1.28 release. Could you please provide an update on its progress? Thank you!

@marosset
Copy link
Contributor

Hello @jsturtevant 😊 ! I would like to reach out and confirm if this issue is still on track for the 1.28 release. Could you please provide an update on its progress? Thank you!

This issue is still on track for 1.28.
We need to get a change into containerd and once that merges we can review/merge this PR.
Thanks!

@zelenushechka
Copy link
Member

Hello. I wanted to let you know that Code Freeze is coming up at 01:00 UTC Wednesday 19th July 2023 / 18:00 PDT Tuesday 18th July 2023, Please make sure that this PR is submitted before the deadline. We are currently in Week 7, and the Code Freeze will be in effect by Week 9.
Do let me know if I can be of any help :)

@zelenushechka
Copy link
Member

Week 9 update: Code Freeze is approaching!

Hey! We are currently in Week 9, and Code Freeze is just over a week away. It will begin at 01:00 UTC on Wednesday, 19th July 2023 / 18:00 PDT on Tuesday, 18th July 2023. Please ensure all necessary submissions are made before the deadline. Let me know if you need any assistance. :)

@marosset
Copy link
Contributor

@haircommander / @mrunalp - Can one of you take a look at this for SIG-Node?
We'd like to get this merged for 1.28

@haircommander
Copy link
Contributor

code LGTM

Do we need to block this on containerd/containerd#8671 to get tests passing so we don't merge with failing tests?

@marosset
Copy link
Contributor

code LGTM

Do we need to block this on containerd/containerd#8671 to get tests passing so we don't merge with failing tests?

I don't think we need to block this PR on the failing tests.
For a majority of the SIG-windows test passes we are going to keep using the current method for stat collection and enable this feature for some new tests which we're OK seeing failures in.

@jsturtevant
Copy link
Contributor

containerd/containerd#8671 merged
/test pull-kubernetes-e2e-capz-windows-alpha-features

@aravindhp
Copy link
Contributor

@haircommander this is ready for review again. Thanks.

@haircommander
Copy link
Contributor

LGTM, assuming happy tests

@haircommander
Copy link
Contributor

I think you'd neeed to pull in a new containerd to get the test fixes, no?

@mansikulkarni96
Copy link
Contributor Author

AFAIK we are running this test with containerd nightly.

@jsturtevant
Copy link
Contributor

the nightly package hadn't updated with the changes. It should have the changes now
/test pull-kubernetes-e2e-capz-windows-alpha-features

@haircommander
Copy link
Contributor

/lgtm

thanks!

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

LGTM label has been added.

Git tree hash: f21197699f9da68cfaf1a7cf25b941d380ec3362

@jsturtevant
Copy link
Contributor

/assign @mrunalp @marosset

@marosset
Copy link
Contributor

/lgtm
Thanks!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mansikulkarni96, mrunalp

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 18, 2023
@k8s-ci-robot k8s-ci-robot merged commit 6b0e66a into kubernetes:master Jul 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@claudiubelu claudiubelu claudiubelu left review comments

@jsturtevant jsturtevant jsturtevant left review comments

@mrunalp mrunalp mrunalp approved these changes

@krmayankk krmayankk Awaiting requested review from krmayankk

@yujuhong yujuhong Awaiting requested review from yujuhong

@andrewsykim andrewsykim Awaiting requested review from andrewsykim

@feiskyer feiskyer Awaiting requested review from feiskyer

@bobbypage bobbypage Awaiting requested review from bobbypage

@ffromani ffromani Awaiting requested review from ffromani

@haircommander haircommander Awaiting requested review from haircommander

@marosset marosset Awaiting requested review from marosset

@SergeyKanzhelev SergeyKanzhelev Awaiting requested review from SergeyKanzhelev

Assignees

@mrunalp mrunalp

@bobbypage bobbypage

@claudiubelu claudiubelu

@haircommander haircommander

@SergeyKanzhelev SergeyKanzhelev

@marosset marosset

@ffromani ffromani

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. 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/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/windows Categorizes an issue or PR as relevant to SIG Windows. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node: code and documentation PRs
Archived in project
[sig-release] Bug Triage
Archived in project
[sig-windows] PR tracking
Status: Done
Milestone
v1.28
Development

Successfully merging this pull request may close these issues.