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

Merge pull request #6950 from AllenZMC/fix

Browse Source 
fix some confusing typos
This commit is contained in:
Phil Estes 2022-05-18 11:47:29 +02:00 committed by GitHub
commit 405fba75dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cri/config/config.go
View File

@ -28,7 +28,7 @@ import (
) )
// Runtime struct to contain the type(ID), engine, and root variables for a default runtime // Runtime struct to contain the type(ID), engine, and root variables for a default runtime
// and a runtime for untrusted worload. // and a runtime for untrusted workload.
type Runtime struct { type Runtime struct {
// Type is the runtime type to use in containerd e.g. io.containerd.runtime.v1.linux // Type is the runtime type to use in containerd e.g. io.containerd.runtime.v1.linux
Type string `toml:"runtime_type" json:"runtimeType"` Type string `toml:"runtime_type" json:"runtimeType"`

2
pkg/cri/server/restart.go
View File

@ -311,7 +311,7 @@ func (c *criService) loadContainer(ctx context.Context, cntr containerd.Containe
c.eventMonitor.startContainerExitMonitor(context.Background(), id, status.Pid, exitCh) c.eventMonitor.startContainerExitMonitor(context.Background(), id, status.Pid, exitCh)
} }
case containerd.Stopped: case containerd.Stopped:
// Task is stopped. Updata status and delete the task. // Task is stopped. Update status and delete the task.
if _, err := t.Delete(ctx, containerd.WithProcessKill); err != nil && !errdefs.IsNotFound(err) { if _, err := t.Delete(ctx, containerd.WithProcessKill); err != nil && !errdefs.IsNotFound(err) {
return fmt.Errorf("failed to delete task: %w", err) return fmt.Errorf("failed to delete task: %w", err)
} }

2
services/introspection/introspection.go
View File

@ -25,7 +25,7 @@ import (
ptypes "github.com/containerd/containerd/protobuf/types" ptypes "github.com/containerd/containerd/protobuf/types"
) )
// Service defines the instrospection service interface // Service defines the introspection service interface
type Service interface { type Service interface {
Plugins(context.Context, []string) (*api.PluginsResponse, error) Plugins(context.Context, []string) (*api.PluginsResponse, error)
Server(context.Context, *ptypes.Empty) (*api.ServerResponse, error) Server(context.Context, *ptypes.Empty) (*api.ServerResponse, error)