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

Remove incorrect usage of golang.org/x/net/context
This commit is contained in:
Kubernetes Prow Robot 2024-11-01 21:09:26 +00:00 committed by GitHub
commit 1890157a6c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 5 deletions

View File

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

View File

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

View File

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

View File

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