Merge pull request #1080 from judemars/add_endpoint_version

add beta/v1 suffix to passed-in compute endpoint

Author: k8s-ci-robot

pkg/gce-cloud-provider/compute/gce.go

@@ -163,7 +163,8 @@ func createBetaCloudService(ctx context.Context, vendorVersion string, tokenSour
 
 	computeOpts := []option.ClientOption{option.WithHTTPClient(client)}
 	if computeEndpoint != "" {
-		computeOpts = append(computeOpts, option.WithEndpoint(computeEndpoint))
+		betaEndpoint := fmt.Sprintf("%s/compute/beta/", computeEndpoint)
+		computeOpts = append(computeOpts, option.WithEndpoint(betaEndpoint))
 	}
 	service, err := computebeta.NewService(ctx, computeOpts...)
 	if err != nil {
@@ -186,7 +187,8 @@ func createCloudServiceWithDefaultServiceAccount(ctx context.Context, vendorVers
 
 	computeOpts := []option.ClientOption{option.WithHTTPClient(client)}
 	if computeEndpoint != "" {
-		computeOpts = append(computeOpts, option.WithEndpoint(computeEndpoint))
+		v1Endpoint := fmt.Sprintf("%s/compute/v1/", computeEndpoint)
+		computeOpts = append(computeOpts, option.WithEndpoint(v1Endpoint))
 	}
 	service, err := compute.NewService(ctx, computeOpts...)
 	if err != nil {

test/e2e/tests/single_zone_e2e_test.go

@@ -1150,7 +1150,7 @@ var _ = Describe("GCE PD CSI Driver", func() {
 		Expect(err.Error()).To(ContainSubstring("no such host"), "expected error when passed invalid compute url")
 
 		// Create new driver and client w/ valid, passed-in endpoint
-		tcValid, err := testutils.GCEClientAndDriverSetup(i, "https://compute.googleapis.com/compute/v1/")
+		tcValid, err := testutils.GCEClientAndDriverSetup(i, "https://compute.googleapis.com")
 		if err != nil {
 			klog.Fatalf("Failed to set up Test Context for instance %v: %v", i.GetName(), err)
 		}