diff --git a/pkg/cloudprovider/providers/gce/gce_backendservice.go b/pkg/cloudprovider/providers/gce/gce_backendservice.go index cbbc5db7d79..66bd4d59e98 100644 --- a/pkg/cloudprovider/providers/gce/gce_backendservice.go +++ b/pkg/cloudprovider/providers/gce/gce_backendservice.go @@ -17,10 +17,13 @@ limitations under the License. package gce import ( - "net/http" + "context" computealpha "google.golang.org/api/compute/v0.alpha" compute "google.golang.org/api/compute/v1" + + "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/filter" + "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta" ) func newBackendServiceMetricContext(request, region string) *metricContext { @@ -34,150 +37,105 @@ func newBackendServiceMetricContextWithVersion(request, region, version string) // GetGlobalBackendService retrieves a backend by name. func (gce *GCECloud) GetGlobalBackendService(name string) (*compute.BackendService, error) { mc := newBackendServiceMetricContext("get", "") - v, err := gce.service.BackendServices.Get(gce.projectID, name).Do() + v, err := gce.c.BackendServices().Get(context.Background(), meta.GlobalKey(name)) return v, mc.Observe(err) } // GetAlphaGlobalBackendService retrieves alpha backend by name. func (gce *GCECloud) GetAlphaGlobalBackendService(name string) (*computealpha.BackendService, error) { mc := newBackendServiceMetricContextWithVersion("get", "", computeAlphaVersion) - v, err := gce.serviceAlpha.BackendServices.Get(gce.projectID, name).Do() + v, err := gce.c.AlphaBackendServices().Get(context.Background(), meta.GlobalKey(name)) return v, mc.Observe(err) } -// UpdateGlobalBackendService applies the given BackendService as an update to an existing service. +// UpdateGlobalBackendService applies the given BackendService as an update to +// an existing service. func (gce *GCECloud) UpdateGlobalBackendService(bg *compute.BackendService) error { mc := newBackendServiceMetricContext("update", "") - op, err := gce.service.BackendServices.Update(gce.projectID, bg.Name, bg).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.BackendServices().Update(context.Background(), meta.GlobalKey(bg.Name), bg)) } -// UpdateAlphaGlobalBackendService applies the given alpha BackendService as an update to an existing service. +// UpdateAlphaGlobalBackendService applies the given alpha BackendService as an +// update to an existing service. func (gce *GCECloud) UpdateAlphaGlobalBackendService(bg *computealpha.BackendService) error { - mc := newBackendServiceMetricContextWithVersion("update", "", computeAlphaVersion) - op, err := gce.serviceAlpha.BackendServices.Update(gce.projectID, bg.Name, bg).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + mc := newBackendServiceMetricContext("update", "") + return mc.Observe(gce.c.AlphaBackendServices().Update(context.Background(), meta.GlobalKey(bg.Name), bg)) } // DeleteGlobalBackendService deletes the given BackendService by name. func (gce *GCECloud) DeleteGlobalBackendService(name string) error { mc := newBackendServiceMetricContext("delete", "") - op, err := gce.service.BackendServices.Delete(gce.projectID, name).Do() - if err != nil { - if isHTTPErrorCode(err, http.StatusNotFound) { - return nil - } - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.BackendServices().Delete(context.Background(), meta.GlobalKey(name))) } // CreateGlobalBackendService creates the given BackendService. func (gce *GCECloud) CreateGlobalBackendService(bg *compute.BackendService) error { mc := newBackendServiceMetricContext("create", "") - op, err := gce.service.BackendServices.Insert(gce.projectID, bg).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.BackendServices().Insert(context.Background(), meta.GlobalKey(bg.Name), bg)) } // CreateAlphaGlobalBackendService creates the given alpha BackendService. func (gce *GCECloud) CreateAlphaGlobalBackendService(bg *computealpha.BackendService) error { - mc := newBackendServiceMetricContextWithVersion("create", "", computeAlphaVersion) - op, err := gce.serviceAlpha.BackendServices.Insert(gce.projectID, bg).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + mc := newBackendServiceMetricContext("create", "") + return mc.Observe(gce.c.AlphaBackendServices().Insert(context.Background(), meta.GlobalKey(bg.Name), bg)) } // ListGlobalBackendServices lists all backend services in the project. -func (gce *GCECloud) ListGlobalBackendServices() (*compute.BackendServiceList, error) { +func (gce *GCECloud) ListGlobalBackendServices() ([]*compute.BackendService, error) { mc := newBackendServiceMetricContext("list", "") - // TODO: use PageToken to list all not just the first 500 - v, err := gce.service.BackendServices.List(gce.projectID).Do() + v, err := gce.c.BackendServices().List(context.Background(), filter.None) return v, mc.Observe(err) } -// GetGlobalBackendServiceHealth returns the health of the BackendService identified by the given -// name, in the given instanceGroup. The instanceGroupLink is the fully -// qualified self link of an instance group. +// GetGlobalBackendServiceHealth returns the health of the BackendService +// identified by the given name, in the given instanceGroup. The +// instanceGroupLink is the fully qualified self link of an instance group. func (gce *GCECloud) GetGlobalBackendServiceHealth(name string, instanceGroupLink string) (*compute.BackendServiceGroupHealth, error) { mc := newBackendServiceMetricContext("get_health", "") groupRef := &compute.ResourceGroupReference{Group: instanceGroupLink} - v, err := gce.service.BackendServices.GetHealth(gce.projectID, name, groupRef).Do() + v, err := gce.c.BackendServices().GetHealth(context.Background(), meta.GlobalKey(name), groupRef) return v, mc.Observe(err) } // GetRegionBackendService retrieves a backend by name. func (gce *GCECloud) GetRegionBackendService(name, region string) (*compute.BackendService, error) { mc := newBackendServiceMetricContext("get", region) - v, err := gce.service.RegionBackendServices.Get(gce.projectID, region, name).Do() + v, err := gce.c.RegionBackendServices().Get(context.Background(), meta.RegionalKey(name, region)) return v, mc.Observe(err) } -// UpdateRegionBackendService applies the given BackendService as an update to an existing service. +// UpdateRegionBackendService applies the given BackendService as an update to +// an existing service. func (gce *GCECloud) UpdateRegionBackendService(bg *compute.BackendService, region string) error { mc := newBackendServiceMetricContext("update", region) - op, err := gce.service.RegionBackendServices.Update(gce.projectID, region, bg.Name, bg).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForRegionOp(op, region, mc) + return mc.Observe(gce.c.RegionBackendServices().Update(context.Background(), meta.RegionalKey(bg.Name, region), bg)) } // DeleteRegionBackendService deletes the given BackendService by name. func (gce *GCECloud) DeleteRegionBackendService(name, region string) error { mc := newBackendServiceMetricContext("delete", region) - op, err := gce.service.RegionBackendServices.Delete(gce.projectID, region, name).Do() - if err != nil { - if isHTTPErrorCode(err, http.StatusNotFound) { - return nil - } - return mc.Observe(err) - } - - return gce.waitForRegionOp(op, region, mc) + return mc.Observe(gce.c.RegionBackendServices().Delete(context.Background(), meta.RegionalKey(name, region))) } // CreateRegionBackendService creates the given BackendService. func (gce *GCECloud) CreateRegionBackendService(bg *compute.BackendService, region string) error { mc := newBackendServiceMetricContext("create", region) - op, err := gce.service.RegionBackendServices.Insert(gce.projectID, region, bg).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForRegionOp(op, region, mc) + return mc.Observe(gce.c.RegionBackendServices().Insert(context.Background(), meta.RegionalKey(bg.Name, region), bg)) } // ListRegionBackendServices lists all backend services in the project. -func (gce *GCECloud) ListRegionBackendServices(region string) (*compute.BackendServiceList, error) { +func (gce *GCECloud) ListRegionBackendServices(region string) ([]*compute.BackendService, error) { mc := newBackendServiceMetricContext("list", region) - // TODO: use PageToken to list all not just the first 500 - v, err := gce.service.RegionBackendServices.List(gce.projectID, region).Do() + v, err := gce.c.RegionBackendServices().List(context.Background(), region, filter.None) return v, mc.Observe(err) } -// GetRegionalBackendServiceHealth returns the health of the BackendService identified by the given -// name, in the given instanceGroup. The instanceGroupLink is the fully -// qualified self link of an instance group. +// GetRegionalBackendServiceHealth returns the health of the BackendService +// identified by the given name, in the given instanceGroup. The +// instanceGroupLink is the fully qualified self link of an instance group. func (gce *GCECloud) GetRegionalBackendServiceHealth(name, region string, instanceGroupLink string) (*compute.BackendServiceGroupHealth, error) { mc := newBackendServiceMetricContext("get_health", region) - groupRef := &compute.ResourceGroupReference{Group: instanceGroupLink} - v, err := gce.service.RegionBackendServices.GetHealth(gce.projectID, region, name, groupRef).Do() + ref := &compute.ResourceGroupReference{Group: instanceGroupLink} + v, err := gce.c.RegionBackendServices().GetHealth(context.Background(), meta.RegionalKey(name, region), ref) return v, mc.Observe(err) } diff --git a/pkg/cloudprovider/providers/gce/gce_cert.go b/pkg/cloudprovider/providers/gce/gce_cert.go index e981fe71765..f91ce879e39 100644 --- a/pkg/cloudprovider/providers/gce/gce_cert.go +++ b/pkg/cloudprovider/providers/gce/gce_cert.go @@ -17,9 +17,12 @@ limitations under the License. package gce import ( - "net/http" + "context" compute "google.golang.org/api/compute/v1" + + "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/filter" + "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta" ) func newCertMetricContext(request string) *metricContext { @@ -29,46 +32,29 @@ func newCertMetricContext(request string) *metricContext { // GetSslCertificate returns the SslCertificate by name. func (gce *GCECloud) GetSslCertificate(name string) (*compute.SslCertificate, error) { mc := newCertMetricContext("get") - v, err := gce.service.SslCertificates.Get(gce.projectID, name).Do() + v, err := gce.c.SslCertificates().Get(context.Background(), meta.GlobalKey(name)) return v, mc.Observe(err) } // CreateSslCertificate creates and returns a SslCertificate. func (gce *GCECloud) CreateSslCertificate(sslCerts *compute.SslCertificate) (*compute.SslCertificate, error) { mc := newCertMetricContext("create") - op, err := gce.service.SslCertificates.Insert(gce.projectID, sslCerts).Do() - + err := gce.c.SslCertificates().Insert(context.Background(), meta.GlobalKey(sslCerts.Name), sslCerts) if err != nil { return nil, mc.Observe(err) } - - if err = gce.waitForGlobalOp(op, mc); err != nil { - return nil, mc.Observe(err) - } - return gce.GetSslCertificate(sslCerts.Name) } // DeleteSslCertificate deletes the SslCertificate by name. func (gce *GCECloud) DeleteSslCertificate(name string) error { mc := newCertMetricContext("delete") - op, err := gce.service.SslCertificates.Delete(gce.projectID, name).Do() - - if err != nil { - if isHTTPErrorCode(err, http.StatusNotFound) { - return nil - } - - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.SslCertificates().Delete(context.Background(), meta.GlobalKey(name))) } // ListSslCertificates lists all SslCertificates in the project. -func (gce *GCECloud) ListSslCertificates() (*compute.SslCertificateList, error) { +func (gce *GCECloud) ListSslCertificates() ([]*compute.SslCertificate, error) { mc := newCertMetricContext("list") - // TODO: use PageToken to list all not just the first 500 - v, err := gce.service.SslCertificates.List(gce.projectID).Do() + v, err := gce.c.SslCertificates().List(context.Background(), filter.None) return v, mc.Observe(err) } diff --git a/pkg/cloudprovider/providers/gce/gce_healthchecks.go b/pkg/cloudprovider/providers/gce/gce_healthchecks.go index 7c71f5ae391..e4c0829e108 100644 --- a/pkg/cloudprovider/providers/gce/gce_healthchecks.go +++ b/pkg/cloudprovider/providers/gce/gce_healthchecks.go @@ -17,13 +17,18 @@ limitations under the License. package gce import ( - "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/master/ports" - utilversion "k8s.io/kubernetes/pkg/util/version" + "context" "github.com/golang/glog" + computealpha "google.golang.org/api/compute/v0.alpha" compute "google.golang.org/api/compute/v1" + + "k8s.io/api/core/v1" + "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/filter" + "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta" + "k8s.io/kubernetes/pkg/master/ports" + utilversion "k8s.io/kubernetes/pkg/util/version" ) const ( @@ -54,48 +59,32 @@ func newHealthcheckMetricContextWithVersion(request, version string) *metricCont // GetHttpHealthCheck returns the given HttpHealthCheck by name. func (gce *GCECloud) GetHttpHealthCheck(name string) (*compute.HttpHealthCheck, error) { mc := newHealthcheckMetricContext("get_legacy") - v, err := gce.service.HttpHealthChecks.Get(gce.projectID, name).Do() + v, err := gce.c.HttpHealthChecks().Get(context.Background(), meta.GlobalKey(name)) return v, mc.Observe(err) } // UpdateHttpHealthCheck applies the given HttpHealthCheck as an update. func (gce *GCECloud) UpdateHttpHealthCheck(hc *compute.HttpHealthCheck) error { mc := newHealthcheckMetricContext("update_legacy") - op, err := gce.service.HttpHealthChecks.Update(gce.projectID, hc.Name, hc).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.HttpHealthChecks().Update(context.Background(), meta.GlobalKey(hc.Name), hc)) } // DeleteHttpHealthCheck deletes the given HttpHealthCheck by name. func (gce *GCECloud) DeleteHttpHealthCheck(name string) error { mc := newHealthcheckMetricContext("delete_legacy") - op, err := gce.service.HttpHealthChecks.Delete(gce.projectID, name).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.HttpHealthChecks().Delete(context.Background(), meta.GlobalKey(name))) } // CreateHttpHealthCheck creates the given HttpHealthCheck. func (gce *GCECloud) CreateHttpHealthCheck(hc *compute.HttpHealthCheck) error { mc := newHealthcheckMetricContext("create_legacy") - op, err := gce.service.HttpHealthChecks.Insert(gce.projectID, hc).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.HttpHealthChecks().Insert(context.Background(), meta.GlobalKey(hc.Name), hc)) } // ListHttpHealthChecks lists all HttpHealthChecks in the project. -func (gce *GCECloud) ListHttpHealthChecks() (*compute.HttpHealthCheckList, error) { +func (gce *GCECloud) ListHttpHealthChecks() ([]*compute.HttpHealthCheck, error) { mc := newHealthcheckMetricContext("list_legacy") - // TODO: use PageToken to list all not just the first 500 - v, err := gce.service.HttpHealthChecks.List(gce.projectID).Do() + v, err := gce.c.HttpHealthChecks().List(context.Background(), filter.None) return v, mc.Observe(err) } @@ -104,50 +93,32 @@ func (gce *GCECloud) ListHttpHealthChecks() (*compute.HttpHealthCheckList, error // GetHttpsHealthCheck returns the given HttpsHealthCheck by name. func (gce *GCECloud) GetHttpsHealthCheck(name string) (*compute.HttpsHealthCheck, error) { mc := newHealthcheckMetricContext("get_legacy") - v, err := gce.service.HttpsHealthChecks.Get(gce.projectID, name).Do() - mc.Observe(err) - return v, err + v, err := gce.c.HttpsHealthChecks().Get(context.Background(), meta.GlobalKey(name)) + return v, mc.Observe(err) } // UpdateHttpsHealthCheck applies the given HttpsHealthCheck as an update. func (gce *GCECloud) UpdateHttpsHealthCheck(hc *compute.HttpsHealthCheck) error { mc := newHealthcheckMetricContext("update_legacy") - op, err := gce.service.HttpsHealthChecks.Update(gce.projectID, hc.Name, hc).Do() - if err != nil { - mc.Observe(err) - return err - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.HttpsHealthChecks().Update(context.Background(), meta.GlobalKey(hc.Name), hc)) } // DeleteHttpsHealthCheck deletes the given HttpsHealthCheck by name. func (gce *GCECloud) DeleteHttpsHealthCheck(name string) error { mc := newHealthcheckMetricContext("delete_legacy") - op, err := gce.service.HttpsHealthChecks.Delete(gce.projectID, name).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.HttpsHealthChecks().Delete(context.Background(), meta.GlobalKey(name))) } // CreateHttpsHealthCheck creates the given HttpsHealthCheck. func (gce *GCECloud) CreateHttpsHealthCheck(hc *compute.HttpsHealthCheck) error { mc := newHealthcheckMetricContext("create_legacy") - op, err := gce.service.HttpsHealthChecks.Insert(gce.projectID, hc).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.HttpsHealthChecks().Insert(context.Background(), meta.GlobalKey(hc.Name), hc)) } // ListHttpsHealthChecks lists all HttpsHealthChecks in the project. -func (gce *GCECloud) ListHttpsHealthChecks() (*compute.HttpsHealthCheckList, error) { +func (gce *GCECloud) ListHttpsHealthChecks() ([]*compute.HttpsHealthCheck, error) { mc := newHealthcheckMetricContext("list_legacy") - // TODO: use PageToken to list all not just the first 500 - v, err := gce.service.HttpsHealthChecks.List(gce.projectID).Do() + v, err := gce.c.HttpsHealthChecks().List(context.Background(), filter.None) return v, mc.Observe(err) } @@ -156,77 +127,51 @@ func (gce *GCECloud) ListHttpsHealthChecks() (*compute.HttpsHealthCheckList, err // GetHealthCheck returns the given HealthCheck by name. func (gce *GCECloud) GetHealthCheck(name string) (*compute.HealthCheck, error) { mc := newHealthcheckMetricContext("get") - v, err := gce.service.HealthChecks.Get(gce.projectID, name).Do() + v, err := gce.c.HealthChecks().Get(context.Background(), meta.GlobalKey(name)) return v, mc.Observe(err) } // GetAlphaHealthCheck returns the given alpha HealthCheck by name. func (gce *GCECloud) GetAlphaHealthCheck(name string) (*computealpha.HealthCheck, error) { mc := newHealthcheckMetricContextWithVersion("get", computeAlphaVersion) - v, err := gce.serviceAlpha.HealthChecks.Get(gce.projectID, name).Do() + v, err := gce.c.AlphaHealthChecks().Get(context.Background(), meta.GlobalKey(name)) return v, mc.Observe(err) } // UpdateHealthCheck applies the given HealthCheck as an update. func (gce *GCECloud) UpdateHealthCheck(hc *compute.HealthCheck) error { mc := newHealthcheckMetricContext("update") - op, err := gce.service.HealthChecks.Update(gce.projectID, hc.Name, hc).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.HealthChecks().Update(context.Background(), meta.GlobalKey(hc.Name), hc)) } // UpdateAlphaHealthCheck applies the given alpha HealthCheck as an update. func (gce *GCECloud) UpdateAlphaHealthCheck(hc *computealpha.HealthCheck) error { mc := newHealthcheckMetricContextWithVersion("update", computeAlphaVersion) - op, err := gce.serviceAlpha.HealthChecks.Update(gce.projectID, hc.Name, hc).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.AlphaHealthChecks().Update(context.Background(), meta.GlobalKey(hc.Name), hc)) } // DeleteHealthCheck deletes the given HealthCheck by name. func (gce *GCECloud) DeleteHealthCheck(name string) error { mc := newHealthcheckMetricContext("delete") - op, err := gce.service.HealthChecks.Delete(gce.projectID, name).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.HealthChecks().Delete(context.Background(), meta.GlobalKey(name))) } // CreateHealthCheck creates the given HealthCheck. func (gce *GCECloud) CreateHealthCheck(hc *compute.HealthCheck) error { mc := newHealthcheckMetricContext("create") - op, err := gce.service.HealthChecks.Insert(gce.projectID, hc).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.HealthChecks().Insert(context.Background(), meta.GlobalKey(hc.Name), hc)) } // CreateAlphaHealthCheck creates the given alpha HealthCheck. func (gce *GCECloud) CreateAlphaHealthCheck(hc *computealpha.HealthCheck) error { mc := newHealthcheckMetricContextWithVersion("create", computeAlphaVersion) - op, err := gce.serviceAlpha.HealthChecks.Insert(gce.projectID, hc).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.AlphaHealthChecks().Insert(context.Background(), meta.GlobalKey(hc.Name), hc)) } // ListHealthChecks lists all HealthCheck in the project. -func (gce *GCECloud) ListHealthChecks() (*compute.HealthCheckList, error) { +func (gce *GCECloud) ListHealthChecks() ([]*compute.HealthCheck, error) { mc := newHealthcheckMetricContext("list") - // TODO: use PageToken to list all not just the first 500 - v, err := gce.service.HealthChecks.List(gce.projectID).Do() + v, err := gce.c.HealthChecks().List(context.Background(), filter.None) return v, mc.Observe(err) } diff --git a/pkg/cloudprovider/providers/gce/gce_instancegroup.go b/pkg/cloudprovider/providers/gce/gce_instancegroup.go index 67083224bb2..84b9724bfae 100644 --- a/pkg/cloudprovider/providers/gce/gce_instancegroup.go +++ b/pkg/cloudprovider/providers/gce/gce_instancegroup.go @@ -16,7 +16,14 @@ limitations under the License. package gce -import compute "google.golang.org/api/compute/v1" +import ( + "context" + + compute "google.golang.org/api/compute/v1" + + "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/filter" + "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta" +) func newInstanceGroupMetricContext(request string, zone string) *metricContext { return newGenericMetricContext("instancegroup", request, unusedMetricLabel, zone, computeV1Version) @@ -26,43 +33,29 @@ func newInstanceGroupMetricContext(request string, zone string) *metricContext { // instances. It is the callers responsibility to add named ports. func (gce *GCECloud) CreateInstanceGroup(ig *compute.InstanceGroup, zone string) error { mc := newInstanceGroupMetricContext("create", zone) - op, err := gce.service.InstanceGroups.Insert(gce.projectID, zone, ig).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForZoneOp(op, zone, mc) + return mc.Observe(gce.c.InstanceGroups().Insert(context.Background(), meta.ZonalKey(ig.Name, zone), ig)) } // DeleteInstanceGroup deletes an instance group. func (gce *GCECloud) DeleteInstanceGroup(name string, zone string) error { mc := newInstanceGroupMetricContext("delete", zone) - op, err := gce.service.InstanceGroups.Delete( - gce.projectID, zone, name).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForZoneOp(op, zone, mc) + return mc.Observe(gce.c.InstanceGroups().Delete(context.Background(), meta.ZonalKey(name, zone))) } // ListInstanceGroups lists all InstanceGroups in the project and // zone. -func (gce *GCECloud) ListInstanceGroups(zone string) (*compute.InstanceGroupList, error) { +func (gce *GCECloud) ListInstanceGroups(zone string) ([]*compute.InstanceGroup, error) { mc := newInstanceGroupMetricContext("list", zone) - // TODO: use PageToken to list all not just the first 500 - v, err := gce.service.InstanceGroups.List(gce.projectID, zone).Do() + v, err := gce.c.InstanceGroups().List(context.Background(), zone, filter.None) return v, mc.Observe(err) } // ListInstancesInInstanceGroup lists all the instances in a given // instance group and state. -func (gce *GCECloud) ListInstancesInInstanceGroup(name string, zone string, state string) (*compute.InstanceGroupsListInstances, error) { +func (gce *GCECloud) ListInstancesInInstanceGroup(name string, zone string, state string) ([]*compute.InstanceWithNamedPorts, error) { mc := newInstanceGroupMetricContext("list_instances", zone) - // TODO: use PageToken to list all not just the first 500 - v, err := gce.service.InstanceGroups.ListInstances( - gce.projectID, zone, name, - &compute.InstanceGroupsListInstancesRequest{InstanceState: state}).Do() + req := &compute.InstanceGroupsListInstancesRequest{InstanceState: state} + v, err := gce.c.InstanceGroups().ListInstances(context.Background(), meta.ZonalKey(name, zone), req, filter.None) return v, mc.Observe(err) } @@ -70,58 +63,40 @@ func (gce *GCECloud) ListInstancesInInstanceGroup(name string, zone string, stat // instance group. func (gce *GCECloud) AddInstancesToInstanceGroup(name string, zone string, instanceRefs []*compute.InstanceReference) error { mc := newInstanceGroupMetricContext("add_instances", zone) + // TODO: should cull operation above this layer. if len(instanceRefs) == 0 { return nil } - - op, err := gce.service.InstanceGroups.AddInstances( - gce.projectID, zone, name, - &compute.InstanceGroupsAddInstancesRequest{ - Instances: instanceRefs, - }).Do() - if err != nil { - return mc.Observe(err) + req := &compute.InstanceGroupsAddInstancesRequest{ + Instances: instanceRefs, } - - return gce.waitForZoneOp(op, zone, mc) + return mc.Observe(gce.c.InstanceGroups().AddInstances(context.Background(), meta.ZonalKey(name, zone), req)) } // RemoveInstancesFromInstanceGroup removes the given instances from // the instance group. func (gce *GCECloud) RemoveInstancesFromInstanceGroup(name string, zone string, instanceRefs []*compute.InstanceReference) error { mc := newInstanceGroupMetricContext("remove_instances", zone) + // TODO: should cull operation above this layer. if len(instanceRefs) == 0 { return nil } - - op, err := gce.service.InstanceGroups.RemoveInstances( - gce.projectID, zone, name, - &compute.InstanceGroupsRemoveInstancesRequest{ - Instances: instanceRefs, - }).Do() - if err != nil { - return mc.Observe(err) + req := &compute.InstanceGroupsRemoveInstancesRequest{ + Instances: instanceRefs, } - - return gce.waitForZoneOp(op, zone, mc) + return mc.Observe(gce.c.InstanceGroups().RemoveInstances(context.Background(), meta.ZonalKey(name, zone), req)) } // SetNamedPortsOfInstanceGroup sets the list of named ports on a given instance group func (gce *GCECloud) SetNamedPortsOfInstanceGroup(igName, zone string, namedPorts []*compute.NamedPort) error { mc := newInstanceGroupMetricContext("set_namedports", zone) - op, err := gce.service.InstanceGroups.SetNamedPorts( - gce.projectID, zone, igName, - &compute.InstanceGroupsSetNamedPortsRequest{NamedPorts: namedPorts}).Do() - if err != nil { - return mc.Observe(err) - } - - return gce.waitForZoneOp(op, zone, mc) + req := &compute.InstanceGroupsSetNamedPortsRequest{NamedPorts: namedPorts} + return mc.Observe(gce.c.InstanceGroups().SetNamedPorts(context.Background(), meta.ZonalKey(igName, zone), req)) } // GetInstanceGroup returns an instance group by name. func (gce *GCECloud) GetInstanceGroup(name string, zone string) (*compute.InstanceGroup, error) { mc := newInstanceGroupMetricContext("get", zone) - v, err := gce.service.InstanceGroups.Get(gce.projectID, zone, name).Do() + v, err := gce.c.InstanceGroups().Get(context.Background(), meta.ZonalKey(name, zone)) return v, mc.Observe(err) } diff --git a/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal.go b/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal.go index 4b0c02c6925..64f9e2e9ae4 100644 --- a/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal.go +++ b/pkg/cloudprovider/providers/gce/gce_loadbalancer_internal.go @@ -444,7 +444,7 @@ func (gce *GCECloud) ensureInternalInstanceGroup(name, zone string, nodes []*v1. return "", err } - for _, ins := range instances.Items { + for _, ins := range instances { parts := strings.Split(ins.Instance, "/") gceNodes.Insert(parts[len(parts)-1]) } diff --git a/pkg/cloudprovider/providers/gce/gce_targetproxy.go b/pkg/cloudprovider/providers/gce/gce_targetproxy.go index b92206cfc4e..47a9626fee8 100644 --- a/pkg/cloudprovider/providers/gce/gce_targetproxy.go +++ b/pkg/cloudprovider/providers/gce/gce_targetproxy.go @@ -17,9 +17,12 @@ limitations under the License. package gce import ( - "net/http" + "context" compute "google.golang.org/api/compute/v1" + + "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/filter" + "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta" ) func newTargetProxyMetricContext(request string) *metricContext { @@ -29,49 +32,33 @@ func newTargetProxyMetricContext(request string) *metricContext { // GetTargetHttpProxy returns the UrlMap by name. func (gce *GCECloud) GetTargetHttpProxy(name string) (*compute.TargetHttpProxy, error) { mc := newTargetProxyMetricContext("get") - v, err := gce.service.TargetHttpProxies.Get(gce.projectID, name).Do() + v, err := gce.c.TargetHttpProxies().Get(context.Background(), meta.GlobalKey(name)) return v, mc.Observe(err) } // CreateTargetHttpProxy creates a TargetHttpProxy func (gce *GCECloud) CreateTargetHttpProxy(proxy *compute.TargetHttpProxy) error { mc := newTargetProxyMetricContext("create") - op, err := gce.service.TargetHttpProxies.Insert(gce.projectID, proxy).Do() - if err != nil { - return mc.Observe(err) - } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.TargetHttpProxies().Insert(context.Background(), meta.GlobalKey(proxy.Name), proxy)) } // SetUrlMapForTargetHttpProxy sets the given UrlMap for the given TargetHttpProxy. func (gce *GCECloud) SetUrlMapForTargetHttpProxy(proxy *compute.TargetHttpProxy, urlMap *compute.UrlMap) error { + ref := &compute.UrlMapReference{UrlMap: urlMap.SelfLink} mc := newTargetProxyMetricContext("set_url_map") - op, err := gce.service.TargetHttpProxies.SetUrlMap( - gce.projectID, proxy.Name, &compute.UrlMapReference{UrlMap: urlMap.SelfLink}).Do() - if err != nil { - return mc.Observe(err) - } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.TargetHttpProxies().SetUrlMap(context.Background(), meta.GlobalKey(proxy.Name), ref)) } // DeleteTargetHttpProxy deletes the TargetHttpProxy by name. func (gce *GCECloud) DeleteTargetHttpProxy(name string) error { mc := newTargetProxyMetricContext("delete") - op, err := gce.service.TargetHttpProxies.Delete(gce.projectID, name).Do() - if err != nil { - if isHTTPErrorCode(err, http.StatusNotFound) { - return nil - } - return mc.Observe(err) - } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.TargetHttpProxies().Delete(context.Background(), meta.GlobalKey(name))) } // ListTargetHttpProxies lists all TargetHttpProxies in the project. -func (gce *GCECloud) ListTargetHttpProxies() (*compute.TargetHttpProxyList, error) { +func (gce *GCECloud) ListTargetHttpProxies() ([]*compute.TargetHttpProxy, error) { mc := newTargetProxyMetricContext("list") - // TODO: use PageToken to list all not just the first 500 - v, err := gce.service.TargetHttpProxies.List(gce.projectID).Do() + v, err := gce.c.TargetHttpProxies().List(context.Background(), filter.None) return v, mc.Observe(err) } @@ -80,59 +67,41 @@ func (gce *GCECloud) ListTargetHttpProxies() (*compute.TargetHttpProxyList, erro // GetTargetHttpsProxy returns the UrlMap by name. func (gce *GCECloud) GetTargetHttpsProxy(name string) (*compute.TargetHttpsProxy, error) { mc := newTargetProxyMetricContext("get") - v, err := gce.service.TargetHttpsProxies.Get(gce.projectID, name).Do() + v, err := gce.c.TargetHttpsProxies().Get(context.Background(), meta.GlobalKey(name)) return v, mc.Observe(err) } // CreateTargetHttpsProxy creates a TargetHttpsProxy func (gce *GCECloud) CreateTargetHttpsProxy(proxy *compute.TargetHttpsProxy) error { mc := newTargetProxyMetricContext("create") - op, err := gce.service.TargetHttpsProxies.Insert(gce.projectID, proxy).Do() - if err != nil { - return mc.Observe(err) - } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.TargetHttpsProxies().Insert(context.Background(), meta.GlobalKey(proxy.Name), proxy)) } // SetUrlMapForTargetHttpsProxy sets the given UrlMap for the given TargetHttpsProxy. func (gce *GCECloud) SetUrlMapForTargetHttpsProxy(proxy *compute.TargetHttpsProxy, urlMap *compute.UrlMap) error { mc := newTargetProxyMetricContext("set_url_map") - op, err := gce.service.TargetHttpsProxies.SetUrlMap( - gce.projectID, proxy.Name, &compute.UrlMapReference{UrlMap: urlMap.SelfLink}).Do() - if err != nil { - return mc.Observe(err) - } - return gce.waitForGlobalOp(op, mc) + ref := &compute.UrlMapReference{UrlMap: urlMap.SelfLink} + return mc.Observe(gce.c.TargetHttpsProxies().SetUrlMap(context.Background(), meta.GlobalKey(proxy.Name), ref)) } // SetSslCertificateForTargetHttpsProxy sets the given SslCertificate for the given TargetHttpsProxy. func (gce *GCECloud) SetSslCertificateForTargetHttpsProxy(proxy *compute.TargetHttpsProxy, sslCert *compute.SslCertificate) error { mc := newTargetProxyMetricContext("set_ssl_cert") - op, err := gce.service.TargetHttpsProxies.SetSslCertificates( - gce.projectID, proxy.Name, &compute.TargetHttpsProxiesSetSslCertificatesRequest{SslCertificates: []string{sslCert.SelfLink}}).Do() - if err != nil { - return mc.Observe(err) + req := &compute.TargetHttpsProxiesSetSslCertificatesRequest{ + SslCertificates: []string{sslCert.SelfLink}, } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.TargetHttpsProxies().SetSslCertificates(context.Background(), meta.GlobalKey(proxy.Name), req)) } // DeleteTargetHttpsProxy deletes the TargetHttpsProxy by name. func (gce *GCECloud) DeleteTargetHttpsProxy(name string) error { mc := newTargetProxyMetricContext("delete") - op, err := gce.service.TargetHttpsProxies.Delete(gce.projectID, name).Do() - if err != nil { - if isHTTPErrorCode(err, http.StatusNotFound) { - return nil - } - return mc.Observe(err) - } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.TargetHttpsProxies().Delete(context.Background(), meta.GlobalKey(name))) } // ListTargetHttpsProxies lists all TargetHttpsProxies in the project. -func (gce *GCECloud) ListTargetHttpsProxies() (*compute.TargetHttpsProxyList, error) { +func (gce *GCECloud) ListTargetHttpsProxies() ([]*compute.TargetHttpsProxy, error) { mc := newTargetProxyMetricContext("list") - // TODO: use PageToken to list all not just the first 500 - v, err := gce.service.TargetHttpsProxies.List(gce.projectID).Do() + v, err := gce.c.TargetHttpsProxies().List(context.Background(), filter.None) return v, mc.Observe(err) } diff --git a/pkg/cloudprovider/providers/gce/gce_urlmap.go b/pkg/cloudprovider/providers/gce/gce_urlmap.go index 60184ac4354..54ceccbf54d 100644 --- a/pkg/cloudprovider/providers/gce/gce_urlmap.go +++ b/pkg/cloudprovider/providers/gce/gce_urlmap.go @@ -17,9 +17,12 @@ limitations under the License. package gce import ( - "net/http" + "context" compute "google.golang.org/api/compute/v1" + + "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/filter" + "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta" ) func newUrlMapMetricContext(request string) *metricContext { @@ -29,47 +32,31 @@ func newUrlMapMetricContext(request string) *metricContext { // GetUrlMap returns the UrlMap by name. func (gce *GCECloud) GetUrlMap(name string) (*compute.UrlMap, error) { mc := newUrlMapMetricContext("get") - v, err := gce.service.UrlMaps.Get(gce.projectID, name).Do() + v, err := gce.c.UrlMaps().Get(context.Background(), meta.GlobalKey(name)) return v, mc.Observe(err) } // CreateUrlMap creates a url map func (gce *GCECloud) CreateUrlMap(urlMap *compute.UrlMap) error { mc := newUrlMapMetricContext("create") - op, err := gce.service.UrlMaps.Insert(gce.projectID, urlMap).Do() - if err != nil { - return mc.Observe(err) - } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.UrlMaps().Insert(context.Background(), meta.GlobalKey(urlMap.Name), urlMap)) } // UpdateUrlMap applies the given UrlMap as an update func (gce *GCECloud) UpdateUrlMap(urlMap *compute.UrlMap) error { mc := newUrlMapMetricContext("update") - op, err := gce.service.UrlMaps.Update(gce.projectID, urlMap.Name, urlMap).Do() - if err != nil { - return mc.Observe(err) - } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.UrlMaps().Update(context.Background(), meta.GlobalKey(urlMap.Name), urlMap)) } // DeleteUrlMap deletes a url map by name. func (gce *GCECloud) DeleteUrlMap(name string) error { mc := newUrlMapMetricContext("delete") - op, err := gce.service.UrlMaps.Delete(gce.projectID, name).Do() - if err != nil { - if isHTTPErrorCode(err, http.StatusNotFound) { - return nil - } - return mc.Observe(err) - } - return gce.waitForGlobalOp(op, mc) + return mc.Observe(gce.c.UrlMaps().Delete(context.Background(), meta.GlobalKey(name))) } // ListUrlMaps lists all UrlMaps in the project. -func (gce *GCECloud) ListUrlMaps() (*compute.UrlMapList, error) { +func (gce *GCECloud) ListUrlMaps() ([]*compute.UrlMap, error) { mc := newUrlMapMetricContext("list") - // TODO: use PageToken to list all not just the first 500 - v, err := gce.service.UrlMaps.List(gce.projectID).Do() + v, err := gce.c.UrlMaps().List(context.Background(), filter.None) return v, mc.Observe(err) } diff --git a/test/e2e/framework/ingress_utils.go b/test/e2e/framework/ingress_utils.go index 6cec7d9dcdc..a9bd6c4ec62 100644 --- a/test/e2e/framework/ingress_utils.go +++ b/test/e2e/framework/ingress_utils.go @@ -458,10 +458,10 @@ func (cont *GCEIngressController) deleteURLMap(del bool) (msg string) { } return fmt.Sprintf("Failed to list url maps: %v", err) } - if len(umList.Items) == 0 { + if len(umList) == 0 { return msg } - for _, um := range umList.Items { + for _, um := range umList { if !cont.canDelete(um.Name, um.CreationTimestamp, del) { continue } @@ -487,11 +487,11 @@ func (cont *GCEIngressController) deleteBackendService(del bool) (msg string) { } return fmt.Sprintf("Failed to list backend services: %v", err) } - if len(beList.Items) == 0 { + if len(beList) == 0 { Logf("No backend services found") return msg } - for _, be := range beList.Items { + for _, be := range beList { if !cont.canDelete(be.Name, be.CreationTimestamp, del) { continue } @@ -517,10 +517,10 @@ func (cont *GCEIngressController) deleteHTTPHealthCheck(del bool) (msg string) { } return fmt.Sprintf("Failed to list HTTP health checks: %v", err) } - if len(hcList.Items) == 0 { + if len(hcList) == 0 { return msg } - for _, hc := range hcList.Items { + for _, hc := range hcList { if !cont.canDelete(hc.Name, hc.CreationTimestamp, del) { continue } @@ -546,8 +546,8 @@ func (cont *GCEIngressController) deleteSSLCertificate(del bool) (msg string) { } return fmt.Sprintf("Failed to list ssl certificates: %v", err) } - if len(sslList.Items) != 0 { - for _, s := range sslList.Items { + if len(sslList) != 0 { + for _, s := range sslList { if !cont.canDelete(s.Name, s.CreationTimestamp, del) { continue } @@ -576,10 +576,10 @@ func (cont *GCEIngressController) deleteInstanceGroup(del bool) (msg string) { } return fmt.Sprintf("Failed to list instance groups: %v", err) } - if len(igList.Items) == 0 { + if len(igList) == 0 { return msg } - for _, ig := range igList.Items { + for _, ig := range igList { if !cont.canDelete(ig.Name, ig.CreationTimestamp, del) { continue } @@ -745,7 +745,7 @@ func (cont *GCEIngressController) backendMode(nodeports []string, keyword string } matchingBackendService := 0 - for _, bs := range beList.Items { + for _, bs := range beList { match := false for _, np := range nodeports { // Warning: This assumes backend service naming convention includes nodeport in the name