提交 a585340b 编写于 作者: M Medya Gh

address review comments

上级 2f84aa64
......@@ -22,10 +22,12 @@ require (
github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
github.com/go-ole/go-ole v1.2.4 // indirect
github.com/gobuffalo/envy v1.9.0 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/gohugoio/hugo v0.68.3 // indirect
github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/google/go-cmp v0.3.1
github.com/google/go-cmp v0.3.2-0.20191028172631-481baca67f93
github.com/google/go-containerregistry v0.0.0-20200131185320-aec8da010de2
github.com/google/go-github v17.0.0+incompatible
github.com/googleapis/gnostic v0.3.0 // indirect
......@@ -47,10 +49,10 @@ require (
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/libvirt/libvirt-go v3.4.0+incompatible
github.com/machine-drivers/docker-machine-driver-vmware v0.1.1
github.com/mattn/go-isatty v0.0.9
github.com/mattn/go-isatty v0.0.11
github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936
github.com/moby/hyperkit v0.0.0-20171020124204-a12cd7250bcd
github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5
github.com/olekukonko/tablewriter v0.0.4
github.com/onsi/ginkgo v1.10.3 // indirect
github.com/onsi/gomega v1.7.1 // indirect
github.com/opencontainers/go-digest v1.0.0-rc1
......@@ -67,7 +69,7 @@ require (
github.com/shirou/gopsutil v2.18.12+incompatible
github.com/spf13/cobra v0.0.5
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.3.2
github.com/spf13/viper v1.6.1
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f
......
此差异已折叠。
......@@ -25,6 +25,7 @@ import (
"github.com/docker/machine/libmachine/state"
"github.com/golang/glog"
"github.com/pkg/errors"
core "k8s.io/api/core/v1"
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
......@@ -113,15 +114,13 @@ func WaitForAppsRunning(cs *kubernetes.Clientset, expected []string, timeout tim
checkRunning := func() (bool, error) {
if err := ExpectAppsRunning(cs, expected); err != nil {
glog.Infof("error waiting for apps to be running: %v", err)
time.Sleep(kconst.APICallRetryInterval * 5)
return false, nil
}
return true, nil
}
if err := wait.PollImmediate(kconst.APICallRetryInterval, timeout, checkRunning); err != nil {
return fmt.Errorf("apiserver never returned a pod list")
return errors.Wrapf(err, "checking k8s-apps to be running")
}
glog.Infof("duration metric: took %s to wait for k8s-apps to be running ...", time.Since(start))
return nil
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册