Skip to content

Commit 1cabf0c

Browse files
committed
Better handling of paused status
1 parent db664ae commit 1cabf0c

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

cmd/minikube/cmd/status.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"github.com/docker/machine/libmachine"
2828
"github.com/docker/machine/libmachine/state"
2929
"github.com/golang/glog"
30+
"github.com/pkg/errors"
3031
"github.com/spf13/cobra"
3132
"github.com/spf13/viper"
3233
"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
@@ -137,8 +138,16 @@ func status(api libmachine.API, name string) (*Status, error) {
137138
}
138139

139140
hs, err := cluster.GetHostStatus(api, name)
141+
if err != nil {
142+
return st, errors.Wrap(err, "host")
143+
}
144+
140145
if hs == state.None.String() {
141-
glog.Errorf("host status: %v", err)
146+
return st, nil
147+
}
148+
149+
st.Host = hs
150+
if st.Host != state.Running.String() && st.Host != state.Paused.String() {
142151
return st, nil
143152
}
144153

@@ -152,11 +161,6 @@ func status(api libmachine.API, name string) (*Status, error) {
152161
return st, err
153162
}
154163

155-
st.Host = hs
156-
if st.Host != state.Running.String() && st.Host != state.Paused.String() {
157-
return st, nil
158-
}
159-
160164
stk, err := kverify.KubeletStatus(cr)
161165
if err != nil {
162166
glog.Warningf("kubelet err: %v", err)

0 commit comments

Comments
 (0)