github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85581 from yutedz/gce-ctx-timeout

Browse Source 
Utilize Context with timeout in GCE operations
This commit is contained in:
Kubernetes Prow Robot 2019-12-03 17:01:10 -08:00 committed by GitHub
commit 8516f797a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/legacy-cloud-providers/gce/gce_routes.go
View File

@ -23,12 +23,12 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"path" "path"
"time"
compute "google.golang.org/api/compute/v1" "google.golang.org/api/compute/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/klog" "k8s.io/klog"
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/filter" "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/filter"
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta" "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
cloudprovider "k8s.io/cloud-provider" cloudprovider "k8s.io/cloud-provider"
@ -40,7 +40,7 @@ func newRoutesMetricContext(request string) *metricContext {
// ListRoutes in the cloud environment. // ListRoutes in the cloud environment.
func (g *Cloud) ListRoutes(ctx context.Context, clusterName string) ([]*cloudprovider.Route, error) { func (g *Cloud) ListRoutes(ctx context.Context, clusterName string) ([]*cloudprovider.Route, error) {
timeoutCtx, cancel := cloud.ContextWithCallTimeout() timeoutCtx, cancel := context.WithTimeout(ctx, 1*time.Hour)
defer cancel() defer cancel()
mc := newRoutesMetricContext("list") mc := newRoutesMetricContext("list")
@ -66,7 +66,7 @@ func (g *Cloud) ListRoutes(ctx context.Context, clusterName string) ([]*cloudpro
// CreateRoute in the cloud environment. // CreateRoute in the cloud environment.
func (g *Cloud) CreateRoute(ctx context.Context, clusterName string, nameHint string, route *cloudprovider.Route) error { func (g *Cloud) CreateRoute(ctx context.Context, clusterName string, nameHint string, route *cloudprovider.Route) error {
timeoutCtx, cancel := cloud.ContextWithCallTimeout() timeoutCtx, cancel := context.WithTimeout(ctx, 1*time.Hour)
defer cancel() defer cancel()
mc := newRoutesMetricContext("create") mc := newRoutesMetricContext("create")
@ -94,7 +94,7 @@ func (g *Cloud) CreateRoute(ctx context.Context, clusterName string, nameHint st
// DeleteRoute from the cloud environment. // DeleteRoute from the cloud environment.
func (g *Cloud) DeleteRoute(ctx context.Context, clusterName string, route *cloudprovider.Route) error { func (g *Cloud) DeleteRoute(ctx context.Context, clusterName string, route *cloudprovider.Route) error {
timeoutCtx, cancel := cloud.ContextWithCallTimeout() timeoutCtx, cancel := context.WithTimeout(ctx, 1*time.Hour)
defer cancel() defer cancel()
mc := newRoutesMetricContext("delete") mc := newRoutesMetricContext("delete")