Replace deprecated x/net/context with context

It's not x-perimental any more!
kubernetes · Apr 9, 2020 · c987b8a · c987b8a
1 parent 17d31ee
commit c987b8a
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 16 deletions.
diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/rrchangeset.go b/dnsprovider/pkg/dnsprovider/providers/coredns/rrchangeset.go
@@ -20,6 +20,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"hash/fnv"
+	"context"
 
 	etcdc "github.com/coreos/etcd/client"
 	dnsmsg "github.com/miekg/coredns/middleware/etcd/msg"

diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go b/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go
@@ -20,10 +20,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
+	"context"
 
 	etcdc "github.com/coreos/etcd/client"
 	dnsmsg "github.com/miekg/coredns/middleware/etcd/msg"
-	"golang.org/x/net/context"
 	"k8s.io/klog"
 	"k8s.io/kops/dnsprovider/pkg/dnsprovider"
 	"k8s.io/kops/dnsprovider/pkg/dnsprovider/rrstype"

diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/stubs/corednsapi.go b/dnsprovider/pkg/dnsprovider/providers/coredns/stubs/corednsapi.go
@@ -19,9 +19,9 @@ package stubs
 
 import (
 	"strings"
+	"context"
 
 	etcd "github.com/coreos/etcd/client"
-	"golang.org/x/net/context"
 )
 
 // Compile time check for interface conformance

diff --git a/protokube/pkg/protokube/gce_volume.go b/protokube/pkg/protokube/gce_volume.go
@@ -21,9 +21,9 @@ import (
 	"net"
 	"os"
 	"strings"
-
+	"context"
+
 	"cloud.google.com/go/compute/metadata"
-	"golang.org/x/net/context"
 	compute "google.golang.org/api/compute/v0.beta"
 	"k8s.io/klog"
 	"k8s.io/kops/protokube/pkg/etcd"

diff --git a/upup/pkg/fi/assettasks/docker_api.go b/upup/pkg/fi/assettasks/docker_api.go
@@ -18,10 +18,10 @@ package assettasks
 
 import (
 	"fmt"
-
+	"context"
+
 	"github.com/docker/engine-api/client"
 	"github.com/docker/engine-api/types"
-	"golang.org/x/net/context"
 	"k8s.io/klog"
 )
 

diff --git a/upup/pkg/fi/cloudup/gce/gce_cloud.go b/upup/pkg/fi/cloudup/gce/gce_cloud.go
@@ -22,8 +22,8 @@ import (
 	"os"
 	"os/exec"
 	"strings"
-
-	"golang.org/x/net/context"
+	"context"
+
 	"golang.org/x/oauth2/google"
 	compute "google.golang.org/api/compute/v0.beta"
 	"google.golang.org/api/dns/v1"

diff --git a/upup/pkg/fi/cloudup/gce/instancegroups.go b/upup/pkg/fi/cloudup/gce/instancegroups.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"hash/fnv"
 	"strings"
+	"context"
 
-	context "golang.org/x/net/context"
 	compute "google.golang.org/api/compute/v0.beta"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/klog"

diff --git a/upup/pkg/fi/cloudup/gce/network.go b/upup/pkg/fi/cloudup/gce/network.go
@@ -20,8 +20,8 @@ import (
 	"encoding/binary"
 	"fmt"
 	"net"
-
-	context "golang.org/x/net/context"
+	"context"
+
 	compute "google.golang.org/api/compute/v0.beta"
 	"k8s.io/klog"
 	"k8s.io/kops/pkg/apis/kops"

diff --git a/upup/pkg/fi/cloudup/gce/wrappers.go b/upup/pkg/fi/cloudup/gce/wrappers.go
@@ -18,8 +18,8 @@ package gce
 
 import (
 	"fmt"
-
-	context "golang.org/x/net/context"
+	"context"
+
 	compute "google.golang.org/api/compute/v0.beta"
 	"k8s.io/klog"
 )

diff --git a/util/pkg/vfs/context.go b/util/pkg/vfs/context.go
@@ -25,10 +25,10 @@ import (
 	"strings"
 	"sync"
 	"time"
+	"context"
 
 	"github.com/denverdino/aliyungo/oss"
 	"github.com/gophercloud/gophercloud"
-	"golang.org/x/net/context"
 	"google.golang.org/api/option"
 	storage "google.golang.org/api/storage/v1"
 	"k8s.io/apimachinery/pkg/util/wait"

diff --git a/util/pkg/vfs/gsfs.go b/util/pkg/vfs/gsfs.go
@@ -27,8 +27,8 @@ import (
 	"strings"
 	"sync"
 	"time"
-
-	"golang.org/x/net/context"
+	"context"
+
 	"google.golang.org/api/googleapi"
 	storage "google.golang.org/api/storage/v1"
 	"k8s.io/apimachinery/pkg/util/wait"