Replace deprecated x/net/context with context

It's not x-perimental any more!
This commit is contained in:
Justin Santa Barbara 2020-04-09 10:19:27 -04:00
parent 17d31ee6a6
commit 108d1eee5d
17 changed files with 12 additions and 20 deletions

View File

@ -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",
],

View File

@ -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"
)

View File

@ -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"

View File

@ -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"],
)

View File

@ -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

View File

@ -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",

View File

@ -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"

View File

@ -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",
],
)

View File

@ -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"
)

View File

@ -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",

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"
)

View File

@ -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",

View File

@ -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"

View File

@ -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"