-
Notifications
You must be signed in to change notification settings - Fork 672
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
Resolve issue preventing networking container stats from being sent to collector #1218
Resolve issue preventing networking container stats from being sent to collector #1218
Conversation
32b7066
to
7ecf363
Compare
7ecf363
to
cec6ae8
Compare
@jsturtevant Please take a look at my change. Directly mentioning you here as I would appreciate your review. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for picking this up!
cec6ae8
to
9d5fbfa
Compare
8a80aa1
to
9e0fb3c
Compare
@breed808 I think this is close, @tzifudzi is looking into one more thing #1218 (comment) but could we run CI against it? |
I suspect the merge conflict is preventing the CI checks from running, might be worth rebasing the feature branch on Aside from that, great work on this PR so far! I must profess my lack of k8s+Windows experience, but the conversation in this PR is reassuring: there's been a strong focus on stability and testing 👍 |
24d226b
to
a4bf8d8
Compare
@breed808 Thanks for the great feedback. Conflicts have been resolved and I also re-tested the changes manually in nodes with different configurations as listed in the description. Let me know if that resolved the CI checks. Awaiting @jsturtevant's response for one last comment and after that we should be good to go. |
This fix ensures that network stats for containerd on Windows are successfully collected. Before this change, other container stats such as CPU and memory are successfully collected, but network stats are failing for containerd. The root cause is that the code for collecting network stats was originally written to work with docker which relies on v1 schema. After dockershim removal as Kubernetes's container runtime, containerd adoption has increased and this error is more frequently encountered when using containerd as the runtime. containerd uses v2 schema whereby the network stats need to be queried from the HNS component. Signed-off-by: Tatenda Zifudzi <tzifudzi@amazon.com>
a4bf8d8
to
9adefdc
Compare
LGTM |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! Great work with this one.
What type of PR is this?
What this PR does / why we need it
Which issue(s) this PR fixes:
Notes for reviewers
Testing/Verification
Manually tested by compiling new binary with changes and subsequently installing and running the new binary. Tested on both Docker and containerd.
When testing with containerd on Kubernetes
When testing with Docker on Kubernetes
When testing with Docker on plain Windows host (without Kubernetes)