diff --git a/README.md b/README.md index aee2d319..d74eb9ce 100644 --- a/README.md +++ b/README.md @@ -338,7 +338,7 @@ OK: 8 MiB in 19 packages {"status":"Authors is healthy"}/opt/microservices # exit prepare to exit, cleaning up update ref count successfully -clean up successful +clean up successfully ``` You can see that it will start up two containers with docker, mapping to pod two container, and share port with same @@ -507,7 +507,7 @@ app prepare to exit, cleaning up update ref count successfully ref-count is zero, prepare to clean up resource -clean up successful +clean up successfully root@4d0c3c4eae2b:/# exit exit ``` @@ -621,7 +621,7 @@ prepare to exit, cleaning up port-forward occurs error, err: lost connection to pod, retrying update ref count successfully ref-count is zero, prepare to clean up resource -clean up successful +clean up successfully ``` This is because of your docker-desktop required resource is less than pod running request resource, it OOM killed, so diff --git a/README_ZH.md b/README_ZH.md index f6a21aaf..47729b37 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -329,7 +329,7 @@ OK: 8 MiB in 19 packages {"status":"Authors is healthy"}/opt/microservices # exit prepare to exit, cleaning up update ref count successfully -clean up successful +clean up successfully ``` 此时本地会启动两个 container, 对应 pod 容器中的两个 container, 并且共享端口, 可以直接使用 localhost:port 的形式直接访问另一个 container, @@ -493,7 +493,7 @@ app prepare to exit, cleaning up update ref count successfully ref-count is zero, prepare to clean up resource -clean up successful +clean up successfully root@4d0c3c4eae2b:/# exit exit ``` @@ -604,7 +604,7 @@ prepare to exit, cleaning up port-forward occurs error, err: lost connection to pod, retrying update ref count successfully ref-count is zero, prepare to clean up resource -clean up successful +clean up successfully ``` 这是因为你的 `Docker-desktop` 声明的资源, 小于 container 容器启动时所需要的资源, 因此被 OOM 杀掉了, 你可以增加 `Docker-desktop` 对于 resources diff --git a/cmd/kubevpn/cmds/quit.go b/cmd/kubevpn/cmds/quit.go index a5920b9a..b4805bd8 100644 --- a/cmd/kubevpn/cmds/quit.go +++ b/cmd/kubevpn/cmds/quit.go @@ -32,7 +32,7 @@ func CmdQuit(f cmdutil.Factory) *cobra.Command { RunE: func(cmd *cobra.Command, args []string) error { _ = quit(cmd.Context(), true) _ = quit(cmd.Context(), false) - fmt.Fprint(os.Stdout, "quit success") + fmt.Fprint(os.Stdout, "quit successfully") return nil }, } diff --git a/pkg/daemon/action/leave.go b/pkg/daemon/action/leave.go index db8f04f4..2ccf18d3 100644 --- a/pkg/daemon/action/leave.go +++ b/pkg/daemon/action/leave.go @@ -34,7 +34,7 @@ func (svr *Server) Leave(req *rpc.LeaveRequest, resp rpc.Daemon_LeaveServer) err log.Errorf("leave workload %s failed: %v", workload, err) continue } - log.Infof("leave workload %s success", workload) + log.Infof("leave workload %s successfully", workload) } return nil } diff --git a/pkg/dev/main.go b/pkg/dev/main.go index 5d4c513e..069d55f9 100644 --- a/pkg/dev/main.go +++ b/pkg/dev/main.go @@ -574,7 +574,7 @@ func (d *Options) doConnect(ctx context.Context, f cmdutil.Factory, conf *util.S } return } - log.Infof("container connect to cluster success") + log.Infof("container connect to cluster successfully") err = d.Copts.netMode.Set(fmt.Sprintf("container:%s", id)) return default: diff --git a/pkg/handler/cleaner.go b/pkg/handler/cleaner.go index 20a625cc..ce9dd6a7 100644 --- a/pkg/handler/cleaner.go +++ b/pkg/handler/cleaner.go @@ -82,7 +82,7 @@ func (c *ConnectOptions) Cleanup() { } RollbackFuncList = RollbackFuncList[:] dns.CancelDNS() - log.Info("clean up successful") + log.Info("clean up successfully") util.CleanExtensionLib() } diff --git a/pkg/handler/reset.go b/pkg/handler/reset.go index a2fc737c..a1c783e4 100644 --- a/pkg/handler/reset.go +++ b/pkg/handler/reset.go @@ -74,7 +74,7 @@ func (c *ConnectOptions) LeaveProxyResources(ctx context.Context) (err error) { log.Errorf("unpatch container error: %v", err) continue } - log.Infof("leave resource: %s success", uid) + log.Infof("leave resource: %s successfully", uid) } return err } diff --git a/pkg/util/util.go b/pkg/util/util.go index 9e1037ee..2ba1e6f3 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -360,7 +360,7 @@ func RolloutStatus(ctx1 context.Context, factory cmdutil.Factory, namespace, wor if err != nil { log.Errorf("rollout status for %s failed: %s", workloads, err.Error()) } else { - log.Infof("rollout status for %s success", workloads) + log.Infof("rollout status for %s successfully", workloads) } }() client, _ := factory.DynamicClient()