guest: unify pod model for V1, virtual pod, and V2 shim support#2699
Merged
shreyanshjain7174 merged 5 commits intoMay 13, 2026
Merged
Conversation
shreyanshjain7174
force-pushed
the
guest-pod-unification-v2
branch
from
62fc02c to
a724fae
Compare
rawahars
requested changes
Apr 30, 2026
shreyanshjain7174
force-pushed
the
guest-pod-unification-v2
branch
from
a724fae to
ad3ee5f
Compare
rawahars
requested changes
May 4, 2026
shreyanshjain7174
force-pushed
the
guest-pod-unification-v2
branch
from
ad3ee5f to
f51f773
Compare
rawahars
reviewed
May 4, 2026
rawahars
reviewed
May 4, 2026
Replace the separate VirtualPod tracking (dedicated type, exported
methods, parent cgroup manager, reverse-lookup map) with a unified
uvmPod type and a single pods map on Host. All pod types (V1 sandbox,
virtual pod, V2 shim) now go through the same code path:
- createPodInUVM allocates a cgroup under /pods/{sandboxID}
- RemoveContainer handles cleanup uniformly
Cgroup hierarchy changes from:
/containers/{id} (V1 sandbox)
/containers/virtual-pods/{virtualPodID} (virtual pod)
to:
/pods/{sandboxID} (all pod types)
/pods/{sandboxID}/{containerID} (workload containers)
Signed-off-by: Shreyansh Jain <shreyanshjain7174@gmail.com>
Signed-off-by: Shreyansh Sancheti <shsancheti@microsoft.com>
shreyanshjain7174
force-pushed
the
guest-pod-unification-v2
branch
from
f51f773 to
32802d9
Compare
…ID assign - Lock containersMutex over the entire createPodInUVM method instead of the double-check pattern. - Assign sandboxID directly from annotation without intermediate sid variable in the early resolution block. Signed-off-by: Shreyansh Jain <shreyanshjain7174@gmail.com> Signed-off-by: Shreyansh Sancheti <shsancheti@microsoft.com>
rawahars
reviewed
May 7, 2026
rawahars
reviewed
May 7, 2026
rawahars
reviewed
May 7, 2026
rawahars
reviewed
May 7, 2026
rawahars
reviewed
May 7, 2026
rawahars
reviewed
May 7, 2026
rawahars
reviewed
May 7, 2026
- Introduce podCgroupPathFmt and containerCgroupPathFmt constants for
the /pods/{sandboxID} and /pods/{sandboxID}/{containerID} cgroup paths
used by sandbox, standalone, and workload containers.
- Drop unused networkNamespace and cgroupPath fields from uvmPod; only
sandboxID, cgroupControl, and the container set are actually consulted.
- Move workload-container pod registration to run before the per-type
switch. Return an error when the sandbox pod is missing or when the
container ID is already registered, instead of silently no-oping.
- Consolidate the duplicate VirtualPodID lookup in the sandbox container
spec setup so the cgroup path uses the value resolved at the top.
Signed-off-by: Shreyansh Sancheti <shsancheti@microsoft.com>
shreyanshjain7174
force-pushed
the
guest-pod-unification-v2
branch
from
ccdc388 to
832f7bd
Compare
Signed-off-by: Harsh Rawat <harshrawat@microsoft.com>
rawahars
approved these changes
May 11, 2026
helsaawy
approved these changes
May 12, 2026
Contributor
helsaawy
left a comment
helsaawy
left a comment
There was a problem hiding this comment.
small nit, but lgtm overall
| ) | ||
|
|
||
| // uvmPod tracks pod-level state within the UVM. | ||
| type uvmPod struct { |
Contributor
There was a problem hiding this comment.
Suggested change
| type uvmPod struct { | |
| type pod struct { |
Contributor
Author
There was a problem hiding this comment.
Follow-up to #2699: removes the VirtualPod-specific path helpers from internal/guest/spec/spec.go that became dead code after the pod-unification refactor.
Context
After #2699, all callers of pod paths use the *FromRoot(sandboxRoot) variants from #2653. The 13 Get*VirtualPod* / VirtualPodAware* helpers in spec.go are no longer reachable from any production path, and SandboxLogsDir / SandboxLogPath were only used by VirtualPodAwareSandboxRootDir.
Changes
- Drop 13 VirtualPod path functions from
internal/guest/spec/spec.go. - Drop
SandboxLogsDirandSandboxLogPath. - Update
ExtendPolicyWithNetworkingMountsinpkg/securitypolicyto takesandboxRoot stringand use the FromRoot variant.
Stats
4 files changed, 21 insertions(+), 167 deletions(-).
Depends on #2699.
Contributor
Author
There was a problem hiding this comment.
Done in 4b245d0 — renamed uvmPod → pod (5 sites, all in uvm.go).
The uvm prefix is redundant inside the hcsv2 package — the struct is already package-private and only referenced from within the UVM-side code path. Renames the type and the four call sites. Signed-off-by: Shreyansh Sancheti <shsancheti@microsoft.com>
rawahars
approved these changes
May 13, 2026
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.
The GCS guest runtime (
internal/guest/runtime/hcsv2/uvm.go) tracks virtual pods separately from V1 sandbox containers — a dedicatedVirtualPodtype, seven exported methods, a parent cgroup manager, and a reverse-lookup map. V1 sandboxes have no pod-level tracking at all. Adding V2 shim support would need a third path.This collapses all three into one: a private
uvmPodtype and a singlepodsmap onHost. Every sandbox — V1, virtual pod, or V2 shim — goes throughcreatePodInUVM, which allocates a cgroup under/pods/{sandboxID}. Workload containers nest at/pods/{sandboxID}/{containerID}. Container-to-pod membership is tracked viaaddContainerToPod. Cleanup inRemoveContaineris a single code path: remove the container from the pod, and when the sandbox container itself is removed, delete the pod's cgroup.Cgroup hierarchy changes from:
to:
Standalone (non-CRI) containers keep their own cgroup at
/pods/{id}with no pod entry — same isolation as before, just under the new prefix.Network namespace teardown for virtual pod sandboxes is preserved:
RemoveContainerskipsRemoveNetworkNamespacefor virtual pod sandbox containers since the host-driven path (TearDownNetworking→RemoveNetNS→removeNIC) handles adapter removal first.cmd/gcs/main.goreplaces the/containers/virtual-podsparent cgroup with/podsand drops theInitializeVirtualPodSupportcall.Tested E2E with both shims:
io.containerd.runhcs.v1)io.containerd.lcow.v2)/run/gcs/c/<podId>/run/gcs/pods/<podId>/<podId>/sys/fs/cgroup/memory/pods/<podId>/sys/fs/cgroup/memory/pods/<podId>/containers/virtual-pods/