Skip to content

Commit e0111ac

Browse files
author
Wei Fu
authored
Merge pull request #2082 from HusterWan/zr/rm-proto
bugfix: remove duplicate TypeUrl initialize
2 parents 6a8b3be + f62d685 commit e0111ac

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

ctrd/client.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ func NewClient(homeDir string, opts ...ClientOpt) (APIClient, error) {
109109
client.scheduler = scheduler
110110

111111
// start collect containerd events
112-
initTypeURL()
113112
go client.collectContainerdEvents()
114113

115114
return client, nil

ctrd/events.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ package ctrd
33
import (
44
"context"
55

6-
eventstypes "github.com/containerd/containerd/api/events"
76
eventsapi "github.com/containerd/containerd/api/services/events/v1"
87
"github.com/containerd/containerd/runtime"
9-
"github.com/gogo/protobuf/proto"
108
"github.com/pkg/errors"
119
)
1210

@@ -38,10 +36,3 @@ func (c *Client) Events(ctx context.Context, ef ...string) (eventsapi.Events_Sub
3836
Filters: ef,
3937
})
4038
}
41-
42-
// initTypeURL initializes URL type for containerd events url type,
43-
// it works for typeurl.UnmarshalAny
44-
func initTypeURL() {
45-
proto.RegisterType((*eventstypes.ContainerDelete)(nil), "containerd.events.ContainerDelete")
46-
proto.RegisterType((*eventstypes.TaskOOM)(nil), "containerd.events.TaskOOM")
47-
}

0 commit comments

Comments
 (0)