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

Merge pull request #6706 from kzys/typeurl-upgrade

Browse Source 
Use typeurl.Any instead of github.com/gogo/protobuf/types.Any
This commit is contained in:
Phil Estes
2022-03-25 10:38:46 -04:00
committed by GitHub
parent eaf7929320 96b16b447d
commit 3633cae64b
42 changed files with 336 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ctr/commands/containers/containers.go
View File

@@ -280,7 +280,7 @@ var infoCommand = cli.Command{
return nil
}
if info.Spec != nil && info.Spec.Value != nil {
if info.Spec != nil && info.Spec.GetValue() != nil {
v, err := typeurl.UnmarshalAny(info.Spec)
if err != nil {
return err

2
cmd/ctr/commands/tasks/kill.go
View File

@@ -42,7 +42,7 @@ func RemoveCniNetworkIfExist(ctx context.Context, container containerd.Container
return nil
}
data, err := typeurl.UnmarshalAny(&networkMeta)
data, err := typeurl.UnmarshalAny(networkMeta)
if err != nil {
return fmt.Errorf("failed to unmarshal cni metadata extension %s", commands.CtrCniMetadataExtension)
}