Skip to content

pkg/cri: use marshal wrapper for version convertor#7108

Merged
dmcgowan merged 1 commit intocontainerd:mainfrom
fuweid:refactor-cri-api
Jun 29, 2022
Merged

pkg/cri: use marshal wrapper for version convertor#7108
dmcgowan merged 1 commit intocontainerd:mainfrom
fuweid:refactor-cri-api

Conversation

@fuweid
Copy link
Copy Markdown
Member

@fuweid fuweid commented Jun 28, 2022

Use wrapper for ReopenContainerLog v1alpha proto.

Ref: #5619

Signed-off-by: Wei Fu [email protected]

@fuweid fuweid added area/cri Container Runtime Interface (CRI) kind/refactor labels Jun 28, 2022
@fuweid fuweid requested a review from mikebrow June 28, 2022 14:46
@k8s-ci-robot
Copy link
Copy Markdown

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@fuweid fuweid marked this pull request as ready for review June 28, 2022 14:46
@fuweid fuweid force-pushed the refactor-cri-api branch from 9e1ee1c to 56e2e50 Compare June 28, 2022 14:47
@fuweid
Copy link
Copy Markdown
Member Author

fuweid commented Jun 28, 2022

=== Failed
=== FAIL: pkg/kmutex  (0.00s)
PASS
FAIL	github.com/containerd/containerd/pkg/kmutex	302.867s

unexpected error in windows...

Comment thread pkg/cri/server/instrumented_service.go Outdated
@fuweid fuweid force-pushed the refactor-cri-api branch from 56e2e50 to 0e6061c Compare June 29, 2022 14:17
Use wrapper for ReopenContainerLog v1alpha proto.

Ref: containerd#5619

Signed-off-by: Wei Fu <[email protected]>
@fuweid fuweid force-pushed the refactor-cri-api branch from 0e6061c to c2703c0 Compare June 29, 2022 14:21
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thx looks like I missed one

@dmcgowan dmcgowan merged commit aee50ae into containerd:main Jun 29, 2022
@fuweid fuweid deleted the refactor-cri-api branch June 29, 2022 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/cri Container Runtime Interface (CRI) kind/refactor

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants