Fill in HyperV runtime spec field if shim options asks for it #1388
Conversation
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
As part of the work to get WCOW-Hypervisor working for the upstream Containerd CRI plugin, parse our shims SandboxIsolation field here and set HyperV if it hasn't been set. This avoids us needind one place we need to parse our shim specific options in Containerd which is always nice. Signed-off-by: Daniel Canter <[email protected]>
This was referenced May 6, 2022
anmaxvl
approved these changes
May 6, 2022
jterry75
reviewed
May 10, 2022
| // options if we can set this ourselves. | ||
| if shimOpts.SandboxIsolation == runhcsopts.Options_HYPERVISOR { | ||
| if spec.Windows == nil { | ||
| spec.Windows = &specs.Windows{} |
Contributor
There was a problem hiding this comment.
Looks like old code did do that lol. i dont remember why
Contributor
Author
There was a problem hiding this comment.
We identify LCOW by the Linux section being filled in as well as hyperv. Which kinda makes sense in my head hahah
Contributor
There was a problem hiding this comment.
Oh, I am dumb. yes I know why this works lol. I for some reason thought that spec.Windows.HyperV was outside of spec.Windows and you didnt need the Windows part to add the HyperV part. Just ignore me.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
As part of the work to get WCOW-Hypervisor working for the upstream Containerd CRI plugin, parse our shims SandboxIsolation field here and set the HyperV runtime spec field if it's set to the HYPERVISOR option. This avoids us needing to parse our shim specific options in upstream Containerd which is always a plus.