Merge pull request kubernetes#128490 from dims/remove-incorrect-usage-of-golang.org/x/net/context

Remove incorrect usage of golang.org/x/net/context

Author: k8s-ci-robot

test/e2e/storage/drivers/csi-test/mock/service/controller.go

@@ -17,13 +17,13 @@ limitations under the License.
 package service
 
 import (
+	"context"
 	"fmt"
 	"path"
 	"reflect"
 	"strconv"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 

test/e2e/storage/drivers/csi-test/mock/service/identity.go

@@ -17,7 +17,7 @@ limitations under the License.
 package service
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/golang/protobuf/ptypes/wrappers"

test/e2e/storage/drivers/csi-test/mock/service/node.go

@@ -17,15 +17,14 @@ limitations under the License.
 package service
 
 import (
+	"context"
 	"fmt"
 	"path"
 	"strconv"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"golang.org/x/net/context"
-
 	"github.com/container-storage-interface/spec/lib/go/csi"
 )
 

test/e2e/storage/drivers/csi-test/mock/service/service.go

@@ -17,14 +17,14 @@ limitations under the License.
 package service
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"strings"
 	"sync"
 	"sync/atomic"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"k8s.io/kubernetes/test/e2e/storage/drivers/csi-test/mock/cache"