From 06246ea18bc6faaa1b22affac4774623cbc0a6f6 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Tue, 10 Feb 2026 11:04:28 +0000 Subject: [PATCH] csi-kata-directvolume: Remove usage of golang.org/x/net/context This packages is deprecated, so use the standard library context package instead Signed-off-by: stevenhorsman --- .../csi-kata-directvolume/pkg/directvolume/controllerserver.go | 2 +- .../pkg/directvolume/controllerserver_test.go | 2 +- .../csi-kata-directvolume/pkg/directvolume/identityserver.go | 3 ++- src/tools/csi-kata-directvolume/pkg/directvolume/nodeserver.go | 2 +- .../csi-kata-directvolume/pkg/directvolume/nodeserver_test.go | 2 +- src/tools/csi-kata-directvolume/pkg/directvolume/server.go | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/tools/csi-kata-directvolume/pkg/directvolume/controllerserver.go b/src/tools/csi-kata-directvolume/pkg/directvolume/controllerserver.go index 28fbdf1087..49bef11af5 100644 --- a/src/tools/csi-kata-directvolume/pkg/directvolume/controllerserver.go +++ b/src/tools/csi-kata-directvolume/pkg/directvolume/controllerserver.go @@ -8,13 +8,13 @@ package directvolume import ( + "context" "fmt" "os" "strings" "github.com/golang/protobuf/ptypes/wrappers" "github.com/pborman/uuid" - "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/src/tools/csi-kata-directvolume/pkg/directvolume/controllerserver_test.go b/src/tools/csi-kata-directvolume/pkg/directvolume/controllerserver_test.go index 453d5a95bf..7b7f8bafa0 100644 --- a/src/tools/csi-kata-directvolume/pkg/directvolume/controllerserver_test.go +++ b/src/tools/csi-kata-directvolume/pkg/directvolume/controllerserver_test.go @@ -6,13 +6,13 @@ package directvolume import ( + "context" "os" "path/filepath" "testing" csi "github.com/container-storage-interface/spec/lib/go/csi" "github.com/stretchr/testify/require" - "golang.org/x/net/context" "kata-containers/csi-kata-directvolume/pkg/spdkrpc" "kata-containers/csi-kata-directvolume/pkg/utils" diff --git a/src/tools/csi-kata-directvolume/pkg/directvolume/identityserver.go b/src/tools/csi-kata-directvolume/pkg/directvolume/identityserver.go index 7acd2d7b99..bbf0705c49 100644 --- a/src/tools/csi-kata-directvolume/pkg/directvolume/identityserver.go +++ b/src/tools/csi-kata-directvolume/pkg/directvolume/identityserver.go @@ -8,8 +8,9 @@ package directvolume import ( + "context" + "github.com/container-storage-interface/spec/lib/go/csi" - "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/klog/v2" diff --git a/src/tools/csi-kata-directvolume/pkg/directvolume/nodeserver.go b/src/tools/csi-kata-directvolume/pkg/directvolume/nodeserver.go index 77c9338690..b673025ce3 100644 --- a/src/tools/csi-kata-directvolume/pkg/directvolume/nodeserver.go +++ b/src/tools/csi-kata-directvolume/pkg/directvolume/nodeserver.go @@ -8,6 +8,7 @@ package directvolume import ( + "context" "fmt" "os" "path/filepath" @@ -17,7 +18,6 @@ import ( "kata-containers/csi-kata-directvolume/pkg/utils" "github.com/container-storage-interface/spec/lib/go/csi" - "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/klog/v2" diff --git a/src/tools/csi-kata-directvolume/pkg/directvolume/nodeserver_test.go b/src/tools/csi-kata-directvolume/pkg/directvolume/nodeserver_test.go index 99bf69e974..6ccca2d93d 100644 --- a/src/tools/csi-kata-directvolume/pkg/directvolume/nodeserver_test.go +++ b/src/tools/csi-kata-directvolume/pkg/directvolume/nodeserver_test.go @@ -6,6 +6,7 @@ package directvolume import ( + "context" "os" "path/filepath" "strings" @@ -13,7 +14,6 @@ import ( csi "github.com/container-storage-interface/spec/lib/go/csi" "github.com/stretchr/testify/require" - "golang.org/x/net/context" "kata-containers/csi-kata-directvolume/pkg/spdkrpc" "kata-containers/csi-kata-directvolume/pkg/utils" diff --git a/src/tools/csi-kata-directvolume/pkg/directvolume/server.go b/src/tools/csi-kata-directvolume/pkg/directvolume/server.go index 1bf3fb8ad0..cf870c817a 100644 --- a/src/tools/csi-kata-directvolume/pkg/directvolume/server.go +++ b/src/tools/csi-kata-directvolume/pkg/directvolume/server.go @@ -8,9 +8,9 @@ package directvolume import ( + "context" "sync" - "golang.org/x/net/context" "google.golang.org/grpc" "k8s.io/klog/v2"