Skip to content

Commit 8516f79

Browse files
authored
Merge pull request kubernetes#85581 from yutedz/gce-ctx-timeout
Utilize Context with timeout in GCE operations
2 parents fe97fbb + 4d6e5bf commit 8516f79

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import (
2323
"fmt"
2424
"net/http"
2525
"path"
26+
"time"
2627

27-
compute "google.golang.org/api/compute/v1"
28+
"google.golang.org/api/compute/v1"
2829
"k8s.io/apimachinery/pkg/types"
2930
"k8s.io/klog"
3031

31-
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
3232
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/filter"
3333
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
3434
cloudprovider "k8s.io/cloud-provider"
@@ -40,7 +40,7 @@ func newRoutesMetricContext(request string) *metricContext {
4040

4141
// ListRoutes in the cloud environment.
4242
func (g *Cloud) ListRoutes(ctx context.Context, clusterName string) ([]*cloudprovider.Route, error) {
43-
timeoutCtx, cancel := cloud.ContextWithCallTimeout()
43+
timeoutCtx, cancel := context.WithTimeout(ctx, 1*time.Hour)
4444
defer cancel()
4545

4646
mc := newRoutesMetricContext("list")
@@ -66,7 +66,7 @@ func (g *Cloud) ListRoutes(ctx context.Context, clusterName string) ([]*cloudpro
6666

6767
// CreateRoute in the cloud environment.
6868
func (g *Cloud) CreateRoute(ctx context.Context, clusterName string, nameHint string, route *cloudprovider.Route) error {
69-
timeoutCtx, cancel := cloud.ContextWithCallTimeout()
69+
timeoutCtx, cancel := context.WithTimeout(ctx, 1*time.Hour)
7070
defer cancel()
7171

7272
mc := newRoutesMetricContext("create")
@@ -94,7 +94,7 @@ func (g *Cloud) CreateRoute(ctx context.Context, clusterName string, nameHint st
9494

9595
// DeleteRoute from the cloud environment.
9696
func (g *Cloud) DeleteRoute(ctx context.Context, clusterName string, route *cloudprovider.Route) error {
97-
timeoutCtx, cancel := cloud.ContextWithCallTimeout()
97+
timeoutCtx, cancel := context.WithTimeout(ctx, 1*time.Hour)
9898
defer cancel()
9999

100100
mc := newRoutesMetricContext("delete")

0 commit comments

Comments
 (0)