diff options
author | 2018-01-03 19:11:28 +0800 | |
---|---|---|
committer | 2018-01-03 11:11:28 +0000 | |
commit | 7fe5b0bb1f34735859d611e170fa8709adac73ea (patch) | |
tree | 9757c7e2a724a0e1ed885ef7bca470c56075e4a6 /Gopkg.lock | |
parent | bce7f5fbecbc68950dfb2b96b5f85d03a8bf07eb (diff) | |
download | coredns-7fe5b0bb1f34735859d611e170fa8709adac73ea.tar.gz coredns-7fe5b0bb1f34735859d611e170fa8709adac73ea.tar.zst coredns-7fe5b0bb1f34735859d611e170fa8709adac73ea.zip |
Update k8s client-go to v6.0.0 (#1340)
* Update k8s client-go to v6.0.0
This fix updates k8s client-go to v6.0.0 as CoreDNS is supported
in 1.9 and v6.0.0 is the recommended version.
There are quite some massive changes that need to be made:
1. k8s.io/client-go/pkg/api/v1 has been changed to k8s.io/api/v1 (repo changed from `client-go` to `api`)
2. kubernetes.Clientset adds one extra layer, so that `kubernetes.Clientset.Services()` and like has been changed to `kubernetes.Clientset.CoreV1().Services()`
Also, we have to stick with specific commits of `k8s.io/apimachinery` and the newly introduced `k8s.io/api`
because go dep still could not figure out the right version to fetch.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
* Update vendor with `dep ensure --update` and `dep prune`
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Diffstat (limited to 'Gopkg.lock')
-rw-r--r-- | Gopkg.lock | 353 |
1 files changed, 272 insertions, 81 deletions
diff --git a/Gopkg.lock b/Gopkg.lock index 29a68515c..8db43421e 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -26,16 +26,16 @@ version = "0.11.0" [[projects]] - name = "github.com/asaskevich/govalidator" - packages = ["."] - revision = "521b25f4b05fd26bec69d9dedeb8f9c9a83939a8" - version = "v8" - -[[projects]] name = "github.com/coreos/etcd" - packages = ["client","pkg/pathutil","pkg/srv","pkg/types","version"] - revision = "1e1dbb23924672c6cd72c62ee0db2b45f778da71" - version = "v3.2.11" + packages = [ + "client", + "pkg/pathutil", + "pkg/srv", + "pkg/types", + "version" + ] + revision = "8c43bc2c1ea98b535b652426a9b0f4344fcbda68" + version = "v3.2.13" [[projects]] name = "github.com/coreos/go-semver" @@ -56,12 +56,6 @@ revision = "2cf77a2b5e11ac8d0ba3892772ac8e1f7b528344" [[projects]] - name = "github.com/docker/distribution" - packages = ["digest","reference"] - revision = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89" - version = "v2.6.2" - -[[projects]] name = "github.com/eapache/go-resiliency" packages = ["breaker"] revision = "6800482f2c813e689c88b7ed3282262385011890" @@ -81,17 +75,14 @@ [[projects]] name = "github.com/emicklei/go-restful" - packages = [".","log"] + packages = [ + ".", + "log" + ] revision = "5741799b275a3c4a5a9623a993576d7545cf7b5c" version = "v2.4.0" [[projects]] - name = "github.com/emicklei/go-restful-swagger12" - packages = ["."] - revision = "dcef7f55730566d41eae5db10e7d6981829720f6" - version = "1.0.1" - -[[projects]] branch = "master" name = "github.com/farsightsec/golang-framestream" packages = ["."] @@ -111,18 +102,6 @@ [[projects]] branch = "master" - name = "github.com/go-openapi/analysis" - packages = ["."] - revision = "2bbaa248df987bc6fbd0210da05071e111dec40c" - -[[projects]] - branch = "master" - name = "github.com/go-openapi/errors" - packages = ["."] - revision = "03cfca65330da08a5a440053faf994a3c682b5bf" - -[[projects]] - branch = "master" name = "github.com/go-openapi/jsonpointer" packages = ["."] revision = "779f45308c19820f1a69e9a4cd965f496e0da10f" @@ -135,21 +114,9 @@ [[projects]] branch = "master" - name = "github.com/go-openapi/loads" - packages = ["."] - revision = "2a2b323bab96e6b1fdee110e57d959322446e9c9" - -[[projects]] - branch = "master" name = "github.com/go-openapi/spec" packages = ["."] - revision = "01738944bdee0f26bf66420c5b17d54cfdf55341" - -[[projects]] - branch = "master" - name = "github.com/go-openapi/strfmt" - packages = ["."] - revision = "610b6cacdcde6852f4de68998bd20ce1dac85b22" + revision = "fa03337d7da5735229ee8f5e9d5d0b996014b7f8" [[projects]] branch = "master" @@ -159,7 +126,10 @@ [[projects]] name = "github.com/gogo/protobuf" - packages = ["proto","sortkeys"] + packages = [ + "proto", + "sortkeys" + ] revision = "342cbe0a04158f6dcb03ca0079991a51a4248c02" version = "v0.5" @@ -172,7 +142,13 @@ [[projects]] branch = "master" name = "github.com/golang/protobuf" - packages = ["proto","ptypes","ptypes/any","ptypes/duration","ptypes/timestamp"] + packages = [ + "proto", + "ptypes", + "ptypes/any", + "ptypes/duration", + "ptypes/timestamp" + ] revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845" [[projects]] @@ -183,11 +159,36 @@ [[projects]] branch = "master" + name = "github.com/google/btree" + packages = ["."] + revision = "316fb6d3f031ae8f4d457c6c5186b9e3ded70435" + +[[projects]] + branch = "master" name = "github.com/google/gofuzz" packages = ["."] revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" [[projects]] + name = "github.com/googleapis/gnostic" + packages = [ + "OpenAPIv2", + "compiler", + "extensions" + ] + revision = "ee43cbb60db7bd22502942cccbc39059117352ab" + version = "v0.1.0" + +[[projects]] + branch = "master" + name = "github.com/gregjones/httpcache" + packages = [ + ".", + "diskcache" + ] + revision = "2bcd89a1743fd4b373f7370ce8ddc14dfbd18229" + +[[projects]] branch = "master" name = "github.com/grpc-ecosystem/grpc-opentracing" packages = ["go/otgrpc"] @@ -196,7 +197,10 @@ [[projects]] branch = "master" name = "github.com/hashicorp/golang-lru" - packages = [".","simplelru"] + packages = [ + ".", + "simplelru" + ] revision = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6" [[projects]] @@ -212,6 +216,12 @@ version = "0.2.4" [[projects]] + name = "github.com/json-iterator/go" + packages = ["."] + revision = "f7279a603edee96fe7764d3de9c6ff8cf9970994" + version = "1.0.4" + +[[projects]] branch = "master" name = "github.com/juju/ratelimit" packages = ["."] @@ -226,7 +236,11 @@ [[projects]] branch = "master" name = "github.com/mailru/easyjson" - packages = ["buffer","jlexer","jwriter"] + packages = [ + "buffer", + "jlexer", + "jwriter" + ] revision = "32fa128f234d041f196a9f3e0fea5ac9772c08e1" [[projects]] @@ -237,33 +251,50 @@ [[projects]] branch = "master" - name = "github.com/mitchellh/mapstructure" - packages = ["."] - revision = "06020f85339e21b2478f756a78e295255ffa4d6a" - -[[projects]] - branch = "master" name = "github.com/opentracing-contrib/go-observer" packages = ["."] revision = "a52f2342449246d5bcc273e65cbdcfa5f7d6c63c" [[projects]] name = "github.com/opentracing/opentracing-go" - packages = [".","ext","log"] + packages = [ + ".", + "ext", + "log" + ] revision = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38" version = "v1.0.2" [[projects]] name = "github.com/openzipkin/zipkin-go-opentracing" - packages = [".","flag","thrift/gen-go/scribe","thrift/gen-go/zipkincore","types","wire"] + packages = [ + ".", + "flag", + "thrift/gen-go/scribe", + "thrift/gen-go/zipkincore", + "types", + "wire" + ] revision = "45e90b00710a4c34a1a7d8a78d90f9b010b0bd4d" version = "v0.3.2" [[projects]] + branch = "master" + name = "github.com/petar/GoLLRB" + packages = ["llrb"] + revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" + +[[projects]] + name = "github.com/peterbourgon/diskv" + packages = ["."] + revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" + version = "v2.0.1" + +[[projects]] name = "github.com/pierrec/lz4" packages = ["."] - revision = "08c27939df1bd95e881e2c2367a749964ad1fceb" - version = "v1.0.1" + revision = "2fcda4cb7018ce05a25959d2fe08c83e3329f169" + version = "v1.1" [[projects]] name = "github.com/pierrec/xxHash" @@ -280,7 +311,11 @@ [[projects]] branch = "master" name = "github.com/prometheus/common" - packages = ["expfmt","internal/bitbucket.org/ww/goautoneg","model"] + packages = [ + "expfmt", + "internal/bitbucket.org/ww/goautoneg", + "model" + ] revision = "2e54d0b93cba2fd133edc32211dcc32c06ef72ca" [[projects]] @@ -304,19 +339,30 @@ branch = "master" name = "golang.org/x/crypto" packages = ["ssh/terminal"] - revision = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122" + revision = "0fcca4842a8d74bfddc2c96a073bd2a4d2a7a2e8" [[projects]] branch = "master" name = "golang.org/x/sys" - packages = ["unix","windows"] - revision = "571f7bbbe08da2a8955aed9d4db316e78630e9a3" + packages = [ + "unix", + "windows" + ] + revision = "83801418e1b59fb1880e363299581ee543af32ca" [[projects]] branch = "master" name = "golang.org/x/text" - packages = ["internal/gen","internal/triegen","internal/ucd","transform","unicode/cldr","unicode/norm","width"] - revision = "d5a9226ed7dd70cade6ccae9d37517fe14dd9fee" + packages = [ + "internal/gen", + "internal/triegen", + "internal/ucd", + "transform", + "unicode/cldr", + "unicode/norm", + "width" + ] + revision = "e19ae1496984b1c655b8044a65c0300a3c878dd3" [[projects]] branch = "master" @@ -326,7 +372,29 @@ [[projects]] name = "google.golang.org/grpc" - packages = [".","balancer","balancer/roundrobin","codes","connectivity","credentials","encoding","grpclb/grpc_lb_v1/messages","grpclog","internal","keepalive","metadata","naming","peer","resolver","resolver/dns","resolver/passthrough","stats","status","tap","transport"] + packages = [ + ".", + "balancer", + "balancer/roundrobin", + "codes", + "connectivity", + "credentials", + "encoding", + "grpclb/grpc_lb_v1/messages", + "grpclog", + "internal", + "keepalive", + "metadata", + "naming", + "peer", + "resolver", + "resolver/dns", + "resolver/passthrough", + "stats", + "status", + "tap", + "transport" + ] revision = "e687fa4e6424368ece6e4fe727cea2c806a0fcb4" version = "v1.8.2" @@ -338,30 +406,153 @@ [[projects]] branch = "v2" - name = "gopkg.in/mgo.v2" - packages = ["bson","internal/json"] - revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655" - -[[projects]] - branch = "v2" name = "gopkg.in/yaml.v2" packages = ["."] - revision = "287cf08546ab5e7e37d55a84f7ed3fd1db036de5" + revision = "c95af922eae69f190717a0b7148960af8c55a072" + +[[projects]] + name = "k8s.io/api" + packages = [ + "admissionregistration/v1alpha1", + "admissionregistration/v1beta1", + "apps/v1", + "apps/v1beta1", + "apps/v1beta2", + "authentication/v1", + "authentication/v1beta1", + "authorization/v1", + "authorization/v1beta1", + "autoscaling/v1", + "autoscaling/v2beta1", + "batch/v1", + "batch/v1beta1", + "batch/v2alpha1", + "certificates/v1beta1", + "core/v1", + "events/v1beta1", + "extensions/v1beta1", + "networking/v1", + "policy/v1beta1", + "rbac/v1", + "rbac/v1alpha1", + "rbac/v1beta1", + "scheduling/v1alpha1", + "settings/v1alpha1", + "storage/v1", + "storage/v1alpha1", + "storage/v1beta1" + ] + revision = "11147472b7c934c474a2c484af3c0c5210b7a3af" [[projects]] name = "k8s.io/apimachinery" - packages = ["pkg/api/equality","pkg/api/errors","pkg/api/meta","pkg/api/resource","pkg/apimachinery","pkg/apimachinery/announced","pkg/apimachinery/registered","pkg/apis/meta/v1","pkg/apis/meta/v1/unstructured","pkg/apis/meta/v1alpha1","pkg/conversion","pkg/conversion/queryparams","pkg/conversion/unstructured","pkg/fields","pkg/labels","pkg/openapi","pkg/runtime","pkg/runtime/schema","pkg/runtime/serializer","pkg/runtime/serializer/json","pkg/runtime/serializer/protobuf","pkg/runtime/serializer/recognizer","pkg/runtime/serializer/streaming","pkg/runtime/serializer/versioning","pkg/selection","pkg/types","pkg/util/cache","pkg/util/clock","pkg/util/diff","pkg/util/errors","pkg/util/framer","pkg/util/intstr","pkg/util/json","pkg/util/net","pkg/util/rand","pkg/util/runtime","pkg/util/sets","pkg/util/validation","pkg/util/validation/field","pkg/util/wait","pkg/util/yaml","pkg/version","pkg/watch","third_party/forked/golang/reflect"] - revision = "1fd2e63a9a370677308a42f24fd40c86438afddf" + packages = [ + "pkg/api/errors", + "pkg/api/meta", + "pkg/api/resource", + "pkg/apis/meta/internalversion", + "pkg/apis/meta/v1", + "pkg/apis/meta/v1/unstructured", + "pkg/apis/meta/v1alpha1", + "pkg/conversion", + "pkg/conversion/queryparams", + "pkg/fields", + "pkg/labels", + "pkg/runtime", + "pkg/runtime/schema", + "pkg/runtime/serializer", + "pkg/runtime/serializer/json", + "pkg/runtime/serializer/protobuf", + "pkg/runtime/serializer/recognizer", + "pkg/runtime/serializer/streaming", + "pkg/runtime/serializer/versioning", + "pkg/selection", + "pkg/types", + "pkg/util/cache", + "pkg/util/clock", + "pkg/util/diff", + "pkg/util/errors", + "pkg/util/framer", + "pkg/util/intstr", + "pkg/util/json", + "pkg/util/net", + "pkg/util/runtime", + "pkg/util/sets", + "pkg/util/validation", + "pkg/util/validation/field", + "pkg/util/wait", + "pkg/util/yaml", + "pkg/version", + "pkg/watch", + "third_party/forked/golang/reflect" + ] + revision = "180eddb345a5be3a157cea1c624700ad5bd27b8f" [[projects]] name = "k8s.io/client-go" - packages = ["discovery","kubernetes","kubernetes/scheme","kubernetes/typed/admissionregistration/v1alpha1","kubernetes/typed/apps/v1beta1","kubernetes/typed/authentication/v1","kubernetes/typed/authentication/v1beta1","kubernetes/typed/authorization/v1","kubernetes/typed/authorization/v1beta1","kubernetes/typed/autoscaling/v1","kubernetes/typed/autoscaling/v2alpha1","kubernetes/typed/batch/v1","kubernetes/typed/batch/v2alpha1","kubernetes/typed/certificates/v1beta1","kubernetes/typed/core/v1","kubernetes/typed/extensions/v1beta1","kubernetes/typed/networking/v1","kubernetes/typed/policy/v1beta1","kubernetes/typed/rbac/v1alpha1","kubernetes/typed/rbac/v1beta1","kubernetes/typed/settings/v1alpha1","kubernetes/typed/storage/v1","kubernetes/typed/storage/v1beta1","pkg/api","pkg/api/v1","pkg/api/v1/ref","pkg/apis/admissionregistration","pkg/apis/admissionregistration/v1alpha1","pkg/apis/apps","pkg/apis/apps/v1beta1","pkg/apis/authentication","pkg/apis/authentication/v1","pkg/apis/authentication/v1beta1","pkg/apis/authorization","pkg/apis/authorization/v1","pkg/apis/authorization/v1beta1","pkg/apis/autoscaling","pkg/apis/autoscaling/v1","pkg/apis/autoscaling/v2alpha1","pkg/apis/batch","pkg/apis/batch/v1","pkg/apis/batch/v2alpha1","pkg/apis/certificates","pkg/apis/certificates/v1beta1","pkg/apis/extensions","pkg/apis/extensions/v1beta1","pkg/apis/networking","pkg/apis/networking/v1","pkg/apis/policy","pkg/apis/policy/v1beta1","pkg/apis/rbac","pkg/apis/rbac/v1alpha1","pkg/apis/rbac/v1beta1","pkg/apis/settings","pkg/apis/settings/v1alpha1","pkg/apis/storage","pkg/apis/storage/v1","pkg/apis/storage/v1beta1","pkg/util","pkg/util/parsers","pkg/version","rest","rest/watch","tools/auth","tools/cache","tools/clientcmd","tools/clientcmd/api","tools/clientcmd/api/latest","tools/clientcmd/api/v1","tools/metrics","transport","util/cert","util/flowcontrol","util/homedir","util/integer"] - revision = "d92e8497f71b7b4e0494e5bd204b48d34bd6f254" - version = "v4.0.0" + packages = [ + "discovery", + "kubernetes", + "kubernetes/scheme", + "kubernetes/typed/admissionregistration/v1alpha1", + "kubernetes/typed/admissionregistration/v1beta1", + "kubernetes/typed/apps/v1", + "kubernetes/typed/apps/v1beta1", + "kubernetes/typed/apps/v1beta2", + "kubernetes/typed/authentication/v1", + "kubernetes/typed/authentication/v1beta1", + "kubernetes/typed/authorization/v1", + "kubernetes/typed/authorization/v1beta1", + "kubernetes/typed/autoscaling/v1", + "kubernetes/typed/autoscaling/v2beta1", + "kubernetes/typed/batch/v1", + "kubernetes/typed/batch/v1beta1", + "kubernetes/typed/batch/v2alpha1", + "kubernetes/typed/certificates/v1beta1", + "kubernetes/typed/core/v1", + "kubernetes/typed/events/v1beta1", + "kubernetes/typed/extensions/v1beta1", + "kubernetes/typed/networking/v1", + "kubernetes/typed/policy/v1beta1", + "kubernetes/typed/rbac/v1", + "kubernetes/typed/rbac/v1alpha1", + "kubernetes/typed/rbac/v1beta1", + "kubernetes/typed/scheduling/v1alpha1", + "kubernetes/typed/settings/v1alpha1", + "kubernetes/typed/storage/v1", + "kubernetes/typed/storage/v1alpha1", + "kubernetes/typed/storage/v1beta1", + "pkg/version", + "rest", + "rest/watch", + "tools/auth", + "tools/cache", + "tools/clientcmd", + "tools/clientcmd/api", + "tools/clientcmd/api/latest", + "tools/clientcmd/api/v1", + "tools/metrics", + "tools/pager", + "tools/reference", + "transport", + "util/buffer", + "util/cert", + "util/flowcontrol", + "util/homedir", + "util/integer" + ] + revision = "78700dec6369ba22221b72770783300f143df150" + version = "v6.0.0" + +[[projects]] + branch = "master" + name = "k8s.io/kube-openapi" + packages = ["pkg/common"] + revision = "b16ebc07f5cad97831f961e4b5a9cc1caed33b7e" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "7449762cfec347014dce97efce332ac6a9bca1c9cbc82418b2bf2e6af6a5d6db" + inputs-digest = "4aeebd6b2fe24acde2f69a5dc347ba7ebead910ac1c3455a0656c00724c9b1be" solver-name = "gps-cdcl" solver-version = 1 |