Skip to content

[release/1.6] Backport Windows HostProcess test improvements#7227

Merged
estesp merged 2 commits intocontainerd:release/1.6from
dcantah:cp-hpcstats-test
Jul 29, 2022
Merged

[release/1.6] Backport Windows HostProcess test improvements#7227
estesp merged 2 commits intocontainerd:release/1.6from
dcantah:cp-hpcstats-test

Conversation

@dcantah
Copy link
Copy Markdown
Member

@dcantah dcantah commented Jul 28, 2022

Pick 🍒:
#6996
#7223

dcantah added 2 commits July 28, 2022 15:07
HostProcess containers require every container in the pod to be a
host process container and have the corresponding field set. The Kubelet
usually enforces this so we'd error before even getting here but we recently
found a bug in this logic so better to be safe than sorry.

Signed-off-by: Daniel Canter <[email protected]>
(cherry picked from commit 978ff39)
Signed-off-by: Daniel Canter <[email protected]>
Add a test to the CRI suite to validate stats functions for hostprocess
containers. hcsshim v0.9.3 had a bug in stats collection so this is
mainly for sanity and to avoid another regression.

Signed-off-by: Daniel Canter <[email protected]>
(cherry picked from commit b16c3e9)
Signed-off-by: Daniel Canter <[email protected]>
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit 2e236d4 into containerd:release/1.6 Jul 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants