diff --git a/pkg/util/network/network.go b/pkg/util/network/network.go index 8a193377..402b77b1 100644 --- a/pkg/util/network/network.go +++ b/pkg/util/network/network.go @@ -7,6 +7,7 @@ import ( "net/http" "os" "strings" + "time" "github.com/rancher/os/config" "github.com/rancher/os/pkg/log" @@ -15,6 +16,10 @@ import ( composeConfig "github.com/docker/libcompose/config" ) +const ( + defaultTimeout = 10 * time.Second +) + var ( ErrNoNetwork = errors.New("Networking not available to load resource") ErrNotFound = errors.New("Failed to find resource") @@ -110,7 +115,10 @@ func LoadFromNetwork(location string) ([]byte, error) { var resp *http.Response log.Debugf("LoadFromNetwork(%s)", location) - resp, err = http.Get(location) + netClient := &http.Client{ + Timeout: defaultTimeout, + } + resp, err = netClient.Get(location) log.Debugf("LoadFromNetwork(%s) returned %v, %v", location, resp, err) if err == nil { defer resp.Body.Close()