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

CRI: Add Windows Podsandbox Stats #110754

Merged
merged 1 commit into from
Nov 3, 2022

Conversation

jsturtevant
Copy link
Contributor

What type of PR is this?

/kind feature

What this PR does / why we need it:

Adds fields to the cri api for Windows to collect metrics from the Container runtime.

Part of kubernetes/enhancements#2371

Follow up to the initial commit that added Linux stats #102789

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

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

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

/sig node
/sig windows

/cc @dcantah @haircommander @bobbypage @marosset

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Jun 23, 2022
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. kind/feature Categorizes issue or PR as related to a new feature. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/windows Categorizes an issue or PR as relevant to SIG Windows. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/kubelet labels Jun 23, 2022
@pacoxu pacoxu added this to Triage in SIG Node PR Triage Jun 24, 2022
@dims
Copy link
Member

dims commented Jun 24, 2022

/assign @dchen1107 @derekwaynecarr

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 24, 2022
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 24, 2022
@jsturtevant jsturtevant added this to In Review (v1.25) in SIG-Windows Jun 30, 2022
@jsturtevant
Copy link
Contributor Author

/priority important-soon
/triage accepted

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jun 30, 2022
@dcantah
Copy link
Member

dcantah commented Jun 30, 2022

Given hyper-v containers will be supported in Containerd through CRI fairly soon, we'll need to see if we can find a nice intersection with the stats that make sense for containers (and we're using the same for the pod sandbox it seems) and the VM. For Windows for memory it seems like we only ever fill in the workingset for memory and leave the rest blank https://github.com/containerd/containerd/blob/7eae7f206ca04fe32ab05cab760bb39fb1fcf2c7/pkg/cri/server/container_stats_list_windows.go#L78

@jsturtevant
Copy link
Contributor Author

@jsturtevant
Copy link
Contributor Author

/milestone v1.25

Signed-off-by: James Sturtevant <jstur@microsoft.com>
@marosset
Copy link
Contributor

marosset commented Nov 3, 2022

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 3, 2022
@mrunalp mrunalp moved this from Needs Approver to Done in SIG Node PR Triage Nov 3, 2022
@k8s-ci-robot k8s-ci-robot merged commit 50a4dd8 into kubernetes:master Nov 3, 2022
mansikulkarni96 added a commit to mansikulkarni96/kubernetes that referenced this pull request May 1, 2023
Part of kubernetes/enhancements#2371

Follow up to the initial work introducing CRI API fields for Windows
metrics collection kubernetes#110754
Windows equivalent work for adding support for Windows
podAndContainerStatsFromCRI kubernetes#103095, which will allow users to get
Windows pod and container stats only from CRI.

Signed-off-by: mansikulkarni96 <mankulka@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
Archived in project
Archived in project
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet