Merge pull request #751 from panslava/remove-client

Remove unused client argument
kubernetes · Aug 7, 2024 · 6dce34d · 6dce34d
2 parents 8b385de + 08d1998
commit 6dce34d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 43 deletions.
diff --git a/providers/gce/gce.go b/providers/gce/gce.go
@@ -23,7 +23,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"net/http"
 	"runtime"
 	"strconv"
 	"strings"
@@ -45,7 +44,6 @@ import (
 
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/informers"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -488,11 +486,7 @@ func CreateGCECloud(config *CloudConfig) (*Cloud, error) {
 		containerService.BasePath = config.ContainerAPIEndpoint
 	}
 
-	client, err := newOauthClient(config.TokenSource)
-	if err != nil {
-		return nil, err
-	}
-	tpuService, err := newTPUService(client)
+	tpuService, err := newTPUService()
 	if err != nil {
 		return nil, err
 	}
@@ -960,40 +954,6 @@ func findSubnetForRegion(subnetURLs []string, region string) string {
 	return ""
 }
 
-func newOauthClient(tokenSource oauth2.TokenSource) (*http.Client, error) {
-	if tokenSource == nil {
-		var err error
-		tokenSource, err = google.DefaultTokenSource(
-			context.Background(),
-			compute.CloudPlatformScope,
-			compute.ComputeScope)
-		klog.Infof("Using DefaultTokenSource %#v", tokenSource)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		klog.Infof("Using existing Token Source %#v", tokenSource)
-	}
-
-	backoff := wait.Backoff{
-		// These values will add up to about a minute. See #56293 for background.
-		Duration: time.Second,
-		Factor:   1.4,
-		Steps:    10,
-	}
-	if err := wait.ExponentialBackoff(backoff, func() (bool, error) {
-		if _, err := tokenSource.Token(); err != nil {
-			klog.Errorf("error fetching initial token: %v", err)
-			return false, nil
-		}
-		return true, nil
-	}); err != nil {
-		return nil, err
-	}
-
-	return oauth2.NewClient(context.Background(), tokenSource), nil
-}
-
 func (manager *gceServiceManager) getProjectsAPIEndpoint() string {
 	projectsAPIEndpoint := gceComputeAPIEndpoint + "projects/"
 	if manager.gce.service != nil {

diff --git a/providers/gce/gce_tpu.go b/providers/gce/gce_tpu.go
@@ -23,7 +23,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/http"
 	"time"
 
 	"google.golang.org/api/googleapi"
@@ -35,7 +34,7 @@ import (
 
 // newTPUService returns a new tpuService using the client to communicate with
 // the Cloud TPU APIs.
-func newTPUService(client *http.Client) (*tpuService, error) {
+func newTPUService() (*tpuService, error) {
 	s, err := tpuapi.NewService(context.Background())
 	if err != nil {
 		return nil, err