From f74d6bc86b80696565a2d4d9d8273449f55ba9e0 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 1 Nov 2024 09:32:39 -0400 Subject: [PATCH] Remove incorrect usage of golang.org/x/net/context Signed-off-by: Davanum Srinivas --- test/e2e/storage/drivers/csi-test/mock/service/controller.go | 2 +- test/e2e/storage/drivers/csi-test/mock/service/identity.go | 2 +- test/e2e/storage/drivers/csi-test/mock/service/node.go | 3 +-- test/e2e/storage/drivers/csi-test/mock/service/service.go | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/test/e2e/storage/drivers/csi-test/mock/service/controller.go b/test/e2e/storage/drivers/csi-test/mock/service/controller.go index 42b13159a2d..07d0f2abf95 100644 --- a/test/e2e/storage/drivers/csi-test/mock/service/controller.go +++ b/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" diff --git a/test/e2e/storage/drivers/csi-test/mock/service/identity.go b/test/e2e/storage/drivers/csi-test/mock/service/identity.go index 2f375e79679..d4f5b3eec23 100644 --- a/test/e2e/storage/drivers/csi-test/mock/service/identity.go +++ b/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" diff --git a/test/e2e/storage/drivers/csi-test/mock/service/node.go b/test/e2e/storage/drivers/csi-test/mock/service/node.go index 73dab9469b2..115e7d8f5f7 100644 --- a/test/e2e/storage/drivers/csi-test/mock/service/node.go +++ b/test/e2e/storage/drivers/csi-test/mock/service/node.go @@ -17,6 +17,7 @@ limitations under the License. package service import ( + "context" "fmt" "path" "strconv" @@ -24,8 +25,6 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "golang.org/x/net/context" - "github.com/container-storage-interface/spec/lib/go/csi" ) diff --git a/test/e2e/storage/drivers/csi-test/mock/service/service.go b/test/e2e/storage/drivers/csi-test/mock/service/service.go index 17ad811ca74..2c0928c11a8 100644 --- a/test/e2e/storage/drivers/csi-test/mock/service/service.go +++ b/test/e2e/storage/drivers/csi-test/mock/service/service.go @@ -17,6 +17,7 @@ limitations under the License. package service import ( + "context" "fmt" "os" "strings" @@ -24,7 +25,6 @@ import ( "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"