Skip to content

[release/1.7] Invoke Stable ABI compatibility function in windows platform matcher#9069

Merged
estesp merged 2 commits intocontainerd:release/1.7from
kiashok:portStableAbi-1.7
Sep 12, 2023
Merged

[release/1.7] Invoke Stable ABI compatibility function in windows platform matcher#9069
estesp merged 2 commits intocontainerd:release/1.7from
kiashok:portStableAbi-1.7

Conversation

@kiashok
Copy link
Contributor

@kiashok kiashok commented Sep 7, 2023

This PR ports the following commit for stable ABI support to containerd/release/1.7 and fixes dependencies on transfer service.
(cherry picked from commit cfb30a3 and 823e042)

Signed-off-by: Kirtana Ashok <[email protected]>
(cherry picked from commit cfb30a3)
Signed-off-by: Kirtana Ashok <[email protected]>
@k8s-ci-robot
Copy link

Hi @kiashok. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

- Fill OSVersion field of ocispec.Platform for windows OS in
transfer service plugin init()
- Do not return error from transfer service ReceiveStream if
stream.Recv() returned context.Canceled error

Signed-off-by: Kirtana Ashok <[email protected]>
(cherry picked from commit 823e042)
Signed-off-by: Kirtana Ashok <[email protected]>
@estesp estesp merged commit 8542d0e into containerd:release/1.7 Sep 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants