Update GKE Metadata HTTP Client to use the same default HTTP client as the GKE API

Signed-off-by: Matt Bolt <mbolt35@gmail.com>

pkg/cloud/provider.go

@@ -4,9 +4,8 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"golang.org/x/text/cases"
-	"golang.org/x/text/language"
 	"io"
+	"net"
 	"net/http"
 	"regexp"
 	"strconv"
@@ -14,6 +13,9 @@ import (
 	"sync"
 	"time"
 
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
+
 	"github.com/opencost/opencost/pkg/kubecost"
 
 	"github.com/opencost/opencost/pkg/util"
@@ -506,9 +508,16 @@ func NewProvider(cache clustercache.ClusterCache, apiKey string, config *config.
 			clusterRegion:    cp.region,
 			clusterAccountID: cp.accountID,
 			clusterProjectID: cp.projectID,
-			metadataClient: metadata.NewClient(&http.Client{
-				Transport: httputil.NewUserAgentTransport("kubecost", http.DefaultTransport),
-			}),
+			metadataClient: metadata.NewClient(
+				&http.Client{
+					Transport: httputil.NewUserAgentTransport("kubecost", &http.Transport{
+						Dial: (&net.Dialer{
+							Timeout:   2 * time.Second,
+							KeepAlive: 30 * time.Second,
+						}).Dial,
+					}),
+					Timeout: 5 * time.Second,
+				}),
 		}, nil
 	case kubecost.AWSProvider:
 		log.Info("Found ProviderID starting with \"aws\", using AWS Provider")

pkg/util/httputil/roundtrip.go

@@ -1,17 +1,20 @@
 package httputil
 
-import "net/http"
+import (
+	"net/http"
+)
 
 type userAgentTransport struct {
+	http.RoundTripper
+
 	userAgent string
-	base      http.RoundTripper
 }
 
 // NewUserAgentTransport creates a RoundTripper that attaches the configured user agent.
 func NewUserAgentTransport(userAgent string, base http.RoundTripper) http.RoundTripper {
 	return &userAgentTransport{
-		userAgent: userAgent,
-		base:      base,
+		RoundTripper: base,
+		userAgent:    userAgent,
 	}
 }
 
@@ -27,5 +30,5 @@ func (t userAgentTransport) RoundTrip(r *http.Request) (*http.Response, error) {
 	}
 	r2.Header.Set("User-Agent", t.userAgent)
 	r = r2
-	return t.base.RoundTrip(r)
+	return t.RoundTripper.RoundTrip(r)
 }