Revert "CORS-3906: Update MAPI GCP Provider to use custom GCP endpoints"

This reverts commit 17d99d9.

Author: barbacbd

cmd/manager/main.go

@@ -90,7 +90,7 @@ func main() {
 
 	// Sets up feature gates
 	defaultMutableGate := feature.DefaultMutableFeatureGate
-	gateOpts, err := features.NewFeatureGateOptions(defaultMutableGate, apifeatures.SelfManaged, apifeatures.FeatureGateMachineAPIMigration, apifeatures.FeatureGateGCPCustomAPIEndpoints)
+	gateOpts, err := features.NewFeatureGateOptions(defaultMutableGate, apifeatures.SelfManaged, apifeatures.FeatureGateMachineAPIMigration)
 	if err != nil {
 		klog.Fatalf("Error setting up feature gates: %v", err)
 	}
@@ -181,9 +181,8 @@ func main() {
 	ctrl.SetLogger(klogr.New())
 	setupLog := ctrl.Log.WithName("setup")
 	if err = (&machinesetcontroller.Reconciler{
-		Client:       mgr.GetClient(),
-		Log:          ctrl.Log.WithName("controllers").WithName("MachineSet"),
-		FeatureGates: defaultMutableGate,
+		Client: mgr.GetClient(),
+		Log:    ctrl.Log.WithName("controllers").WithName("MachineSet"),
 	}).SetupWithManager(mgr, controller.Options{}); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "MachineSet")
 		os.Exit(1)

pkg/cloud/gcp/actuators/machine/actuator.go

@@ -10,7 +10,6 @@ import (
 	machinev1 "github.com/openshift/api/machine/v1beta1"
 	computeservice "github.com/openshift/machine-api-provider-gcp/pkg/cloud/gcp/actuators/services/compute"
 	tagservice "github.com/openshift/machine-api-provider-gcp/pkg/cloud/gcp/actuators/services/tags"
-	"github.com/openshift/machine-api-provider-gcp/pkg/cloud/gcp/actuators/util"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/component-base/featuregate"
@@ -35,7 +34,6 @@ type Actuator struct {
 	computeClientBuilder computeservice.BuilderFuncType
 	tagsClientBuilder    tagservice.BuilderFuncType
 	featureGates         featuregate.FeatureGate
-	endpointLookup       util.EndpointLookupFuncType
 }
 
 // ActuatorParams holds parameter information for Actuator.
@@ -45,7 +43,6 @@ type ActuatorParams struct {
 	ComputeClientBuilder computeservice.BuilderFuncType
 	TagsClientBuilder    tagservice.BuilderFuncType
 	FeatureGates         featuregate.FeatureGate
-	EndpointLookup       util.EndpointLookupFuncType
 }
 
 // NewActuator returns an actuator.
@@ -56,7 +53,6 @@ func NewActuator(params ActuatorParams) *Actuator {
 		computeClientBuilder: params.ComputeClientBuilder,
 		tagsClientBuilder:    params.TagsClientBuilder,
 		featureGates:         params.FeatureGates,
-		endpointLookup:       params.EndpointLookup,
 	}
 }
 
@@ -80,7 +76,6 @@ func (a *Actuator) Create(ctx context.Context, machine *machinev1.Machine) error
 		computeClientBuilder: a.computeClientBuilder,
 		tagsClientBuilder:    a.tagsClientBuilder,
 		featureGates:         a.featureGates,
-		endpointLookup:       a.endpointLookup,
 	})
 	if err != nil {
 		fmtErr := fmt.Errorf(scopeFailFmt, machine.GetName(), err)
@@ -105,7 +100,6 @@ func (a *Actuator) Exists(ctx context.Context, machine *machinev1.Machine) (bool
 		computeClientBuilder: a.computeClientBuilder,
 		tagsClientBuilder:    a.tagsClientBuilder,
 		featureGates:         a.featureGates,
-		endpointLookup:       a.endpointLookup,
 	})
 	if err != nil {
 		return false, fmt.Errorf(scopeFailFmt, machine.Name, err)
@@ -147,7 +141,6 @@ func (a *Actuator) Update(ctx context.Context, machine *machinev1.Machine) error
 		computeClientBuilder: a.computeClientBuilder,
 		tagsClientBuilder:    a.tagsClientBuilder,
 		featureGates:         a.featureGates,
-		endpointLookup:       a.endpointLookup,
 	})
 	if err != nil {
 		fmtErr := fmt.Errorf(scopeFailFmt, machine.GetName(), err)
@@ -185,7 +178,6 @@ func (a *Actuator) Delete(ctx context.Context, machine *machinev1.Machine) error
 		computeClientBuilder: a.computeClientBuilder,
 		tagsClientBuilder:    a.tagsClientBuilder,
 		featureGates:         a.featureGates,
-		endpointLookup:       a.endpointLookup,
 	})
 	if err != nil {
 		fmtErr := fmt.Errorf(scopeFailFmt, machine.GetName(), err)

pkg/cloud/gcp/actuators/machine/actuator_test.go

@@ -320,7 +320,6 @@ func TestActuatorEvents(t *testing.T) {
 				ComputeClientBuilder: computeservice.MockBuilderFuncType,
 				TagsClientBuilder:    tagservice.NewMockTagServiceBuilder,
 				FeatureGates:         gate,
-				EndpointLookup:       util.MockGCPEndpointLookup,
 			}
 
 			actuator := NewActuator(params)
@@ -425,7 +424,6 @@ func TestActuatorExists(t *testing.T) {
 				ComputeClientBuilder: computeservice.MockBuilderFuncType,
 				TagsClientBuilder:    tagservice.NewMockTagServiceBuilder,
 				FeatureGates:         gate,
-				EndpointLookup:       util.MockGCPEndpointLookup,
 			}
 
 			actuator := NewActuator(params)
@@ -448,7 +446,7 @@ func TestActuatorExists(t *testing.T) {
 
 func NewDefaultMutableFeatureGate(gateConfig map[string]bool) (featuregate.MutableFeatureGate, error) {
 	defaultMutableGate := feature.DefaultMutableFeatureGate
-	_, err := features.NewFeatureGateOptions(defaultMutableGate, openshiftfeatures.SelfManaged, openshiftfeatures.FeatureGateMachineAPIMigration, openshiftfeatures.FeatureGateGCPCustomAPIEndpoints)
+	_, err := features.NewFeatureGateOptions(defaultMutableGate, openshiftfeatures.SelfManaged, openshiftfeatures.FeatureGateMachineAPIMigration)
 	if err != nil {
 		return nil, fmt.Errorf("failed to set up default feature gate: %w", err)
 	}

pkg/cloud/gcp/actuators/machine/machine_scope.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	configv1 "github.com/openshift/api/config/v1"
-	apifeatures "github.com/openshift/api/features"
 	machinev1 "github.com/openshift/api/machine/v1beta1"
 	machineapierros "github.com/openshift/machine-api-operator/pkg/controller/machine"
 	computeservice "github.com/openshift/machine-api-provider-gcp/pkg/cloud/gcp/actuators/services/compute"
@@ -28,7 +26,6 @@ type machineScopeParams struct {
 	computeClientBuilder computeservice.BuilderFuncType
 	tagsClientBuilder    tagservice.BuilderFuncType
 	featureGates         featuregate.FeatureGate
-	endpointLookup       util.EndpointLookupFuncType
 }
 
 // machineScope defines a scope defined around a machine and its cluster.
@@ -88,31 +85,12 @@ func newMachineScope(params machineScopeParams) (*machineScope, error) {
 		}
 	}
 
-	var computeEndpoint *configv1.GCPServiceEndpoint = nil
-	var tagsEndpoint *configv1.GCPServiceEndpoint = nil
-	if params.featureGates.Enabled(featuregate.Feature(apifeatures.FeatureGateGCPCustomAPIEndpoints)) {
-		lookupFunc := params.endpointLookup
-		if lookupFunc == nil {
-			lookupFunc = util.GetGCPServiceEndpoint
-		}
-
-		computeEndpoint, err = lookupFunc(params.coreClient, configv1.GCPServiceEndpointNameCompute)
-		if err != nil {
-			return nil, machineapierros.InvalidMachineConfiguration("error getting compute service endpoint: %v", err)
-		}
-
-		tagsEndpoint, err = lookupFunc(params.coreClient, "TagManager")
-		if err != nil {
-			return nil, machineapierros.InvalidMachineConfiguration("error getting tag manager service endpoint: %v", err)
-		}
-	}
-
-	computeService, err := params.computeClientBuilder(serviceAccountJSON, computeEndpoint)
+	computeService, err := params.computeClientBuilder(serviceAccountJSON)
 	if err != nil {
 		return nil, machineapierros.InvalidMachineConfiguration("error creating compute service: %v", err)
 	}
 
-	tagService, err := params.tagsClientBuilder(params.Context, serviceAccountJSON, tagsEndpoint)
+	tagService, err := params.tagsClientBuilder(params.Context, serviceAccountJSON)
 	if err != nil {
 		return nil, machineapierros.InvalidMachineConfiguration("error creating tag service: %v", err)
 	}

pkg/cloud/gcp/actuators/machine/machine_scope_test.go

@@ -192,7 +192,7 @@ func TestNewMachineScope(t *testing.T) {
 			name: "fail to create compute service",
 			params: machineScopeParams{
 				coreClient: fakeClient,
-				computeClientBuilder: func(serviceAccountJSON string, endpoint *configv1.GCPServiceEndpoint) (computeservice.GCPComputeService, error) {
+				computeClientBuilder: func(serviceAccountJSON string) (computeservice.GCPComputeService, error) {
 					return nil, errors.New("test error")
 				},
 				machine: &machinev1.Machine{
@@ -221,7 +221,6 @@ func TestNewMachineScope(t *testing.T) {
 			gate, err := NewDefaultMutableFeatureGate(nil)
 			gs.Expect(err).To(Not(HaveOccurred()))
 			tc.params.featureGates = gate
-			tc.params.endpointLookup = util.MockGCPEndpointLookup
 
 			scope, err := newMachineScope(tc.params)
 
@@ -427,7 +426,6 @@ func TestPatchMachine(t *testing.T) {
 				computeClientBuilder: computeservice.MockBuilderFuncType,
 				tagsClientBuilder:    tagservice.NewMockTagServiceBuilder,
 				featureGates:         gate,
-				endpointLookup:       util.MockGCPEndpointLookup,
 			})
 
 			gs.Expect(err).ToNot(HaveOccurred())

pkg/cloud/gcp/actuators/machineset/controller.go

@@ -21,8 +21,6 @@ import (
 	"github.com/openshift/machine-api-provider-gcp/pkg/cloud/gcp/actuators/util"
 
 	"github.com/go-logr/logr"
-	configv1 "github.com/openshift/api/config/v1"
-	apifeatures "github.com/openshift/api/features"
 	machinev1 "github.com/openshift/api/machine/v1beta1"
 	mapierrors "github.com/openshift/machine-api-operator/pkg/controller/machine"
 	mapiutil "github.com/openshift/machine-api-operator/pkg/util"
@@ -31,7 +29,6 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
-	"k8s.io/component-base/featuregate"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -56,8 +53,6 @@ type Reconciler struct {
 	scheme   *runtime.Scheme
 	cache    *machineTypesCache
 
-	FeatureGates featuregate.FeatureGate
-
 	// Allow a mock GCPComputeService to be injected during testing
 	getGCPService func(namespace string, providerConfig machinev1.GCPMachineProviderSpec) (computeservice.GCPComputeService, error)
 }
@@ -220,15 +215,7 @@ func (r *Reconciler) getRealGCPService(namespace string, providerConfig machinev
 		return nil, err
 	}
 
-	var endpoint *configv1.GCPServiceEndpoint = nil
-	if r.FeatureGates.Enabled(featuregate.Feature(apifeatures.FeatureGateGCPCustomAPIEndpoints)) {
-		endpoint, err = util.GetGCPServiceEndpoint(r.Client, configv1.GCPServiceEndpointNameCompute)
-		if err != nil {
-			return nil, fmt.Errorf("failed to get GCP compute service endpoint: %v", err)
-		}
-	}
-
-	computeService, err := computeservice.NewComputeService(serviceAccountJSON, endpoint)
+	computeService, err := computeservice.NewComputeService(serviceAccountJSON)
 	if err != nil {
 		return nil, mapierrors.InvalidMachineConfiguration("error creating compute service: %v", err)
 	}

pkg/cloud/gcp/actuators/services/compute/computeservice.go

@@ -8,7 +8,6 @@ import (
 	"golang.org/x/oauth2/google"
 	"google.golang.org/api/option"
 
-	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/machine-api-provider-gcp/pkg/version"
 	"google.golang.org/api/compute/v1"
 )
@@ -45,25 +44,18 @@ type computeService struct {
 }
 
 // BuilderFuncType is function type for building gcp client
-type BuilderFuncType func(serviceAccountJSON string, endpoint *configv1.GCPServiceEndpoint) (GCPComputeService, error)
+type BuilderFuncType func(serviceAccountJSON string) (GCPComputeService, error)
 
 // NewComputeService return a new computeService
-func NewComputeService(serviceAccountJSON string, endpoint *configv1.GCPServiceEndpoint) (GCPComputeService, error) {
+func NewComputeService(serviceAccountJSON string) (GCPComputeService, error) {
 	ctx := context.TODO()
 
 	creds, err := google.CredentialsFromJSON(ctx, []byte(serviceAccountJSON), compute.CloudPlatformScope)
 	if err != nil {
 		return nil, err
 	}
 
-	options := []option.ClientOption{
-		option.WithCredentials(creds),
-	}
-	if endpoint != nil && endpoint.URL != "" {
-		options = append(options, option.WithEndpoint(endpoint.URL))
-	}
-
-	service, err := compute.NewService(ctx, options...)
+	service, err := compute.NewService(ctx, option.WithCredentials(creds))
 	if err != nil {
 		return nil, err
 	}

pkg/cloud/gcp/actuators/services/compute/computeservice_mock.go

@@ -7,8 +7,6 @@ import (
 
 	compute "google.golang.org/api/compute/v1"
 	"google.golang.org/api/googleapi"
-
-	configv1 "github.com/openshift/api/config/v1"
 )
 
 const (
@@ -136,12 +134,12 @@ func NewComputeServiceMock() (*compute.Instance, *GCPComputeServiceMock) {
 	return &receivedInstance, &computeServiceMock
 }
 
-func MockBuilderFuncType(serviceAccountJSON string, endpoint *configv1.GCPServiceEndpoint) (GCPComputeService, error) {
+func MockBuilderFuncType(serviceAccountJSON string) (GCPComputeService, error) {
 	_, computeSvc := NewComputeServiceMock()
 	return computeSvc, nil
 }
 
-func MockBuilderFuncTypeNotFound(serviceAccountJSON string, endpoint *configv1.GCPServiceEndpoint) (GCPComputeService, error) {
+func MockBuilderFuncTypeNotFound(serviceAccountJSON string) (GCPComputeService, error) {
 	_, computeSvc := NewComputeServiceMock()
 	computeSvc.mockInstancesGet = func(project string, zone string, instance string) (*compute.Instance, error) {
 		return nil, &googleapi.Error{

pkg/cloud/gcp/actuators/services/tags/tagservice.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	configv1 "github.com/openshift/api/config/v1"
-
 	tags "google.golang.org/api/cloudresourcemanager/v3"
 	"google.golang.org/api/option"
 )
@@ -22,18 +20,11 @@ type tagService struct {
 }
 
 // BuilderFuncType is function type for building GCP tag client.
-type BuilderFuncType func(ctx context.Context, serviceAccountJSON string, endpoint *configv1.GCPServiceEndpoint) (TagService, error)
+type BuilderFuncType func(ctx context.Context, serviceAccountJSON string) (TagService, error)
 
 // NewTagService return a new tagService.
-func NewTagService(ctx context.Context, serviceAccountJSON string, endpoint *configv1.GCPServiceEndpoint) (TagService, error) {
-	options := []option.ClientOption{
-		option.WithCredentialsJSON([]byte(serviceAccountJSON)),
-	}
-	if endpoint != nil && endpoint.URL != "" {
-		options = append(options, option.WithEndpoint(endpoint.URL))
-	}
-
-	service, err := tags.NewService(ctx, options...)
+func NewTagService(ctx context.Context, serviceAccountJSON string) (TagService, error) {
+	service, err := tags.NewService(ctx, option.WithCredentialsJSON([]byte(serviceAccountJSON)))
 	if err != nil {
 		return nil, fmt.Errorf("could not create new tag service: %w", err)
 	}

pkg/cloud/gcp/actuators/services/tags/tagservice_mock.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	tags "google.golang.org/api/cloudresourcemanager/v3"
-
-	configv1 "github.com/openshift/api/config/v1"
 )
 
 // MockTagService mocks TagService interface for tests.
@@ -19,7 +17,7 @@ func NewMockTagService() *MockTagService {
 }
 
 // NewMockTagServiceBuilder returns new mock for creating GCP tag client.
-func NewMockTagServiceBuilder(ctx context.Context, serviceAccountJSON string, endpoint *configv1.GCPServiceEndpoint) (TagService, error) {
+func NewMockTagServiceBuilder(ctx context.Context, serviceAccountJSON string) (TagService, error) {
 	return NewMockTagService(), nil
 }