Replace "golang.org/x/net/context" with "context"

Kubernetes-commit: 70e45eccf27726f0e63dd1024924ccc7e2cd35a0
This commit is contained in:
hzxuzhonghu 2018-02-28 12:20:22 +08:00 committed by Kubernetes Publisher
parent 30089d3674
commit 1e55c20903
4 changed files with 4 additions and 6 deletions

View File

@ -18,6 +18,7 @@ package gcp
import ( import (
"bytes" "bytes"
"context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"net/http" "net/http"
@ -27,7 +28,6 @@ import (
"time" "time"
"github.com/golang/glog" "github.com/golang/glog"
"golang.org/x/net/context"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"golang.org/x/oauth2/google" "golang.org/x/oauth2/google"
"k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/net"

View File

@ -17,10 +17,9 @@ limitations under the License.
package cache package cache
import ( import (
"context"
"time" "time"
"golang.org/x/net/context"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/fields"

View File

@ -17,10 +17,9 @@ limitations under the License.
package pager package pager
import ( import (
"context"
"fmt" "fmt"
"golang.org/x/net/context"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"
metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"

View File

@ -17,11 +17,11 @@ limitations under the License.
package pager package pager
import ( import (
"context"
"fmt" "fmt"
"reflect" "reflect"
"testing" "testing"
"golang.org/x/net/context"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"