github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6835 from kzys/proto-upgrade-5

Browse Source 
Prepare for google.golang.org/protobuf
This commit is contained in:
Phil Estes
2022-04-21 14:24:04 +01:00
committed by GitHub
parent 1a236784dc 01dfb110c4
commit 320ef912bc
24 changed files with 72 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/v2/binary.go
View File

@@ -30,6 +30,7 @@ import (
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/protobuf/proto"
"github.com/containerd/containerd/protobuf/types"
"github.com/containerd/containerd/runtime"
client "github.com/containerd/containerd/runtime/v2/shim"
@@ -185,7 +186,7 @@ func (b *binary) Delete(ctx context.Context) (*runtime.Exit, error) {
log.G(ctx).Warnf("cleanup warnings %s", s)
}
var response task.DeleteResponse
if err := response.Unmarshal(out.Bytes()); err != nil {
if err := proto.Unmarshal(out.Bytes(), &response); err != nil {
return nil, err
}
if err := b.bundle.Delete(); err != nil {