Move hcsshim/main to containerd v2.1.2 and update CIs to WS2025 #2425
+18,427
−8,521
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
kiashok
force-pushed
the
update-shim-ctrd2.0
branch
5 times, most recently
from
2adfd99 to
8b91059
Compare
kiashok
force-pushed
the
update-shim-ctrd2.0
branch
6 times, most recently
from
832e200 to
75dd87a
Compare
kiashok
force-pushed
the
update-shim-ctrd2.0
branch
5 times, most recently
from
cc93904 to
4836058
Compare
kiashok
force-pushed
the
update-shim-ctrd2.0
branch
from
4836058 to
ff0de5d
Compare
kiashok
changed the title
kiashok
force-pushed
the
update-shim-ctrd2.0
branch
9 times, most recently
from
a99afdc to
aea85ca
Compare
kiashok
force-pushed
the
update-shim-ctrd2.0
branch
5 times, most recently
from
fab30fd to
7d62265
Compare
kiashok
force-pushed
the
update-shim-ctrd2.0
branch
from
7d62265 to
f3a3f7b
Compare
helsaawy
reviewed
Jul 2, 2025
| @@ -225,13 +225,13 @@ func (s *service) pidsInternal(ctx context.Context, req *task.PidsRequest) (*tas | |||
| } | |||
| processes := make([]*containerd_v1_types.ProcessInfo, len(pids)) | |||
| for i, p := range pids { | |||
| a, err := typeurl.MarshalAny(p) | |||
| a, err := anypb.New(p) | |||
There was a problem hiding this comment.
do we not need set the TypeUrl field to "typeurl".TypeURL, since I think that URL is different from the default that anypb sets
There was a problem hiding this comment.
Hmm I thought containerd/typeurl was also now defaulting to anypb prefixes. Let me check
| @@ -183,6 +184,24 @@ The start command can either start a new shim or return an address to an existin | |||
| }, | |||
| } | |||
|
|
|||
| // writeAddress writes a address file atomically | |||
There was a problem hiding this comment.
Suggested change
| // writeAddress writes a address file atomically | |
| // writeAddress writes an address file atomically |
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
kiashok
force-pushed
the
update-shim-ctrd2.0
branch
from
f3a3f7b to
4c9d1c0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Move hcsshim/main to containerd v2.1.2 and resolve dependencies.
Move CIs to WS2022 and WS2025.