Merge pull request #692 from openshift-cherrypick-robot/cherry-pick-6…

…90-to-release-4.5

[release-4.5] Bug 1970966: Using http.DefaultTransport timeouts

pkg/storage/s3/s3.go

@@ -3,9 +3,11 @@ package s3
 import (
 	"context"
 	"fmt"
+	"net"
 	"net/http"
 	"net/url"
 	"reflect"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
@@ -143,6 +145,16 @@ func (d *driver) getS3Service() (*s3.S3, error) {
 		Region:      &d.Config.Region,
 		HTTPClient: &http.Client{
 			Transport: &http.Transport{
+				DialContext: (&net.Dialer{
+					Timeout:   30 * time.Second,
+					KeepAlive: 30 * time.Second,
+					DualStack: true,
+				}).DialContext,
+				ForceAttemptHTTP2:     true,
+				MaxIdleConns:          100,
+				IdleConnTimeout:       90 * time.Second,
+				TLSHandshakeTimeout:   10 * time.Second,
+				ExpectContinueTimeout: 1 * time.Second,
 				Proxy: func(req *http.Request) (*url.URL, error) {
 					return httpproxy.FromEnvironment().ProxyFunc()(req.URL)
 				},