fix some typos

CHANGELOG.md

@@ -231,7 +231,7 @@ __IMPORTANT__: In PouchContainer 1.0.0-rc1 we have done many things that importa
 * enhance: add ExtraAttribute functionality in LogInfo [#1714](https://github.com/alibaba/pouch/pull/1714) ([fuweid](https://github.com/fuweid))
 * bugfix: schema point to a response object  [#1712](https://github.com/alibaba/pouch/pull/1712) ([zhuangqh](https://github.com/zhuangqh))
 * bugfix: fix exec record user as container config user [#1657](https://github.com/alibaba/pouch/pull/1657) ([Ace-Tang](https://github.com/Ace-Tang))
-* feature: deamon support --log-driver and --log-opt options [#1647](https://github.com/alibaba/pouch/pull/1647) ([zhuangqh](https://github.com/zhuangqh))
+* feature: daemon support --log-driver and --log-opt options [#1647](https://github.com/alibaba/pouch/pull/1647) ([zhuangqh](https://github.com/zhuangqh))
 * bugfix: list image should ignore error if containerd can't handle well [#1625](https://github.com/alibaba/pouch/pull/1625) ([fuweid](https://github.com/fuweid))
 * bugfix: execConfig remove omitemtpy [#1619](https://github.com/alibaba/pouch/pull/1619) ([HusterWan](https://github.com/HusterWan))
 * enhance: add new formatter for syslog [#1608](https://github.com/alibaba/pouch/pull/1608) ([fuweid](https://github.com/fuweid))

cri/v1alpha1/cri.go

@@ -527,7 +527,7 @@ func (c *CriManager) CreateContainer(ctx context.Context, r *runtime.CreateConta
 	podSandboxID := r.GetPodSandboxId()
 
 	labels := makeLabels(config.GetLabels(), config.GetAnnotations())
-	// Apply the container type lable.
+	// Apply the container type label.
 	labels[containerTypeLabelKey] = containerTypeLabelContainer
 	// Write the sandbox ID in the labels.
 	labels[sandboxIDLabelKey] = podSandboxID

test/cli_ps_test.go

@@ -97,7 +97,7 @@ func (suite *PouchPsSuite) TestPsFilterEqual(c *check.C) {
 	command.PouchRun("run", "-d", "--name", labelB, "-l", "b=c", busyboxImage, "top").Assert(c, icmd.Success)
 	defer DelContainerForceMultyTime(c, labelB)
 
-	name := "non-running-lable-a"
+	name := "non-running-label-a"
 	command.PouchRun("create", "--name", name, "-l", "a=b", busyboxImage, "top").Assert(c, icmd.Success)
 	defer DelContainerForceMultyTime(c, name)
 
@@ -161,7 +161,7 @@ func (suite *PouchPsSuite) TestPsFilterUnequal(c *check.C) {
 	command.PouchRun("run", "-d", "--name", labelC, "-l", "a=c", busyboxImage, "top").Assert(c, icmd.Success)
 	defer DelContainerForceMultyTime(c, labelC)
 
-	name := "non-running-lable-a"
+	name := "non-running-label-a"
 	command.PouchRun("create", "--name", name, "-l", "a=c", busyboxImage, "top").Assert(c, icmd.Success)
 	defer DelContainerForceMultyTime(c, name)
 

test/daemon/daemon.go

@@ -15,7 +15,7 @@ import (
 	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
-// For pouch deamon test, we launched another pouch daemon.
+// For pouch daemon test, we launched another pouch daemon.
 const (
 	DaemonLog     = "/tmp/pouchd.log"
 	PouchdBin     = "pouchd"
@@ -49,7 +49,7 @@ type Config struct {
 	// timeout for starting daemon
 	timeout int64
 
-	// if Debug=true, dump daemon log when deamon failed to start
+	// if Debug=true, dump daemon log when daemon failed to start
 	Debug bool
 }
 

test/util_daemon.go

@@ -43,7 +43,7 @@ func GetRootDir() (string, error) {
 	return got.PouchRootDir, nil
 }
 
-// StartDefaultDaemonDebug starts a deamon with default configuration and debug on.
+// StartDefaultDaemonDebug starts a daemon with default configuration and debug on.
 func StartDefaultDaemonDebug(args ...string) (*daemon.Config, error) {
 	cfg := daemon.NewConfig()
 	cfg.Debug = true
@@ -53,7 +53,7 @@ func StartDefaultDaemonDebug(args ...string) (*daemon.Config, error) {
 	return &cfg, cfg.StartDaemon()
 }
 
-// StartDefaultDaemon starts a deamon with all default configuration and debug off.
+// StartDefaultDaemon starts a daemon with all default configuration and debug off.
 func StartDefaultDaemon(args ...string) (*daemon.Config, error) {
 	cfg := daemon.NewConfig()
 	cfg.Debug = false

test/z_cli_daemon_test.go

@@ -20,7 +20,7 @@ import (
 	"github.com/gotestyourself/gotestyourself/icmd"
 )
 
-// PouchDaemonSuite is the test suite fo daemon.
+// PouchDaemonSuite is the test suite for daemon.
 type PouchDaemonSuite struct{}
 
 func init() {
@@ -36,7 +36,7 @@ func (suite *PouchDaemonSuite) SetUpTest(c *check.C) {
 func (suite *PouchDaemonSuite) TestDaemonCgroupParent(c *check.C) {
 	dcfg, err := StartDefaultDaemonDebug("--cgroup-parent=tmp")
 	if err != nil {
-		c.Skip("deamon start failed")
+		c.Skip("daemon start failed")
 	}
 
 	// Must kill it, as we may loose the pid in next call.
@@ -209,7 +209,7 @@ func (suite *PouchDaemonSuite) TestDaemonConfigFileAndCli(c *check.C) {
 	c.Assert(err, check.IsNil)
 }
 
-// TestDaemonInvalideArgs tests invalid args in deamon return error
+// TestDaemonInvalideArgs tests invalid args in daemon return error
 func (suite *PouchDaemonSuite) TestDaemonInvalideArgs(c *check.C) {
 	_, err := StartDefaultDaemon("--config=xxx")
 	c.Assert(err, check.NotNil)
@@ -325,7 +325,7 @@ func (suite *PouchDaemonSuite) TestDaemonLabel(c *check.C) {
 	dcfg, err := StartDefaultDaemonDebug("--label", "a=b")
 	// Start a test daemon with test args.
 	if err != nil {
-		c.Skip("deamon start failed.")
+		c.Skip("daemon start failed.")
 	}
 	// Must kill it, as we may loose the pid in next call.
 	defer dcfg.KillDaemon()
@@ -340,7 +340,7 @@ func (suite *PouchDaemonSuite) TestDaemonLabelDup(c *check.C) {
 	dcfg, err := StartDefaultDaemonDebug("--label", "a=b", "--label", "a=b")
 	// Start a test daemon with test args.
 	if err != nil {
-		c.Skip("deamon start failed.")
+		c.Skip("daemon start failed.")
 	}
 	// Must kill it, as we may loose the pid in next call.
 	defer dcfg.KillDaemon()