diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index 9293518c394..4698c52b0e5 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/pkg/cloudprovider/providers/gce/gce.go @@ -88,8 +88,8 @@ const ( // Defaults to 5 * 2 = 10 seconds before the LB will steer traffic away gceHcUnhealthyThreshold = int64(5) - gceComputeAPIEndpoint = "https://www.googleapis.com/compute/v1/" - gceComputeAPIEndpointAlpha = "https://www.googleapis.com/compute/alpha/" + gceComputeAPIEndpoint = "https://www.googleapis.com/compute/v1/" + gceComputeAPIEndpointBeta = "https://www.googleapis.com/compute/beta/" ) // gceObject is an abstraction of all GCE API object in go client @@ -878,10 +878,10 @@ func (manager *gceServiceManager) getProjectsAPIEndpoint() string { return projectsApiEndpoint } -func (manager *gceServiceManager) getProjectsAPIEndpointAlpha() string { - projectsApiEndpoint := gceComputeAPIEndpointAlpha + "projects/" +func (manager *gceServiceManager) getProjectsAPIEndpointBeta() string { + projectsApiEndpoint := gceComputeAPIEndpointBeta + "projects/" if manager.gce.service != nil { - projectsApiEndpoint = manager.gce.serviceAlpha.BasePath + projectsApiEndpoint = manager.gce.serviceBeta.BasePath } return projectsApiEndpoint diff --git a/pkg/cloudprovider/providers/gce/gce_disks.go b/pkg/cloudprovider/providers/gce/gce_disks.go index 601a426f8b3..18b1c080932 100644 --- a/pkg/cloudprovider/providers/gce/gce_disks.go +++ b/pkg/cloudprovider/providers/gce/gce_disks.go @@ -34,7 +34,7 @@ import ( volumeutil "k8s.io/kubernetes/pkg/volume/util" "github.com/golang/glog" - computealpha "google.golang.org/api/compute/v0.alpha" + computebeta "google.golang.org/api/compute/v0.beta" compute "google.golang.org/api/compute/v1" "google.golang.org/api/googleapi" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -123,7 +123,7 @@ func (manager *gceServiceManager) CreateDiskOnCloudProvider( diskType string, zone string) (gceObject, error) { diskTypeURI, err := manager.getDiskTypeURI( - manager.gce.region /* diskRegion */, singleZone{zone}, diskType, false /* useAlphaAPI */) + manager.gce.region /* diskRegion */, singleZone{zone}, diskType, false /* useBetaAPI */) if err != nil { return nil, err } @@ -147,7 +147,7 @@ func (manager *gceServiceManager) CreateRegionalDiskOnCloudProvider( if utilfeature.DefaultFeatureGate.Enabled(features.GCERegionalPersistentDisk) { diskTypeURI, err := manager.getDiskTypeURI( - manager.gce.region /* diskRegion */, multiZone{replicaZones}, diskType, true /* useAlphaAPI */) + manager.gce.region /* diskRegion */, multiZone{replicaZones}, diskType, true /* useBetaAPI */) if err != nil { return nil, err } @@ -157,15 +157,15 @@ func (manager *gceServiceManager) CreateRegionalDiskOnCloudProvider( fullyQualifiedReplicaZones, manager.getReplicaZoneURI(replicaZone, true)) } - diskToCreateAlpha := &computealpha.Disk{ + diskToCreateBeta := &computebeta.Disk{ Name: name, SizeGb: sizeGb, Description: tagsStr, Type: diskTypeURI, ReplicaZones: fullyQualifiedReplicaZones, } - return manager.gce.serviceAlpha.RegionDisks.Insert( - manager.gce.projectID, manager.gce.region, diskToCreateAlpha).Do() + return manager.gce.serviceBeta.RegionDisks.Insert( + manager.gce.projectID, manager.gce.region, diskToCreateBeta).Do() } return nil, fmt.Errorf("the regional PD feature is only available with the %s Kubernetes feature gate enabled", features.GCERegionalPersistentDisk) @@ -241,24 +241,24 @@ func (manager *gceServiceManager) GetRegionalDiskFromCloudProvider( diskName string) (*GCEDisk, error) { if utilfeature.DefaultFeatureGate.Enabled(features.GCERegionalPersistentDisk) { - diskAlpha, err := manager.gce.serviceAlpha.RegionDisks.Get( + diskBeta, err := manager.gce.serviceBeta.RegionDisks.Get( manager.gce.projectID, manager.gce.region, diskName).Do() if err != nil { return nil, err } zones := sets.NewString() - for _, zoneURI := range diskAlpha.ReplicaZones { + for _, zoneURI := range diskBeta.ReplicaZones { zones.Insert(lastComponent(zoneURI)) } return &GCEDisk{ ZoneInfo: multiZone{zones}, - Region: lastComponent(diskAlpha.Region), - Name: diskAlpha.Name, - Kind: diskAlpha.Kind, - Type: diskAlpha.Type, - SizeGb: diskAlpha.SizeGb, + Region: lastComponent(diskBeta.Region), + Name: diskBeta.Name, + Kind: diskBeta.Kind, + Type: diskBeta.Type, + SizeGb: diskBeta.SizeGb, }, nil } @@ -275,7 +275,7 @@ func (manager *gceServiceManager) DeleteDiskOnCloudProvider( func (manager *gceServiceManager) DeleteRegionalDiskOnCloudProvider( diskName string) (gceObject, error) { if utilfeature.DefaultFeatureGate.Enabled(features.GCERegionalPersistentDisk) { - return manager.gce.serviceAlpha.RegionDisks.Delete( + return manager.gce.serviceBeta.RegionDisks.Delete( manager.gce.projectID, manager.gce.region, diskName).Do() } @@ -327,11 +327,11 @@ func (manager *gceServiceManager) getDiskSourceURI(disk *GCEDisk) (string, error } func (manager *gceServiceManager) getDiskTypeURI( - diskRegion string, diskZoneInfo zoneType, diskType string, useAlphaAPI bool) (string, error) { + diskRegion string, diskZoneInfo zoneType, diskType string, useBetaAPI bool) (string, error) { var getProjectsAPIEndpoint string - if useAlphaAPI { - getProjectsAPIEndpoint = manager.getProjectsAPIEndpointAlpha() + if useBetaAPI { + getProjectsAPIEndpoint = manager.getProjectsAPIEndpointBeta() } else { getProjectsAPIEndpoint = manager.getProjectsAPIEndpoint() } @@ -363,10 +363,10 @@ func (manager *gceServiceManager) getDiskTypeURI( } } -func (manager *gceServiceManager) getReplicaZoneURI(zone string, useAlphaAPI bool) string { +func (manager *gceServiceManager) getReplicaZoneURI(zone string, useBetaAPI bool) string { var getProjectsAPIEndpoint string - if useAlphaAPI { - getProjectsAPIEndpoint = manager.getProjectsAPIEndpointAlpha() + if useBetaAPI { + getProjectsAPIEndpoint = manager.getProjectsAPIEndpointBeta() } else { getProjectsAPIEndpoint = manager.getProjectsAPIEndpoint() } @@ -420,10 +420,10 @@ func (manager *gceServiceManager) ResizeDiskOnCloudProvider(disk *GCEDisk, sizeG func (manager *gceServiceManager) RegionalResizeDiskOnCloudProvider(disk *GCEDisk, sizeGb int64) (gceObject, error) { if utilfeature.DefaultFeatureGate.Enabled(features.GCERegionalPersistentDisk) { - resizeServiceRequest := &computealpha.RegionDisksResizeRequest{ + resizeServiceRequest := &computebeta.RegionDisksResizeRequest{ SizeGb: sizeGb, } - return manager.gce.serviceAlpha.RegionDisks.Resize(manager.gce.projectID, disk.Region, disk.Name, resizeServiceRequest).Do() + return manager.gce.serviceBeta.RegionDisks.Resize(manager.gce.projectID, disk.Region, disk.Name, resizeServiceRequest).Do() } return nil, fmt.Errorf("the regional PD feature is only available with the %s Kubernetes feature gate enabled", features.GCERegionalPersistentDisk) } diff --git a/pkg/cloudprovider/providers/gce/gce_disks_test.go b/pkg/cloudprovider/providers/gce/gce_disks_test.go index 41c470c4272..1a0b1240cf9 100644 --- a/pkg/cloudprovider/providers/gce/gce_disks_test.go +++ b/pkg/cloudprovider/providers/gce/gce_disks_test.go @@ -116,7 +116,7 @@ func TestCreateRegionalDisk_Basic(t *testing.T) { tags := make(map[string]string) tags["test-tag"] = "test-value" - expectedDiskTypeURI := gceComputeAPIEndpointAlpha + "projects/" + fmt.Sprintf( + expectedDiskTypeURI := gceComputeAPIEndpointBeta + "projects/" + fmt.Sprintf( diskTypeURITemplateRegional, gceProjectId, gceRegion, diskType) expectedDescription := "{\"test-tag\":\"test-value\"}" @@ -753,7 +753,7 @@ func (manager *FakeServiceManager) CreateDiskOnCloudProvider( return manager.opBeta, nil case targetAlpha: manager.opAlpha = &computealpha.Operation{} - diskTypeURI := gceComputeAPIEndpointAlpha + "projects/" + fmt.Sprintf(diskTypeURITemplateSingleZone, manager.gceProjectID, zone, diskType) + diskTypeURI := gceComputeAPIEndpointBeta + "projects/" + fmt.Sprintf(diskTypeURITemplateSingleZone, manager.gceProjectID, zone, diskType) diskToCreateAlpha := &computealpha.Disk{ Name: name, SizeGb: sizeGb, @@ -779,7 +779,7 @@ func (manager *FakeServiceManager) CreateRegionalDiskOnCloudProvider( diskType string, zones sets.String) (gceObject, error) { manager.createDiskCalled = true - diskTypeURI := gceComputeAPIEndpointAlpha + "projects/" + fmt.Sprintf(diskTypeURITemplateRegional, manager.gceProjectID, manager.gceRegion, diskType) + diskTypeURI := gceComputeAPIEndpointBeta + "projects/" + fmt.Sprintf(diskTypeURITemplateRegional, manager.gceProjectID, manager.gceRegion, diskType) switch t := manager.targetAPI; t { case targetStable: