Merge remote-tracking branch 'origin/fix/network-client-timeout-settings'

common/consts.go

@@ -24,5 +24,6 @@ const KubernetesPollTimeout = 180
 const AfterScriptTimeout = 5 * time.Minute
 const DefaultMetricsServerPort = 9252
 const DefaultCacheRequestTimeout = 10
+const DefaultNetworkClientTimeout = 60 * time.Minute
 
 var PreparationRetryInterval = 3 * time.Second

network/client.go

@@ -157,8 +157,11 @@ func (n *client) createTransport() {
 			logrus.Debugln("Dialing:", network, addr, "...")
 			return dialer.Dial(network, addr)
 		},
-		TLSHandshakeTimeout: 10 * time.Second,
-		TLSClientConfig:     &tlsConfig,
+		TLSClientConfig:       &tlsConfig,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+		IdleConnTimeout:       30 * time.Second,
+		ResponseHeaderTimeout: 10 * time.Second,
 	}
 }
 
@@ -363,6 +366,7 @@ func newClient(requestCredentials requestCredentials) (c *client, err error) {
 		compatibleWithGitLab: true,
 		requestBackOffs:      make(map[string]*backoff.Backoff),
 	}
+	c.Timeout = common.DefaultNetworkClientTimeout
 
 	host := strings.Split(url.Host, ":")[0]
 	if CertificateDirectory != "" {