Navigation Menu

Skip to content

Commit

Permalink
Fix return error message
Browse files Browse the repository at this point in the history
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
  • Loading branch information
JoeWrightss committed Dec 30, 2018
1 parent e98e307 commit 55fb3b9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/server/restart.go
Expand Up @@ -146,7 +146,7 @@ func (c *criService) recover(ctx context.Context) error {
// * ListContainerStats: Not in critical code path, a default timeout will
// be applied at CRI level.
// * Recovery logic: We should set a time for each container/sandbox recovery.
// * Event montior: We should set a timeout for each container/sandbox event handling.
// * Event monitor: We should set a timeout for each container/sandbox event handling.
const loadContainerTimeout = 10 * time.Second

// loadContainer loads container from containerd and status checkpoint.
Expand Down
2 changes: 1 addition & 1 deletion pkg/server/sandbox_stop.go
Expand Up @@ -128,7 +128,7 @@ func (c *criService) waitSandboxStop(ctx context.Context, sandbox sandboxstore.S
// teardownPod removes the network from the pod
func (c *criService) teardownPod(id string, path string, config *runtime.PodSandboxConfig) error {
if c.netPlugin == nil {
return errors.New("cni config not intialized")
return errors.New("cni config not initialized")
}

labels := getPodCNILabels(id, config)
Expand Down

0 comments on commit 55fb3b9

Please sign in to comment.