Merge pull request #60563 from hzxuzhonghu/replace-context

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Replace package "golang.org/x/net/context" with "context" **What this PR does / why we need it**: Replace package "golang.org/x/net/context" with "context" **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #60560 **Special notes for your reviewer**: As of Go 1.7 this package(golang.org/x/net/context) is available in the standard library under the name context. see (https://godoc.org/golang.org/x/net/context) It is almost machinery replace. **Release note**: ```release-note NONE ``` Kubernetes-commit: 915798d229b7be076d8e53d6aa1573adabd470d2
2025-09-13 22:01:43 +00:00 · 2018-03-23 16:34:23 -07:00
parent 30089d3674 1e55c20903
commit b9a0cf870f
5 changed files with 57 additions and 59 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -364,215 +364,215 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "3aa1cc99b23ea45d95fd4e1a648f10cc41a491e1"
+			"Rev": "b94e5e603d6eb10ccb65a504f538ca1ae4ef92df"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
--- a/plugin/pkg/client/auth/gcp/gcp.go
+++ b/plugin/pkg/client/auth/gcp/gcp.go
@@ -18,6 +18,7 @@ package gcp

 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -27,7 +28,6 @@ import (
 	"time"

 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
 	"k8s.io/apimachinery/pkg/util/net"
--- a/tools/cache/listwatch.go
+++ b/tools/cache/listwatch.go
@@ -17,10 +17,9 @@ limitations under the License.
 package cache

 import (
+	"context"
 	"time"

-	"golang.org/x/net/context"
-
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
--- a/tools/pager/pager.go
+++ b/tools/pager/pager.go
@@ -17,10 +17,9 @@ limitations under the License.
 package pager

 import (
+	"context"
 	"fmt"

-	"golang.org/x/net/context"
-
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
--- a/tools/pager/pager_test.go
+++ b/tools/pager/pager_test.go
@@ -17,11 +17,11 @@ limitations under the License.
 package pager

 import (
+	"context"
 	"fmt"
 	"reflect"
 	"testing"

-	"golang.org/x/net/context"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"