Fix up hostprocess integration tests#1434
Merged
dcantah merged 2 commits intomicrosoft:masterfrom Jun 24, 2022
Merged
Conversation
Upgrades CRI api dep to the same containerd depends on at the moment. This is mostly to get access to the HostProcess fields that were added in 1.22. Signed-off-by: Daniel Canter <[email protected]>
This fixes a couple issues with the host process integration tests. - Instead of passing the annotation to ask for a host process pod, use the hostprocess CRI fields instead. The annotations used to work, however containerd now overrides these with the value of the hostprocess CRI field so this is the only way to ask for hpc now. - The VHD test would hit a "Paramter is incorrect" error on attaching the vhd. Not sure what's causing this but it's probably the set of flags used to open the vhd inside AttachVhd, as supplying no flags has the open succeed. - Now that there's new behavior for mounts for hpc if the bindflt dll is available, gate some of the tests that tested the old behavior behind rs5 for now. Signed-off-by: Daniel Canter <[email protected]>
katiewasnothere
approved these changes
Jun 23, 2022
helsaawy
approved these changes
Jun 23, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes a couple issues with the host process integration tests and upgrades our CRI api version used in the tests to 0.24.1 as it was necessary to get the HostProcess CRI fields.
Instead of passing the annotation to ask for a host process pod, use the hostprocess CRI fields instead. The annotations used to work, however containerd now overrides these with the value of the hostprocess CRI field so this is the only way to ask for hpc now. https://github.com/containerd/containerd/blob/9c6154bff15818916c851eb3a12764b018e191fb/pkg/cri/server/sandbox_run_windows.go#L89
The VHD test would hit a "Parameter is incorrect" error on attaching the vhd. Not sure what exactly is causing this but it's probably the set of flags used to open the vhd inside AttachVhd, as supplying no flags has the open succeed.
Now that there's new behavior for mounts for hpc if the bindflt dll is available, gate some of the tests that tested the old behavior behind rs5 for now.