From 108d1eee5dbb35319558258cafa0152d58b83ee8 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 9 Apr 2020 10:19:27 -0400 Subject: [PATCH] Replace deprecated x/net/context with context It's not x-perimental any more! --- dnsprovider/pkg/dnsprovider/providers/coredns/BUILD.bazel | 1 - dnsprovider/pkg/dnsprovider/providers/coredns/rrchangeset.go | 2 +- dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go | 2 +- .../pkg/dnsprovider/providers/coredns/stubs/BUILD.bazel | 5 +---- .../pkg/dnsprovider/providers/coredns/stubs/corednsapi.go | 2 +- protokube/pkg/protokube/BUILD.bazel | 1 - protokube/pkg/protokube/gce_volume.go | 2 +- upup/pkg/fi/assettasks/BUILD.bazel | 1 - upup/pkg/fi/assettasks/docker_api.go | 2 +- upup/pkg/fi/cloudup/gce/BUILD.bazel | 1 - upup/pkg/fi/cloudup/gce/gce_cloud.go | 2 +- upup/pkg/fi/cloudup/gce/instancegroups.go | 2 +- upup/pkg/fi/cloudup/gce/network.go | 2 +- upup/pkg/fi/cloudup/gce/wrappers.go | 2 +- util/pkg/vfs/BUILD.bazel | 1 - util/pkg/vfs/context.go | 2 +- util/pkg/vfs/gsfs.go | 2 +- 17 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/BUILD.bazel b/dnsprovider/pkg/dnsprovider/providers/coredns/BUILD.bazel index 72a2f18d85..e593ec6e7d 100644 --- a/dnsprovider/pkg/dnsprovider/providers/coredns/BUILD.bazel +++ b/dnsprovider/pkg/dnsprovider/providers/coredns/BUILD.bazel @@ -19,7 +19,6 @@ go_library( "//dnsprovider/pkg/dnsprovider/rrstype:go_default_library", "//vendor/github.com/coreos/etcd/client:go_default_library", "//vendor/github.com/miekg/coredns/middleware/etcd/msg:go_default_library", - "//vendor/golang.org/x/net/context:go_default_library", "//vendor/gopkg.in/gcfg.v1:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/rrchangeset.go b/dnsprovider/pkg/dnsprovider/providers/coredns/rrchangeset.go index 4cf1e754f9..60902024bc 100644 --- a/dnsprovider/pkg/dnsprovider/providers/coredns/rrchangeset.go +++ b/dnsprovider/pkg/dnsprovider/providers/coredns/rrchangeset.go @@ -17,13 +17,13 @@ limitations under the License. package coredns import ( + "context" "encoding/json" "fmt" "hash/fnv" etcdc "github.com/coreos/etcd/client" dnsmsg "github.com/miekg/coredns/middleware/etcd/msg" - "golang.org/x/net/context" "k8s.io/kops/dnsprovider/pkg/dnsprovider" ) diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go b/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go index 85f898eadc..444c1159b0 100644 --- a/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go +++ b/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go @@ -17,13 +17,13 @@ limitations under the License. package coredns import ( + "context" "encoding/json" "fmt" "net" 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/BUILD.bazel b/dnsprovider/pkg/dnsprovider/providers/coredns/stubs/BUILD.bazel index 753112bcf5..bedf1601d9 100644 --- a/dnsprovider/pkg/dnsprovider/providers/coredns/stubs/BUILD.bazel +++ b/dnsprovider/pkg/dnsprovider/providers/coredns/stubs/BUILD.bazel @@ -5,8 +5,5 @@ go_library( srcs = ["corednsapi.go"], importpath = "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/coredns/stubs", visibility = ["//visibility:public"], - deps = [ - "//vendor/github.com/coreos/etcd/client:go_default_library", - "//vendor/golang.org/x/net/context:go_default_library", - ], + deps = ["//vendor/github.com/coreos/etcd/client:go_default_library"], ) diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/stubs/corednsapi.go b/dnsprovider/pkg/dnsprovider/providers/coredns/stubs/corednsapi.go index c64478870d..a2b94ff3a4 100644 --- a/dnsprovider/pkg/dnsprovider/providers/coredns/stubs/corednsapi.go +++ b/dnsprovider/pkg/dnsprovider/providers/coredns/stubs/corednsapi.go @@ -18,10 +18,10 @@ limitations under the License. package stubs import ( + "context" "strings" etcd "github.com/coreos/etcd/client" - "golang.org/x/net/context" ) // Compile time check for interface conformance diff --git a/protokube/pkg/protokube/BUILD.bazel b/protokube/pkg/protokube/BUILD.bazel index 1ec3f3a151..78e7e7f9d1 100644 --- a/protokube/pkg/protokube/BUILD.bazel +++ b/protokube/pkg/protokube/BUILD.bazel @@ -61,7 +61,6 @@ go_library( "//vendor/github.com/digitalocean/godo:go_default_library", "//vendor/github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes:go_default_library", "//vendor/github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/volumeattach:go_default_library", - "//vendor/golang.org/x/net/context:go_default_library", "//vendor/google.golang.org/api/compute/v0.beta:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/rbac/v1beta1:go_default_library", diff --git a/protokube/pkg/protokube/gce_volume.go b/protokube/pkg/protokube/gce_volume.go index cf63b71407..d1bd47bf2a 100644 --- a/protokube/pkg/protokube/gce_volume.go +++ b/protokube/pkg/protokube/gce_volume.go @@ -17,13 +17,13 @@ limitations under the License. package protokube import ( + "context" "fmt" "net" "os" "strings" "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/BUILD.bazel b/upup/pkg/fi/assettasks/BUILD.bazel index 61a1b4dbb5..fe095da205 100644 --- a/upup/pkg/fi/assettasks/BUILD.bazel +++ b/upup/pkg/fi/assettasks/BUILD.bazel @@ -19,7 +19,6 @@ go_library( "//util/pkg/vfs:go_default_library", "//vendor/github.com/docker/engine-api/client:go_default_library", "//vendor/github.com/docker/engine-api/types:go_default_library", - "//vendor/golang.org/x/net/context:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], ) diff --git a/upup/pkg/fi/assettasks/docker_api.go b/upup/pkg/fi/assettasks/docker_api.go index 75c5e7def6..5befbed0b8 100644 --- a/upup/pkg/fi/assettasks/docker_api.go +++ b/upup/pkg/fi/assettasks/docker_api.go @@ -17,11 +17,11 @@ limitations under the License. package assettasks import ( + "context" "fmt" "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/BUILD.bazel b/upup/pkg/fi/cloudup/gce/BUILD.bazel index 821b56dbbf..1c3a7266f4 100644 --- a/upup/pkg/fi/cloudup/gce/BUILD.bazel +++ b/upup/pkg/fi/cloudup/gce/BUILD.bazel @@ -24,7 +24,6 @@ go_library( "//pkg/cloudinstances:go_default_library", "//protokube/pkg/etcd:go_default_library", "//upup/pkg/fi:go_default_library", - "//vendor/golang.org/x/net/context:go_default_library", "//vendor/golang.org/x/oauth2/google:go_default_library", "//vendor/google.golang.org/api/compute/v0.beta:go_default_library", "//vendor/google.golang.org/api/dns/v1:go_default_library", diff --git a/upup/pkg/fi/cloudup/gce/gce_cloud.go b/upup/pkg/fi/cloudup/gce/gce_cloud.go index 7d565a001d..06ccb38a31 100644 --- a/upup/pkg/fi/cloudup/gce/gce_cloud.go +++ b/upup/pkg/fi/cloudup/gce/gce_cloud.go @@ -18,12 +18,12 @@ package gce import ( "bytes" + "context" "fmt" "os" "os/exec" "strings" - "golang.org/x/net/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 index 17daadcc7e..7d66734f48 100644 --- a/upup/pkg/fi/cloudup/gce/instancegroups.go +++ b/upup/pkg/fi/cloudup/gce/instancegroups.go @@ -17,12 +17,12 @@ limitations under the License. package gce import ( + "context" "encoding/base32" "fmt" "hash/fnv" "strings" - 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 index 54e13849e2..a6a78d83bc 100644 --- a/upup/pkg/fi/cloudup/gce/network.go +++ b/upup/pkg/fi/cloudup/gce/network.go @@ -17,11 +17,11 @@ limitations under the License. package gce import ( + "context" "encoding/binary" "fmt" "net" - context "golang.org/x/net/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 index 3ff7410cc3..9bf91af0e5 100644 --- a/upup/pkg/fi/cloudup/gce/wrappers.go +++ b/upup/pkg/fi/cloudup/gce/wrappers.go @@ -17,9 +17,9 @@ limitations under the License. package gce import ( + "context" "fmt" - context "golang.org/x/net/context" compute "google.golang.org/api/compute/v0.beta" "k8s.io/klog" ) diff --git a/util/pkg/vfs/BUILD.bazel b/util/pkg/vfs/BUILD.bazel index 9931d423b8..7e758cc637 100644 --- a/util/pkg/vfs/BUILD.bazel +++ b/util/pkg/vfs/BUILD.bazel @@ -43,7 +43,6 @@ go_library( "//vendor/github.com/gophercloud/gophercloud/pagination:go_default_library", "//vendor/github.com/pkg/sftp:go_default_library", "//vendor/golang.org/x/crypto/ssh:go_default_library", - "//vendor/golang.org/x/net/context:go_default_library", "//vendor/google.golang.org/api/googleapi:go_default_library", "//vendor/google.golang.org/api/option:go_default_library", "//vendor/google.golang.org/api/storage/v1:go_default_library", diff --git a/util/pkg/vfs/context.go b/util/pkg/vfs/context.go index d57852f1c7..0dbb48a173 100644 --- a/util/pkg/vfs/context.go +++ b/util/pkg/vfs/context.go @@ -17,6 +17,7 @@ limitations under the License. package vfs import ( + "context" "fmt" "io/ioutil" "net/http" @@ -28,7 +29,6 @@ import ( "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 index 712bbaa8b3..f23b1c8d1a 100644 --- a/util/pkg/vfs/gsfs.go +++ b/util/pkg/vfs/gsfs.go @@ -18,6 +18,7 @@ package vfs import ( "bytes" + "context" "encoding/base64" "fmt" "io" @@ -28,7 +29,6 @@ import ( "sync" "time" - "golang.org/x/net/context" "google.golang.org/api/googleapi" storage "google.golang.org/api/storage/v1" "k8s.io/apimachinery/pkg/util/wait"