Merge pull request #1113 from elezar/use-stdlib-context

Switch to context package in go stdlib
NVIDIA · Jan 9, 2025 · 61887fe · 61887fe
2 parents 06701cd + c3be751
commit 61887fe
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 560 deletions.
diff --git a/go.mod b/go.mod
@@ -16,7 +16,6 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/urfave/cli/v2 v2.27.5
 	golang.org/x/mod v0.22.0
-	golang.org/x/net v0.34.0
 	google.golang.org/grpc v1.65.0
 	k8s.io/api v0.31.3
 	k8s.io/apimachinery v0.31.3
@@ -64,6 +63,7 @@ require (
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
+	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/oauth2 v0.21.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/term v0.28.0 // indirect

diff --git a/internal/plugin/server.go b/internal/plugin/server.go
@@ -17,6 +17,7 @@
 package plugin
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net"
@@ -34,7 +35,6 @@ import (
 	"github.com/NVIDIA/k8s-device-plugin/internal/rm"
 
 	"github.com/google/uuid"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 

diff --git a/vendor/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go
diff --git a/vendor/golang.org/x/net/context/go17.go b/vendor/golang.org/x/net/context/go17.go
diff --git a/vendor/golang.org/x/net/context/go19.go b/vendor/golang.org/x/net/context/go19.go