From c5b5f64f3b94442f2ef3371952c130cc3b1c12d4 Mon Sep 17 00:00:00 2001 From: Jing Xu Date: Fri, 9 Nov 2018 09:45:43 -0800 Subject: [PATCH] Remove useBetaAPI option from getReplicaZoneURI This is a follow up PR for #70716. Remove useBetaAPI option since Regional PD is already GA. --- pkg/cloudprovider/providers/gce/gce_disks.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkg/cloudprovider/providers/gce/gce_disks.go b/pkg/cloudprovider/providers/gce/gce_disks.go index b9068d42121..cd77874262f 100644 --- a/pkg/cloudprovider/providers/gce/gce_disks.go +++ b/pkg/cloudprovider/providers/gce/gce_disks.go @@ -158,7 +158,7 @@ func (manager *gceServiceManager) CreateRegionalDiskOnCloudProvider( fullyQualifiedReplicaZones := []string{} for _, replicaZone := range replicaZones.UnsortedList() { fullyQualifiedReplicaZones = append( - fullyQualifiedReplicaZones, manager.getReplicaZoneURI(replicaZone, true)) + fullyQualifiedReplicaZones, manager.getReplicaZoneURI(replicaZone)) } diskToCreate := &compute.Disk{ @@ -359,15 +359,8 @@ func (manager *gceServiceManager) getDiskTypeURI( } } -func (manager *gceServiceManager) getReplicaZoneURI(zone string, useBetaAPI bool) string { - var getProjectsAPIEndpoint string - if useBetaAPI { - getProjectsAPIEndpoint = manager.getProjectsAPIEndpointBeta() - } else { - getProjectsAPIEndpoint = manager.getProjectsAPIEndpoint() - } - - return getProjectsAPIEndpoint + fmt.Sprintf( +func (manager *gceServiceManager) getReplicaZoneURI(zone string) string { + return manager.getProjectsAPIEndpoint() + fmt.Sprintf( replicaZoneURITemplateSingleZone, manager.gce.projectID, zone)