github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

kubectl: return exit status appropriately after running watch.Until

pull/6/head
Michail Kargakis 2016-10-03 17:41:49 +02:00
parent 5ad518cd2b
commit 40b7fabaf2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/cmd/rollout/rollout_status.go
View File

@ -127,7 +127,7 @@ func RunStatus(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, args []str
// if the rollout isn't done yet, keep watching deployment status // if the rollout isn't done yet, keep watching deployment status
intr := interrupt.New(nil, w.Stop) intr := interrupt.New(nil, w.Stop)
intr.Run(func() error { return intr.Run(func() error {
_, err := watch.Until(0, w, func(e watch.Event) (bool, error) { _, err := watch.Until(0, w, func(e watch.Event) (bool, error) {
// print deployment's status // print deployment's status
status, done, err := statusViewer.Status(cmdNamespace, info.Name) status, done, err := statusViewer.Status(cmdNamespace, info.Name)
@ -143,5 +143,4 @@ func RunStatus(f *cmdutil.Factory, cmd *cobra.Command, out io.Writer, args []str
}) })
return err return err
}) })
return nil
} }

2
pkg/kubectl/cmd/run.go
View File

@ -412,7 +412,7 @@ func waitForPod(podClient coreclient.PodsGetter, ns, name string, exitCondition
intr := interrupt.New(nil, w.Stop) intr := interrupt.New(nil, w.Stop)
var result *api.Pod var result *api.Pod
intr.Run(func() error { err = intr.Run(func() error {
ev, err := watch.Until(0, w, func(ev watch.Event) (bool, error) { ev, err := watch.Until(0, w, func(ev watch.Event) (bool, error) {
c, err := exitCondition(ev) c, err := exitCondition(ev)
if c == false && err == nil { if c == false && err == nil {