github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Add a timeout when fetching latest version

Browse Source
This commit is contained in:
dkoshkin 2018-07-01 20:41:37 -04:00
parent 56d9d73f38
commit 1c5b596b77
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/kubeadm/app/util/version.go
View File

@ -22,10 +22,15 @@ import (
"net/http" "net/http"
"regexp" "regexp"
"strings" "strings"
"time"
netutil "k8s.io/apimachinery/pkg/util/net" netutil "k8s.io/apimachinery/pkg/util/net"
) )
const (
getReleaseVersionTimeout = time.Duration(10 * time.Second)
)
var ( var (
kubeReleaseBucketURL = "https://dl.k8s.io" kubeReleaseBucketURL = "https://dl.k8s.io"
kubeReleaseRegex = regexp.MustCompile(`^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)([-0-9a-zA-Z_\.+]*)?$`) kubeReleaseRegex = regexp.MustCompile(`^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)([-0-9a-zA-Z_\.+]*)?$`)
@ -69,7 +74,7 @@ func KubernetesReleaseVersion(version string) (string, error) {
if kubeReleaseLabelRegex.MatchString(versionLabel) { if kubeReleaseLabelRegex.MatchString(versionLabel) {
url := fmt.Sprintf("%s/%s.txt", bucketURL, versionLabel) url := fmt.Sprintf("%s/%s.txt", bucketURL, versionLabel)
body, err := fetchFromURL(url) body, err := fetchFromURL(url, getReleaseVersionTimeout)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -132,8 +137,8 @@ func splitVersion(version string) (string, string, error) {
} }
// Internal helper: return content of URL // Internal helper: return content of URL
func fetchFromURL(url string) (string, error) { func fetchFromURL(url string, timeout time.Duration) (string, error) {
client := &http.Client{Transport: netutil.SetOldTransportDefaults(&http.Transport{})} client := &http.Client{Timeout: timeout, Transport: netutil.SetOldTransportDefaults(&http.Transport{})}
resp, err := client.Get(url) resp, err := client.Get(url)
if err != nil { if err != nil {
return "", fmt.Errorf("unable to get URL %q: %s", url, err.Error()) return "", fmt.Errorf("unable to get URL %q: %s", url, err.Error())