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

cri: remove sandbox controller from client

Browse Source 
cri will call sandbox controller from the sandboxService, remove the
dependency of client.

Signed-off-by: Abel Feng <fshb1988@gmail.com>
This commit is contained in:
Abel Feng 2024-05-11 10:23:41 +08:00
parent e4df672ab8
commit fc5086a74d
3 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/services.go
View File

@ -230,27 +230,3 @@ func WithInMemoryServices(ic *plugin.InitContext) Opt {
return nil
}
}
func WithInMemorySandboxControllers(ic *plugin.InitContext) Opt {
return func(c *clientOpts) error {
sc := make(map[string]sandbox.Controller)
sandboxers, err := ic.GetByType(plugins.SandboxControllerPlugin)
if err != nil {
return err
}
for name, p := range sandboxers {
sc[name] = p.(sandbox.Controller)
}
podSandboxers, err := ic.GetByType(plugins.PodSandboxPlugin)
if err != nil {
return err
}
for name, p := range podSandboxers {
sc[name] = p.(sandbox.Controller)
}
c.services.sandboxers = sc
return nil
}
}

7
internal/cri/server/restart.go
View File

@ -111,12 +111,11 @@ func (c *criService) recover(ctx context.Context) error {
}
var (
state = sandboxstore.StateUnknown
controller = c.client.SandboxController(sbx.Sandboxer)
endpoint sandboxstore.Endpoint
state = sandboxstore.StateUnknown
endpoint sandboxstore.Endpoint
)
status, err := controller.Status(ctx, sbx.ID, false)
status, err := c.sandboxService.SandboxStatus(ctx, sbx.Sandboxer, sbx.ID, false)
if err != nil {
log.G(ctx).
WithError(err).

1
plugins/cri/cri.go
View File

@ -119,7 +119,6 @@ func initCRIService(ic *plugin.InitContext) (interface{}, error) {
containerd.WithDefaultNamespace(constants.K8sContainerdNamespace),
containerd.WithDefaultPlatform(platforms.Default()),
containerd.WithInMemoryServices(ic),
containerd.WithInMemorySandboxControllers(ic),
)
if err != nil {
return nil, fmt.Errorf("failed to create containerd client: %w", err)