From 3af364e7b5eff71568e3049edffa579fe1b51603 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Sat, 24 Aug 2019 14:44:15 +0530 Subject: [PATCH] move to statand context package Signed-off-by: Madhu Rajanna --- Gopkg.lock | 1 - pkg/cephfs/controllerserver.go | 3 ++- pkg/csi-common/controllerserver-default.go | 3 ++- pkg/csi-common/identityserver-default.go | 3 ++- pkg/csi-common/nodeserver-default.go | 3 ++- pkg/csi-common/utils.go | 2 +- pkg/rbd/controllerserver.go | 2 +- pkg/rbd/nodeserver.go | 2 +- pkg/rbd/rbd_journal.go | 2 +- pkg/rbd/rbd_util.go | 2 +- 10 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index c66fd904c..7991c1cd3 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1357,7 +1357,6 @@ "github.com/pkg/errors", "github.com/prometheus/client_golang/prometheus", "github.com/prometheus/client_golang/prometheus/promhttp", - "golang.org/x/net/context", "google.golang.org/grpc", "google.golang.org/grpc/codes", "google.golang.org/grpc/status", diff --git a/pkg/cephfs/controllerserver.go b/pkg/cephfs/controllerserver.go index 40e503719..12661ceb8 100644 --- a/pkg/cephfs/controllerserver.go +++ b/pkg/cephfs/controllerserver.go @@ -17,11 +17,12 @@ limitations under the License. package cephfs import ( + "context" + csicommon "github.com/ceph/ceph-csi/pkg/csi-common" "github.com/ceph/ceph-csi/pkg/util" "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" diff --git a/pkg/csi-common/controllerserver-default.go b/pkg/csi-common/controllerserver-default.go index a232858be..710fda1b3 100644 --- a/pkg/csi-common/controllerserver-default.go +++ b/pkg/csi-common/controllerserver-default.go @@ -17,8 +17,9 @@ limitations under the License. package csicommon 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" diff --git a/pkg/csi-common/identityserver-default.go b/pkg/csi-common/identityserver-default.go index a206836ae..2e4501ed4 100644 --- a/pkg/csi-common/identityserver-default.go +++ b/pkg/csi-common/identityserver-default.go @@ -17,8 +17,9 @@ limitations under the License. package csicommon 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" diff --git a/pkg/csi-common/nodeserver-default.go b/pkg/csi-common/nodeserver-default.go index 79128f133..3ef488756 100644 --- a/pkg/csi-common/nodeserver-default.go +++ b/pkg/csi-common/nodeserver-default.go @@ -22,9 +22,10 @@ import ( "github.com/ceph/ceph-csi/pkg/util" + "context" + "github.com/container-storage-interface/spec/lib/go/csi" csipbv1 "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" diff --git a/pkg/csi-common/utils.go b/pkg/csi-common/utils.go index 78fdc836f..285c0dba3 100644 --- a/pkg/csi-common/utils.go +++ b/pkg/csi-common/utils.go @@ -17,6 +17,7 @@ limitations under the License. package csicommon import ( + "context" "fmt" "runtime/debug" "strings" @@ -25,7 +26,6 @@ import ( "github.com/ceph/ceph-csi/pkg/util" "github.com/container-storage-interface/spec/lib/go/csi" "github.com/kubernetes-csi/csi-lib-utils/protosanitizer" - "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/pkg/rbd/controllerserver.go b/pkg/rbd/controllerserver.go index 1c7fc1577..ba45656fd 100644 --- a/pkg/rbd/controllerserver.go +++ b/pkg/rbd/controllerserver.go @@ -17,6 +17,7 @@ limitations under the License. package rbd import ( + "context" "fmt" csicommon "github.com/ceph/ceph-csi/pkg/csi-common" @@ -24,7 +25,6 @@ import ( "github.com/container-storage-interface/spec/lib/go/csi" "github.com/kubernetes-csi/csi-lib-utils/protosanitizer" - "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "k8s.io/klog" diff --git a/pkg/rbd/nodeserver.go b/pkg/rbd/nodeserver.go index 20d78dd1b..2f2df3a3d 100644 --- a/pkg/rbd/nodeserver.go +++ b/pkg/rbd/nodeserver.go @@ -17,6 +17,7 @@ limitations under the License. package rbd import ( + "context" "fmt" "os" "strings" @@ -25,7 +26,6 @@ import ( "github.com/ceph/ceph-csi/pkg/util" "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" diff --git a/pkg/rbd/rbd_journal.go b/pkg/rbd/rbd_journal.go index 4df489b41..fcd350a00 100644 --- a/pkg/rbd/rbd_journal.go +++ b/pkg/rbd/rbd_journal.go @@ -17,10 +17,10 @@ limitations under the License. package rbd import ( + "context" "fmt" "github.com/ceph/ceph-csi/pkg/util" - "golang.org/x/net/context" "github.com/pkg/errors" "k8s.io/klog" diff --git a/pkg/rbd/rbd_util.go b/pkg/rbd/rbd_util.go index b36f8fbd8..0db9f1f0a 100644 --- a/pkg/rbd/rbd_util.go +++ b/pkg/rbd/rbd_util.go @@ -17,6 +17,7 @@ limitations under the License. package rbd import ( + "context" "encoding/json" "fmt" "io/ioutil" @@ -27,7 +28,6 @@ import ( "time" "github.com/ceph/ceph-csi/pkg/util" - "golang.org/x/net/context" "github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes/timestamp"