github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove useBetaAPI option from getReplicaZoneURI

Browse Source 
This is a follow up PR for #70716. Remove useBetaAPI option since
Regional PD is already GA.
This commit is contained in:
Jing Xu
2018-11-09 09:45:43 -08:00
parent e133ab274d
commit c5b5f64f3b
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/cloudprovider/providers/gce/gce_disks.go
View File

@@ -158,7 +158,7 @@ func (manager *gceServiceManager) CreateRegionalDiskOnCloudProvider(
fullyQualifiedReplicaZones := []string{} fullyQualifiedReplicaZones := []string{}
for _, replicaZone := range replicaZones.UnsortedList() { for _, replicaZone := range replicaZones.UnsortedList() {
fullyQualifiedReplicaZones = append( fullyQualifiedReplicaZones = append(
fullyQualifiedReplicaZones, manager.getReplicaZoneURI(replicaZone, true)) fullyQualifiedReplicaZones, manager.getReplicaZoneURI(replicaZone))
} }
diskToCreate := &compute.Disk{ diskToCreate := &compute.Disk{
@@ -359,15 +359,8 @@ func (manager *gceServiceManager) getDiskTypeURI(
} }
} }
func (manager *gceServiceManager) getReplicaZoneURI(zone string, useBetaAPI bool) string { func (manager *gceServiceManager) getReplicaZoneURI(zone string) string {
var getProjectsAPIEndpoint string return manager.getProjectsAPIEndpoint() + fmt.Sprintf(
if useBetaAPI {
getProjectsAPIEndpoint = manager.getProjectsAPIEndpointBeta()
} else {
getProjectsAPIEndpoint = manager.getProjectsAPIEndpoint()
}
return getProjectsAPIEndpoint + fmt.Sprintf(
replicaZoneURITemplateSingleZone, replicaZoneURITemplateSingleZone,
manager.gce.projectID, manager.gce.projectID,
zone) zone)