Replace "golang.org/x/net/context" with "context"

cluster/images/etcd/attachlease/BUILD

@@ -18,7 +18,6 @@ go_library(
     deps = [
         "//vendor/github.com/coreos/etcd/clientv3:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
     ],
 )
 

cluster/images/etcd/attachlease/attachlease.go

@@ -17,13 +17,13 @@ limitations under the License.
 package main
 
 import (
+	"context"
 	"flag"
 	"strings"
 	"time"
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 )
 
 var (

pkg/cloudprovider/providers/vsphere/BUILD

@@ -23,7 +23,6 @@ go_library(
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/vmware/govmomi/vim25:go_default_library",
         "//vendor/github.com/vmware/govmomi/vim25/mo:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/gopkg.in/gcfg.v1:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
@@ -39,7 +38,6 @@ go_test(
     deps = [
         "//pkg/cloudprovider:go_default_library",
         "//pkg/cloudprovider/providers/vsphere/vclib:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/rand:go_default_library",
     ],

pkg/cloudprovider/providers/vsphere/nodemanager.go

@@ -17,12 +17,12 @@ limitations under the License.
 package vsphere
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"sync"
 
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 	"k8s.io/api/core/v1"
 	k8stypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib"

pkg/cloudprovider/providers/vsphere/vclib/BUILD

@@ -37,7 +37,6 @@ go_library(
         "//vendor/github.com/vmware/govmomi/vim25/mo:go_default_library",
         "//vendor/github.com/vmware/govmomi/vim25/soap:go_default_library",
         "//vendor/github.com/vmware/govmomi/vim25/types:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
     ],
 )
 

pkg/cloudprovider/providers/vsphere/vclib/connection.go

@@ -17,6 +17,7 @@ limitations under the License.
 package vclib
 
 import (
+	"context"
 	"fmt"
 	neturl "net/url"
 	"sync"
@@ -25,7 +26,6 @@ import (
 	"github.com/vmware/govmomi"
 	"github.com/vmware/govmomi/session"
 	"github.com/vmware/govmomi/vim25"
-	"golang.org/x/net/context"
 )
 
 // VSphereConnection contains information for connecting to vCenter

pkg/cloudprovider/providers/vsphere/vclib/datacenter.go

@@ -17,6 +17,7 @@ limitations under the License.
 package vclib
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"path/filepath"
@@ -28,7 +29,6 @@ import (
 	"github.com/vmware/govmomi/property"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 // Datacenter extends the govmomi Datacenter object

pkg/cloudprovider/providers/vsphere/vclib/datastore.go

@@ -17,14 +17,15 @@ limitations under the License.
 package vclib
 
 import (
+	"context"
 	"fmt"
+
 	"github.com/golang/glog"
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/property"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/soap"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 )
 
 // Datastore extends the govmomi Datastore object

pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/BUILD

@@ -18,7 +18,6 @@ go_library(
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/vmware/govmomi/object:go_default_library",
         "//vendor/github.com/vmware/govmomi/vim25/types:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
     ],
 )
 

pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/vdm.go

@@ -17,10 +17,9 @@ limitations under the License.
 package diskmanagers
 
 import (
+	"context"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/golang/glog"
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/types"

pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/virtualdisk.go

@@ -17,10 +17,10 @@ limitations under the License.
 package diskmanagers
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib"
 )
 

pkg/cloudprovider/providers/vsphere/vclib/diskmanagers/vmdm.go

@@ -17,6 +17,7 @@ limitations under the License.
 package diskmanagers
 
 import (
+	"context"
 	"fmt"
 	"hash/fnv"
 	"strings"
@@ -24,7 +25,6 @@ import (
 	"github.com/golang/glog"
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/types"
-	"golang.org/x/net/context"
 	"k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib"
 )
 

pkg/cloudprovider/providers/vsphere/vclib/folder.go

@@ -17,9 +17,10 @@ limitations under the License.
 package vclib
 
 import (
+	"context"
+
 	"github.com/golang/glog"
 	"github.com/vmware/govmomi/object"
-	"golang.org/x/net/context"
 )
 
 // Folder extends the govmomi Folder object

pkg/cloudprovider/providers/vsphere/vclib/pbm.go

@@ -17,11 +17,11 @@ limitations under the License.
 package vclib
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/golang/glog"
 	"github.com/vmware/govmomi/pbm"
-	"golang.org/x/net/context"
 
 	pbmtypes "github.com/vmware/govmomi/pbm/types"
 	"github.com/vmware/govmomi/vim25"

pkg/cloudprovider/providers/vsphere/vsphere.go

@@ -17,6 +17,7 @@ limitations under the License.
 package vsphere
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -32,7 +33,6 @@ import (
 	"gopkg.in/gcfg.v1"
 
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 	"k8s.io/api/core/v1"
 	k8stypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/informers"

pkg/cloudprovider/providers/vsphere/vsphere_test.go

@@ -17,13 +17,13 @@ limitations under the License.
 package vsphere
 
 import (
+	"context"
 	"log"
 	"os"
 	"strconv"
 	"strings"
 	"testing"
 
-	"golang.org/x/net/context"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/kubernetes/pkg/cloudprovider"

pkg/kubelet/cm/devicemanager/BUILD

@@ -23,7 +23,6 @@ go_library(
         "//pkg/scheduler/schedulercache:go_default_library",
         "//pkg/util/filesystem:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/google.golang.org/grpc:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",

pkg/kubelet/cm/devicemanager/device_plugin_stub.go

@@ -17,13 +17,13 @@ limitations under the License.
 package devicemanager
 
 import (
+	"context"
 	"log"
 	"net"
 	"os"
 	"path"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
 	pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1"

pkg/kubelet/cm/devicemanager/endpoint.go

@@ -17,13 +17,13 @@ limitations under the License.
 package devicemanager
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"sync"
 	"time"
 
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
 	pluginapi "k8s.io/kubernetes/pkg/kubelet/apis/deviceplugin/v1beta1"

pkg/kubelet/cm/devicemanager/manager.go

@@ -17,6 +17,7 @@ limitations under the License.
 package devicemanager
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net"
@@ -26,7 +27,6 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
 	"k8s.io/api/core/v1"

pkg/kubelet/dockershim/BUILD

@@ -112,7 +112,6 @@ go_library(
         "//vendor/github.com/docker/docker/pkg/jsonmessage:go_default_library",
         "//vendor/github.com/docker/go-connections/nat:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
@@ -167,7 +166,6 @@ go_test(
         "//vendor/github.com/golang/mock/gomock:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/github.com/stretchr/testify/require:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library",
     ],
 )

pkg/kubelet/dockershim/docker_container.go

@@ -17,6 +17,7 @@ limitations under the License.
 package dockershim
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -27,7 +28,6 @@ import (
 	dockerfilters "github.com/docker/docker/api/types/filters"
 	dockerstrslice "github.com/docker/docker/api/types/strslice"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker"

pkg/kubelet/dockershim/docker_container_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package dockershim
 
 import (
+	"context"
 	"fmt"
 	"path/filepath"
 	"strings"
@@ -26,7 +27,6 @@ import (
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 	containertest "k8s.io/kubernetes/pkg/kubelet/container/testing"

pkg/kubelet/dockershim/docker_image.go

@@ -17,13 +17,13 @@ limitations under the License.
 package dockershim
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 
 	dockertypes "github.com/docker/docker/api/types"
 	dockerfilters "github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/pkg/jsonmessage"
-	"golang.org/x/net/context"
 
 	"github.com/golang/glog"
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"

pkg/kubelet/dockershim/docker_image_linux.go

@@ -19,10 +19,9 @@ limitations under the License.
 package dockershim
 
 import (
+	"context"
 	"fmt"
 
-	"golang.org/x/net/context"
-
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 )
 

pkg/kubelet/dockershim/docker_image_unsupported.go

@@ -19,10 +19,9 @@ limitations under the License.
 package dockershim
 
 import (
+	"context"
 	"fmt"
 
-	"golang.org/x/net/context"
-
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 )
 

pkg/kubelet/dockershim/docker_image_windows.go

@@ -19,10 +19,10 @@ limitations under the License.
 package dockershim
 
 import (
+	"context"
 	"time"
 
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 	"k8s.io/kubernetes/pkg/kubelet/winstats"

pkg/kubelet/dockershim/docker_logs.go

@@ -17,10 +17,9 @@ limitations under the License.
 package dockershim
 
 import (
+	"context"
 	"fmt"
 
-	"golang.org/x/net/context"
-
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 )
 

pkg/kubelet/dockershim/docker_sandbox.go

@@ -17,6 +17,7 @@ limitations under the License.
 package dockershim
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"strings"
@@ -26,7 +27,6 @@ import (
 	dockercontainer "github.com/docker/docker/api/types/container"
 	dockerfilters "github.com/docker/docker/api/types/filters"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"

pkg/kubelet/dockershim/docker_service.go

@@ -17,6 +17,7 @@ limitations under the License.
 package dockershim
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"sync"
@@ -25,7 +26,6 @@ import (
 	"github.com/blang/semver"
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 
 	"k8s.io/api/core/v1"
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"

pkg/kubelet/dockershim/docker_stats_linux.go

@@ -19,9 +19,9 @@ limitations under the License.
 package dockershim
 
 import (
+	"context"
 	"fmt"
 
-	"golang.org/x/net/context"
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 )
 

pkg/kubelet/dockershim/docker_stats_unsupported.go

@@ -19,10 +19,9 @@ limitations under the License.
 package dockershim
 
 import (
+	"context"
 	"fmt"
 
-	"golang.org/x/net/context"
-
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 )
 

pkg/kubelet/dockershim/docker_stats_windows.go

@@ -19,10 +19,9 @@ limitations under the License.
 package dockershim
 
 import (
+	"context"
 	"time"
 
-	"golang.org/x/net/context"
-
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 )
 

pkg/kubelet/dockershim/docker_streaming.go

@@ -18,6 +18,7 @@ package dockershim
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io"
 	"math"
@@ -27,7 +28,6 @@ import (
 
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 
 	"k8s.io/client-go/tools/remotecommand"
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"

pkg/kubelet/dockershim/libdocker/BUILD

@@ -40,7 +40,6 @@ go_library(
         "//vendor/github.com/docker/docker/pkg/stdcopy:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/opencontainers/go-digest:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/clock:go_default_library",
     ],

pkg/kubelet/dockershim/libdocker/kube_docker_client.go

@@ -18,6 +18,7 @@ package libdocker
 
 import (
 	"bytes"
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -35,7 +36,6 @@ import (
 	dockerapi "github.com/docker/docker/client"
 	dockermessage "github.com/docker/docker/pkg/jsonmessage"
 	dockerstdcopy "github.com/docker/docker/pkg/stdcopy"
-	"golang.org/x/net/context"
 )
 
 // kubeDockerClient is a wrapped layer of docker client for kubelet internal use. This layer is added to:

pkg/kubelet/remote/BUILD

@@ -20,7 +20,6 @@ go_library(
         "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
         "//pkg/kubelet/util:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/google.golang.org/grpc:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
     ],

pkg/kubelet/remote/fake/BUILD

@@ -55,7 +55,6 @@ go_library(
         "//pkg/kubelet/apis/cri/runtime/v1alpha2:go_default_library",
         "//pkg/kubelet/apis/cri/testing:go_default_library",
         "//pkg/kubelet/util:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/google.golang.org/grpc:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
     ],

pkg/kubelet/remote/fake/fake_image_service.go

@@ -17,7 +17,8 @@ limitations under the License.
 package fake
 
 import (
-	"golang.org/x/net/context"
+	"context"
+
 	kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 )
 

pkg/kubelet/remote/fake/fake_runtime.go

@@ -17,10 +17,10 @@ limitations under the License.
 package fake
 
 import (
+	"context"
 	"fmt"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 	apitest "k8s.io/kubernetes/pkg/kubelet/apis/cri/testing"

pkg/kubelet/remote/remote_runtime.go

@@ -17,13 +17,13 @@ limitations under the License.
 package remote
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"strings"
 	"time"
 
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
 	internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"

pkg/kubelet/remote/utils.go

@@ -17,11 +17,10 @@ limitations under the License.
 package remote
 
 import (
+	"context"
 	"fmt"
 	"time"
 
-	"golang.org/x/net/context"
-
 	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 )
 

pkg/kubelet/rkt/BUILD

@@ -46,7 +46,6 @@ go_library(
         "//vendor/github.com/coreos/rkt/api/v1alpha:go_default_library",
         "//vendor/github.com/docker/docker/api/types:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/google.golang.org/grpc:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -83,7 +82,6 @@ go_test(
         "//vendor/github.com/coreos/rkt/api/v1alpha:go_default_library",
         "//vendor/github.com/golang/mock/gomock:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/google.golang.org/grpc:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",

pkg/kubelet/rkt/config.go

@@ -17,10 +17,10 @@ limitations under the License.
 package rkt
 
 import (
+	"context"
 	"fmt"
 
 	rktapi "github.com/coreos/rkt/api/v1alpha"
-	"golang.org/x/net/context"
 )
 
 // Config stores the global configuration for the rkt runtime.

pkg/kubelet/rkt/fake_rkt_interface_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package rkt
 
 import (
+	"context"
 	"fmt"
 	"strconv"
 	"strings"
@@ -24,7 +25,6 @@ import (
 
 	"github.com/coreos/go-systemd/dbus"
 	rktapi "github.com/coreos/rkt/api/v1alpha"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"k8s.io/apimachinery/pkg/types"
 	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"

pkg/kubelet/rkt/image.go

@@ -18,6 +18,7 @@ limitations under the License.
 package rkt
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -32,7 +33,7 @@ import (
 	rktapi "github.com/coreos/rkt/api/v1alpha"
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
+
 	"k8s.io/api/core/v1"
 	"k8s.io/kubernetes/pkg/credentialprovider"
 	credentialprovidersecrets "k8s.io/kubernetes/pkg/credentialprovider/secrets"

pkg/kubelet/rkt/log.go

@@ -17,13 +17,13 @@ limitations under the License.
 package rkt
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"strings"
 	"time"
 
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 
 	rktapi "github.com/coreos/rkt/api/v1alpha"
 	"k8s.io/api/core/v1"

pkg/kubelet/rkt/rkt.go

@@ -19,6 +19,7 @@ package rkt
 import (
 	"bufio"
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -39,7 +40,6 @@ import (
 	"github.com/coreos/go-systemd/unit"
 	rktapi "github.com/coreos/rkt/api/v1alpha"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/kubelet/rkt/version.go

@@ -17,11 +17,11 @@ limitations under the License.
 package rkt
 
 import (
+	"context"
 	"fmt"
 	"sync"
 
 	rktapi "github.com/coreos/rkt/api/v1alpha"
-	"golang.org/x/net/context"
 
 	utilversion "k8s.io/kubernetes/pkg/util/version"
 )

pkg/registry/core/pod/storage/BUILD

@@ -14,7 +14,6 @@ go_test(
         "//pkg/apis/core:go_default_library",
         "//pkg/registry/registrytest:go_default_library",
         "//pkg/securitycontext:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",

pkg/registry/core/pod/storage/storage_test.go

@@ -17,11 +17,11 @@ limitations under the License.
 package storage
 
 import (
+	"context"
 	"strings"
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
 	"k8s.io/api/core/v1"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/api/errors"

pkg/registry/core/service/allocator/storage/BUILD

@@ -14,7 +14,6 @@ go_test(
         "//pkg/apis/core:go_default_library",
         "//pkg/registry/core/service/allocator:go_default_library",
         "//pkg/registry/registrytest:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/storage/storagebackend:go_default_library",
     ],
@@ -28,7 +27,6 @@ go_library(
         "//pkg/apis/core:go_default_library",
         "//pkg/registry/core/rangeallocation:go_default_library",
         "//pkg/registry/core/service/allocator:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",

pkg/registry/core/service/allocator/storage/storage.go

@@ -17,6 +17,7 @@ limitations under the License.
 package storage
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"sync"
@@ -32,8 +33,6 @@ import (
 	api "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/registry/core/rangeallocation"
 	"k8s.io/kubernetes/pkg/registry/core/service/allocator"
-
-	"golang.org/x/net/context"
 )
 
 var (

pkg/registry/core/service/allocator/storage/storage_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package storage
 
 import (
+	"context"
 	"strings"
 	"testing"
 
@@ -25,8 +26,6 @@ import (
 	api "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/registry/core/service/allocator"
 	"k8s.io/kubernetes/pkg/registry/registrytest"
-
-	"golang.org/x/net/context"
 )
 
 func newStorage(t *testing.T) (*Etcd, *etcdtesting.EtcdTestServer, allocator.Interface, *storagebackend.Config) {

pkg/registry/core/service/ipallocator/storage/BUILD

@@ -16,7 +16,6 @@ go_test(
         "//pkg/registry/core/service/allocator/storage:go_default_library",
         "//pkg/registry/core/service/ipallocator:go_default_library",
         "//pkg/registry/registrytest:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/storage:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library",

pkg/registry/core/service/ipallocator/storage/storage_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package storage
 
 import (
+	"context"
 	"net"
 	"strings"
 	"testing"
@@ -30,8 +31,6 @@ import (
 	allocatorstore "k8s.io/kubernetes/pkg/registry/core/service/allocator/storage"
 	"k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
 	"k8s.io/kubernetes/pkg/registry/registrytest"
-
-	"golang.org/x/net/context"
 )
 
 func newStorage(t *testing.T) (*etcdtesting.EtcdTestServer, ipallocator.Interface, allocator.Interface, storage.Interface, factory.DestroyFunc) {

pkg/volume/csi/BUILD

@@ -18,7 +18,6 @@ go_library(
         "//pkg/volume/util:go_default_library",
         "//vendor/github.com/container-storage-interface/spec/lib/go/csi/v0:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/google.golang.org/grpc:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/api/storage/v1beta1:go_default_library",
@@ -43,7 +42,6 @@ go_test(
         "//pkg/volume:go_default_library",
         "//pkg/volume/csi/fake:go_default_library",
         "//pkg/volume/testing:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/google.golang.org/grpc:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/api/storage/v1beta1:go_default_library",

pkg/volume/csi/csi_attacher.go

@@ -17,6 +17,7 @@ limitations under the License.
 package csi
 
 import (
+	"context"
 	"crypto/sha256"
 	"errors"
 	"fmt"
@@ -27,7 +28,6 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	grpctx "golang.org/x/net/context"
 
 	csipb "github.com/container-storage-interface/spec/lib/go/csi/v0"
 	"k8s.io/api/core/v1"
@@ -284,7 +284,7 @@ func (c *csiAttacher) MountDevice(spec *volume.Spec, devicePath string, deviceMo
 	}
 	csi := c.csiClient
 
-	ctx, cancel := grpctx.WithTimeout(grpctx.Background(), csiTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), csiTimeout)
 	defer cancel()
 	// Check whether "STAGE_UNSTAGE_VOLUME" is set
 	stageUnstageSet, err := hasStageUnstageCapability(ctx, csi)
@@ -475,7 +475,7 @@ func (c *csiAttacher) UnmountDevice(deviceMountPath string) error {
 	}
 	csi := c.csiClient
 
-	ctx, cancel := grpctx.WithTimeout(grpctx.Background(), csiTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), csiTimeout)
 	defer cancel()
 	// Check whether "STAGE_UNSTAGE_VOLUME" is set
 	stageUnstageSet, err := hasStageUnstageCapability(ctx, csi)
@@ -502,7 +502,7 @@ func (c *csiAttacher) UnmountDevice(deviceMountPath string) error {
 	return nil
 }
 
-func hasStageUnstageCapability(ctx grpctx.Context, csi csiClient) (bool, error) {
+func hasStageUnstageCapability(ctx context.Context, csi csiClient) (bool, error) {
 	capabilities, err := csi.NodeGetCapabilities(ctx)
 	if err != nil {
 		return false, err

pkg/volume/csi/csi_client.go

@@ -17,20 +17,20 @@ limitations under the License.
 package csi
 
 import (
+	"context"
 	"errors"
 	"net"
 	"time"
 
 	csipb "github.com/container-storage-interface/spec/lib/go/csi/v0"
 	"github.com/golang/glog"
-	grpctx "golang.org/x/net/context"
 	"google.golang.org/grpc"
 	api "k8s.io/api/core/v1"
 )
 
 type csiClient interface {
 	NodePublishVolume(
-		ctx grpctx.Context,
+		ctx context.Context,
 		volumeid string,
 		readOnly bool,
 		stagingTargetPath string,
@@ -42,11 +42,11 @@ type csiClient interface {
 		fsType string,
 	) error
 	NodeUnpublishVolume(
-		ctx grpctx.Context,
+		ctx context.Context,
 		volID string,
 		targetPath string,
 	) error
-	NodeStageVolume(ctx grpctx.Context,
+	NodeStageVolume(ctx context.Context,
 		volID string,
 		publishVolumeInfo map[string]string,
 		stagingTargetPath string,
@@ -55,8 +55,8 @@ type csiClient interface {
 		nodeStageSecrets map[string]string,
 		volumeAttribs map[string]string,
 	) error
-	NodeUnstageVolume(ctx grpctx.Context, volID, stagingTargetPath string) error
+	NodeUnstageVolume(ctx context.Context, volID, stagingTargetPath string) error
-	NodeGetCapabilities(ctx grpctx.Context) ([]*csipb.NodeServiceCapability, error)
+	NodeGetCapabilities(ctx context.Context) ([]*csipb.NodeServiceCapability, error)
 }
 
 // csiClient encapsulates all csi-plugin methods
@@ -103,7 +103,7 @@ func (c *csiDriverClient) assertConnection() error {
 }
 
 func (c *csiDriverClient) NodePublishVolume(
-	ctx grpctx.Context,
+	ctx context.Context,
 	volID string,
 	readOnly bool,
 	stagingTargetPath string,
@@ -152,7 +152,7 @@ func (c *csiDriverClient) NodePublishVolume(
 	return err
 }
 
-func (c *csiDriverClient) NodeUnpublishVolume(ctx grpctx.Context, volID string, targetPath string) error {
+func (c *csiDriverClient) NodeUnpublishVolume(ctx context.Context, volID string, targetPath string) error {
 	glog.V(4).Info(log("calling NodeUnpublishVolume rpc: [volid=%s, target_path=%s", volID, targetPath))
 	if volID == "" {
 		return errors.New("missing volume id")
@@ -174,7 +174,7 @@ func (c *csiDriverClient) NodeUnpublishVolume(ctx grpctx.Context, volID string,
 	return err
 }
 
-func (c *csiDriverClient) NodeStageVolume(ctx grpctx.Context,
+func (c *csiDriverClient) NodeStageVolume(ctx context.Context,
 	volID string,
 	publishInfo map[string]string,
 	stagingTargetPath string,
@@ -217,7 +217,7 @@ func (c *csiDriverClient) NodeStageVolume(ctx grpctx.Context,
 	return err
 }
 
-func (c *csiDriverClient) NodeUnstageVolume(ctx grpctx.Context, volID, stagingTargetPath string) error {
+func (c *csiDriverClient) NodeUnstageVolume(ctx context.Context, volID, stagingTargetPath string) error {
 	glog.V(4).Info(log("calling NodeUnstageVolume rpc [volid=%s,staging_target_path=%s]", volID, stagingTargetPath))
 	if volID == "" {
 		return errors.New("missing volume id")
@@ -238,7 +238,7 @@ func (c *csiDriverClient) NodeUnstageVolume(ctx grpctx.Context, volID, stagingTa
 	return err
 }
 
-func (c *csiDriverClient) NodeGetCapabilities(ctx grpctx.Context) ([]*csipb.NodeServiceCapability, error) {
+func (c *csiDriverClient) NodeGetCapabilities(ctx context.Context) ([]*csipb.NodeServiceCapability, error) {
 	glog.V(4).Info(log("calling NodeGetCapabilities rpc"))
 	if err := c.assertConnection(); err != nil {
 		glog.Errorf("%v: failed to assert a connection: %v", csiPluginName, err)

pkg/volume/csi/csi_client_test.go

@@ -17,10 +17,10 @@ limitations under the License.
 package csi
 
 import (
+	"context"
 	"errors"
 	"testing"
 
-	grpctx "golang.org/x/net/context"
 	"google.golang.org/grpc"
 	api "k8s.io/api/core/v1"
 	"k8s.io/kubernetes/pkg/volume/csi/fake"
@@ -60,7 +60,7 @@ func TestClientNodePublishVolume(t *testing.T) {
 		t.Logf("test case: %s", tc.name)
 		client.nodeClient.(*fake.NodeClient).SetNextError(tc.err)
 		err := client.NodePublishVolume(
-			grpctx.Background(),
+			context.Background(),
 			tc.volID,
 			false,
 			"",
@@ -97,7 +97,7 @@ func TestClientNodeUnpublishVolume(t *testing.T) {
 	for _, tc := range testCases {
 		t.Logf("test case: %s", tc.name)
 		client.nodeClient.(*fake.NodeClient).SetNextError(tc.err)
-		err := client.NodeUnpublishVolume(grpctx.Background(), tc.volID, tc.targetPath)
+		err := client.NodeUnpublishVolume(context.Background(), tc.volID, tc.targetPath)
 		if tc.mustFail && err == nil {
 			t.Error("test must fail, but err is nil")
 		}
@@ -127,7 +127,7 @@ func TestClientNodeStageVolume(t *testing.T) {
 		t.Logf("Running test case: %s", tc.name)
 		client.nodeClient.(*fake.NodeClient).SetNextError(tc.err)
 		err := client.NodeStageVolume(
-			grpctx.Background(),
+			context.Background(),
 			tc.volID,
 			map[string]string{"device": "/dev/null"},
 			tc.stagingTargetPath,
@@ -163,7 +163,7 @@ func TestClientNodeUnstageVolume(t *testing.T) {
 		t.Logf("Running test case: %s", tc.name)
 		client.nodeClient.(*fake.NodeClient).SetNextError(tc.err)
 		err := client.NodeUnstageVolume(
-			grpctx.Background(),
+			context.Background(),
 			tc.volID, tc.stagingTargetPath,
 		)
 		if tc.mustFail && err == nil {

pkg/volume/csi/csi_mounter.go

@@ -17,6 +17,7 @@ limitations under the License.
 package csi
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -24,7 +25,7 @@ import (
 	"path"
 
 	"github.com/golang/glog"
-	grpctx "golang.org/x/net/context"
+
 	api "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -118,7 +119,7 @@ func (c *csiMountMgr) SetUpAt(dir string, fsGroup *int64) error {
 	nodeName := string(c.plugin.host.GetNodeName())
 	attachID := getAttachmentName(csiSource.VolumeHandle, csiSource.Driver, nodeName)
 
-	ctx, cancel := grpctx.WithTimeout(grpctx.Background(), csiTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), csiTimeout)
 	defer cancel()
 	// Check for STAGE_UNSTAGE_VOLUME set and populate deviceMountPath if so
 	deviceMountPath := ""
@@ -272,7 +273,7 @@ func (c *csiMountMgr) TearDownAt(dir string) error {
 		c.csiClient = client
 	}
 
-	ctx, cancel := grpctx.WithTimeout(grpctx.Background(), csiTimeout)
+	ctx, cancel := context.WithTimeout(context.Background(), csiTimeout)
 	defer cancel()
 
 	csi := c.csiClient

pkg/volume/csi/fake/BUILD

@@ -7,7 +7,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//vendor/github.com/container-storage-interface/spec/lib/go/csi/v0:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/google.golang.org/grpc:go_default_library",
     ],
 )

pkg/volume/csi/fake/fake_client.go

@@ -24,7 +24,6 @@ import (
 	"google.golang.org/grpc"
 
 	csipb "github.com/container-storage-interface/spec/lib/go/csi/v0"
-	grpctx "golang.org/x/net/context"
 )
 
 // IdentityClient is a CSI identity client used for testing
@@ -94,7 +93,7 @@ func (f *NodeClient) AddNodeStagedVolume(volID, deviceMountPath string) {
 }
 
 // NodePublishVolume implements CSI NodePublishVolume
-func (f *NodeClient) NodePublishVolume(ctx grpctx.Context, req *csipb.NodePublishVolumeRequest, opts ...grpc.CallOption) (*csipb.NodePublishVolumeResponse, error) {
+func (f *NodeClient) NodePublishVolume(ctx context.Context, req *csipb.NodePublishVolumeRequest, opts ...grpc.CallOption) (*csipb.NodePublishVolumeResponse, error) {
 
 	if f.nextErr != nil {
 		return nil, f.nextErr

staging/src/k8s.io/apiserver/pkg/endpoints/request/BUILD

@@ -27,7 +27,6 @@ go_library(
     importpath = "k8s.io/apiserver/pkg/endpoints/request",
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",

staging/src/k8s.io/apiserver/pkg/endpoints/request/context.go

@@ -17,10 +17,10 @@ limitations under the License.
 package request
 
 import (
+	"context"
 	stderrs "errors"
 	"time"
 
-	"golang.org/x/net/context"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apiserver/pkg/apis/audit"

staging/src/k8s.io/apiserver/pkg/registry/generic/registry/BUILD

@@ -57,7 +57,6 @@ go_library(
     importpath = "k8s.io/apiserver/pkg/registry/generic/registry",
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/validation/path:go_default_library",

staging/src/k8s.io/apiserver/pkg/registry/generic/registry/decorated_watcher.go

@@ -17,10 +17,9 @@ limitations under the License.
 package registry
 
 import (
+	"context"
 	"net/http"
 
-	"golang.org/x/net/context"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/watch"
 )

staging/src/k8s.io/apiserver/pkg/storage/BUILD

@@ -49,7 +49,6 @@ go_library(
     importpath = "k8s.io/apiserver/pkg/storage",
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/validation/path:go_default_library",

staging/src/k8s.io/apiserver/pkg/storage/cacher.go

@@ -17,6 +17,7 @@ limitations under the License.
 package storage
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"reflect"
@@ -24,7 +25,6 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"

staging/src/k8s.io/apiserver/pkg/storage/etcd/BUILD

@@ -16,7 +16,6 @@ go_test(
     embed = [":go_default_library"],
     deps = [
         "//vendor/github.com/coreos/etcd/client:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/testing:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -50,7 +49,6 @@ go_library(
     deps = [
         "//vendor/github.com/coreos/etcd/client:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",

staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper.go

@@ -17,6 +17,7 @@ limitations under the License.
 package etcd
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"path"
@@ -25,7 +26,6 @@ import (
 
 	etcd "github.com/coreos/etcd/client"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/conversion"

staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package etcd
 
 import (
+	"context"
 	"fmt"
 	"path"
 	"reflect"
@@ -26,7 +27,6 @@ import (
 	"time"
 
 	etcd "github.com/coreos/etcd/client"
-	"golang.org/x/net/context"
 	apitesting "k8s.io/apimachinery/pkg/api/testing"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"

staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher.go

@@ -17,6 +17,7 @@ limitations under the License.
 package etcd
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"reflect"
@@ -32,7 +33,6 @@ import (
 
 	etcd "github.com/coreos/etcd/client"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 )
 
 // Etcd watch event actions

staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package etcd
 
 import (
+	"context"
 	rt "runtime"
 	"testing"
 
@@ -35,7 +36,6 @@ import (
 	etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
 
 	etcd "github.com/coreos/etcd/client"
-	"golang.org/x/net/context"
 )
 
 var versioner = APIObjectVersioner{}

staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/BUILD

@@ -20,7 +20,6 @@ go_library(
         "//vendor/github.com/coreos/etcd/pkg/transport:go_default_library",
         "//vendor/github.com/coreos/etcd/pkg/types:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/storage/etcd/etcdtest:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing/testingcert:go_default_library",

staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go

@@ -32,6 +32,8 @@ import (
 	"k8s.io/apiserver/pkg/storage/etcd/testing/testingcert"
 	"k8s.io/apiserver/pkg/storage/storagebackend"
 
+	"context"
+
 	etcd "github.com/coreos/etcd/client"
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/etcdserver"
@@ -42,7 +44,6 @@ import (
 	"github.com/coreos/etcd/pkg/transport"
 	"github.com/coreos/etcd/pkg/types"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 )
 
 // EtcdTestServer encapsulates the datastructures needed to start local instance for testing

staging/src/k8s.io/apiserver/pkg/storage/etcd3/BUILD

@@ -19,7 +19,6 @@ go_test(
         "//vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes:go_default_library",
         "//vendor/github.com/coreos/etcd/integration:go_default_library",
         "//vendor/github.com/coreos/pkg/capnslog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/testing:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -54,7 +53,6 @@ go_library(
         "//vendor/github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes:go_default_library",
         "//vendor/github.com/coreos/etcd/mvcc/mvccpb:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",

staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact.go

@@ -17,13 +17,13 @@ limitations under the License.
 package etcd3
 
 import (
+	"context"
 	"strconv"
 	"sync"
 	"time"
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 )
 
 const (

staging/src/k8s.io/apiserver/pkg/storage/etcd3/compact_test.go

@@ -17,12 +17,12 @@ limitations under the License.
 package etcd3
 
 import (
+	"context"
 	"testing"
 
 	"github.com/coreos/etcd/clientv3"
 	etcdrpc "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 	"github.com/coreos/etcd/integration"
-	"golang.org/x/net/context"
 )
 
 func TestCompact(t *testing.T) {

staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go

@@ -18,6 +18,7 @@ package etcd3
 
 import (
 	"bytes"
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"errors"
@@ -29,7 +30,6 @@ import (
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"

staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go

@@ -18,6 +18,7 @@ package etcd3
 
 import (
 	"bytes"
+	"context"
 	"encoding/base64"
 	"encoding/json"
 	"errors"
@@ -30,7 +31,6 @@ import (
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/integration"
 	"github.com/coreos/pkg/capnslog"
-	"golang.org/x/net/context"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	apitesting "k8s.io/apimachinery/pkg/api/testing"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go

@@ -17,6 +17,7 @@ limitations under the License.
 package etcd3
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -32,7 +33,6 @@ import (
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 )
 
 const (

staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package etcd3
 
 import (
+	"context"
 	"fmt"
 	"reflect"
 	"sync"
@@ -25,7 +26,6 @@ import (
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/integration"
-	"golang.org/x/net/context"
 
 	apitesting "k8s.io/apimachinery/pkg/api/testing"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiserver/pkg/storage/interfaces.go

@@ -17,7 +17,8 @@ limitations under the License.
 package storage
 
 import (
-	"golang.org/x/net/context"
+	"context"
+
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"

staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/BUILD

@@ -13,7 +13,6 @@ go_test(
     deps = [
         "//vendor/github.com/coreos/etcd/integration:go_default_library",
         "//vendor/github.com/coreos/etcd/pkg/transport:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/testing:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
@@ -37,7 +36,6 @@ go_library(
         "//vendor/github.com/coreos/etcd/client:go_default_library",
         "//vendor/github.com/coreos/etcd/clientv3:go_default_library",
         "//vendor/github.com/coreos/etcd/pkg/transport:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/storage:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/storage/etcd:go_default_library",

staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go

@@ -17,11 +17,11 @@ limitations under the License.
 package factory
 
 import (
+	"context"
 	"time"
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/pkg/transport"
-	"golang.org/x/net/context"
 
 	"k8s.io/apiserver/pkg/storage"
 	"k8s.io/apiserver/pkg/storage/etcd3"

staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package factory
 
 import (
+	"context"
 	"io/ioutil"
 	"os"
 	"path"
@@ -25,7 +26,6 @@ import (
 
 	"github.com/coreos/etcd/integration"
 	"github.com/coreos/etcd/pkg/transport"
-	"golang.org/x/net/context"
 
 	apitesting "k8s.io/apimachinery/pkg/api/testing"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

staging/src/k8s.io/apiserver/pkg/storage/testing/BUILD

@@ -15,7 +15,6 @@ go_library(
     ],
     importpath = "k8s.io/apiserver/pkg/storage/testing",
     deps = [
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",

staging/src/k8s.io/apiserver/pkg/storage/testing/utils.go

@@ -17,9 +17,9 @@ limitations under the License.
 package testing
 
 import (
+	"context"
 	"path"
 
-	"golang.org/x/net/context"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apiserver/pkg/storage"

staging/src/k8s.io/apiserver/pkg/storage/tests/BUILD

@@ -11,7 +11,6 @@ go_test(
     srcs = ["cacher_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",

staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package tests
 
 import (
+	"context"
 	"fmt"
 	"reflect"
 	goruntime "runtime"
@@ -32,6 +33,7 @@ import (
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/watch"
@@ -43,10 +45,6 @@ import (
 	etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing"
 	"k8s.io/apiserver/pkg/storage/etcd3"
 	"k8s.io/apiserver/pkg/storage/value"
-
-	"golang.org/x/net/context"
-
-	"k8s.io/apimachinery/pkg/runtime/serializer"
 )
 
 var (

staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/BUILD

@@ -16,7 +16,6 @@ go_library(
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/hashicorp/golang-lru:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/google.golang.org/grpc:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/storage/value:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library",

staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go

@@ -18,6 +18,7 @@ limitations under the License.
 package envelope
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"net/url"
@@ -27,8 +28,6 @@ import (
 
 	"google.golang.org/grpc"
 
-	"golang.org/x/net/context"
-
 	kmsapi "k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1"
 )
 

staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp/BUILD

@@ -19,7 +19,6 @@ go_library(
     importpath = "k8s.io/client-go/plugin/pkg/client/auth/gcp",
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/golang.org/x/oauth2:go_default_library",
         "//vendor/golang.org/x/oauth2/google:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",

staging/src/k8s.io/client-go/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"

staging/src/k8s.io/client-go/tools/cache/BUILD

@@ -64,7 +64,6 @@ go_library(
     importpath = "k8s.io/client-go/tools/cache",
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

staging/src/k8s.io/client-go/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"

staging/src/k8s.io/client-go/tools/pager/BUILD

@@ -11,7 +11,6 @@ go_library(
     srcs = ["pager.go"],
     importpath = "k8s.io/client-go/tools/pager",
     deps = [
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library",
@@ -39,7 +38,6 @@ go_test(
     srcs = ["pager_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

staging/src/k8s.io/client-go/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"

staging/src/k8s.io/client-go/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"