From a0d9386a6f1b8caf6b0599c49efb4053df49ca33 Mon Sep 17 00:00:00 2001 From: Hongchao Deng Date: Mon, 5 Mar 2018 21:26:56 -0800 Subject: [PATCH] dep: update etcd 3.2.16 and k8s 1.10 --- Gopkg.lock | 293 ++++++++++++++++++++++------------------------------- Gopkg.toml | 14 ++- 2 files changed, 132 insertions(+), 175 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 5fb13c9b2..05d603bb4 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -3,11 +3,9 @@ [[projects]] name = "cloud.google.com/go" - packages = [ - "compute/metadata", - "internal" - ] - revision = "3b1ae45394a234c385be014e9a488f2bb6eef821" + packages = ["compute/metadata"] + revision = "20d4028b8a750c2aca76bf9fefa8ed2d0109b573" + version = "v0.19.0" [[projects]] name = "github.com/Azure/azure-sdk-for-go" @@ -23,19 +21,8 @@ "autorest/azure", "autorest/date" ] - revision = "809ed2ef5c4c9a60c3c2f3aa9cc11f3a7c2ce59d" - version = "v9.6.0" - -[[projects]] - name = "github.com/PuerkitoBio/purell" - packages = ["."] - revision = "8a290539e2e8629dbc4e6bad948158f790ec31f4" - version = "v1.0.0" - -[[projects]] - name = "github.com/PuerkitoBio/urlesc" - packages = ["."] - revision = "5bd2802263f21d8788851d5305584c82a5c75d7e" + revision = "19642ad23ee58fb8c895dfdc97c979c15c133118" + version = "v10.1.3" [[projects]] name = "github.com/aws/aws-sdk-go" @@ -73,9 +60,10 @@ version = "v1.13.8" [[projects]] + branch = "master" name = "github.com/beorn7/perks" packages = ["quantile"] - revision = "3ac7bf7a47d159a033b107610db8a1b6575507a4" + revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9" [[projects]] name = "github.com/coreos/etcd" @@ -85,28 +73,18 @@ "etcdserver/api/v3rpc/rpctypes", "etcdserver/etcdserverpb", "mvcc/mvccpb", - "pkg/fileutil", "pkg/tlsutil", - "pkg/transport" + "pkg/transport", + "pkg/types" ] - revision = "0f4a535c2fb7a2920e13e2e19b9eaf6b2e9285e5" - version = "v3.1.9" - -[[projects]] - name = "github.com/coreos/go-systemd" - packages = ["journal"] - revision = "48702e0da86bd25e76cfef347e2adeb434a0d0a6" - version = "v14" - -[[projects]] - name = "github.com/coreos/pkg" - packages = ["capnslog"] - revision = "fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8" + revision = "121edf0467052d55876a817b89875fb39a99bf78" + version = "v3.2.16" [[projects]] name = "github.com/davecgh/go-spew" packages = ["spew"] - revision = "782f4967f2dc4564575ca782fe2d04090b5faca8" + revision = "346938d642f2ec3594ed81d874461961cd0faa76" + version = "v1.1.0" [[projects]] name = "github.com/dgrijalva/jwt-go" @@ -114,24 +92,11 @@ revision = "dbeaa9332f19a944acb5736b4456cfcc02140e29" version = "v3.1.0" -[[projects]] - name = "github.com/emicklei/go-restful" - packages = [ - ".", - "log" - ] - revision = "ff4f55a206334ef123e4f79bbf348980da81ca46" - -[[projects]] - name = "github.com/emicklei/go-restful-swagger12" - packages = ["."] - revision = "dcef7f55730566d41eae5db10e7d6981829720f6" - version = "1.0.1" - [[projects]] name = "github.com/ghodss/yaml" packages = ["."] - revision = "73d445a93680fa1a78ae23a5839bad48f32ba1ee" + revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7" + version = "v1.0.0" [[projects]] name = "github.com/go-ini/ini" @@ -139,65 +104,45 @@ revision = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a" version = "v1.32.0" -[[projects]] - name = "github.com/go-openapi/jsonpointer" - packages = ["."] - revision = "46af16f9f7b149af66e5d1bd010e3574dc06de98" - -[[projects]] - name = "github.com/go-openapi/jsonreference" - packages = ["."] - revision = "13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272" - -[[projects]] - name = "github.com/go-openapi/spec" - packages = ["."] - revision = "6aced65f8501fe1217321abf0749d354824ba2ff" - -[[projects]] - name = "github.com/go-openapi/swag" - packages = ["."] - revision = "1d0bd113de87027671077d3c71eb3ac5d7dbba72" - [[projects]] name = "github.com/gogo/protobuf" packages = [ "proto", "sortkeys" ] - revision = "c0656edd0d9eab7c66d1eb0c568f9039345796f7" + revision = "1adfc126b41513cc696b209667c8656ea7aac67c" + version = "v1.0.0" [[projects]] + branch = "master" name = "github.com/golang/glog" packages = ["."] - revision = "44145f04b68cf362d9c4df2182967c2275eaefed" + revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" [[projects]] + branch = "master" name = "github.com/golang/groupcache" packages = ["lru"] - revision = "02826c3e79038b59d737d3b1c0a1d937f71a4433" + revision = "66deaeb636dff1ac7d938ce666d090556056a4b0" [[projects]] name = "github.com/golang/protobuf" packages = [ - "jsonpb", "proto", + "protoc-gen-go/descriptor", "ptypes", "ptypes/any", "ptypes/duration", "ptypes/timestamp" ] - revision = "4bd1920723d7b7c925de087aa32e2187708897f7" - -[[projects]] - name = "github.com/google/btree" - packages = ["."] - revision = "7d79101e329e5a3adf994758c578dab82b90c017" + revision = "925541529c1fa6821df4e44ce2723319eb2be768" + version = "v1.0.0" [[projects]] + branch = "master" name = "github.com/google/gofuzz" packages = ["."] - revision = "44d81051d367757e1c7c6a5a86423ece9afcf63c" + revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" [[projects]] name = "github.com/googleapis/gnostic" @@ -206,38 +151,17 @@ "compiler", "extensions" ] - revision = "0c5108395e2debce0d731cf0287ddf7242066aba" - -[[projects]] - name = "github.com/gregjones/httpcache" - packages = [ - ".", - "diskcache" - ] - revision = "787624de3eb7bd915c329cba748687a3b22666a6" - -[[projects]] - name = "github.com/grpc-ecosystem/go-grpc-prometheus" - packages = ["."] - revision = "6b7015e65d366bf3f19b2b2a000a831940f0f7e0" - version = "v1.1" - -[[projects]] - name = "github.com/grpc-ecosystem/grpc-gateway" - packages = [ - "runtime", - "runtime/internal", - "utilities" - ] - revision = "84398b94e188ee336f307779b57b3aa91af7063c" + revision = "ee43cbb60db7bd22502942cccbc39059117352ab" + version = "v0.1.0" [[projects]] + branch = "master" name = "github.com/hashicorp/golang-lru" packages = [ ".", "simplelru" ] - revision = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4" + revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3" [[projects]] branch = "master" @@ -248,7 +172,8 @@ [[projects]] name = "github.com/imdario/mergo" packages = ["."] - revision = "6633656539c1639d9d78127b7d47c622b5d7b6dc" + revision = "163f41321a19dd09362d4c63cc2489db2015f1f4" + version = "0.3.2" [[projects]] name = "github.com/jmespath/go-jmespath" @@ -258,45 +183,32 @@ [[projects]] name = "github.com/json-iterator/go" packages = ["."] - revision = "36b14963da70d11297d313183d7e6388c8510e1e" - version = "1.0.0" - -[[projects]] - name = "github.com/juju/ratelimit" - packages = ["."] - revision = "5b9ff866471762aa2ab2dced63c9fb6f53921342" - -[[projects]] - name = "github.com/mailru/easyjson" - packages = [ - "buffer", - "jlexer", - "jwriter" - ] - revision = "d5b7844b561a7bc640052f1b935f7b800330d7e0" + revision = "3353055b2a1a5ae1b6a8dfde887a524e7088f3a2" + version = "1.1.2" [[projects]] name = "github.com/matttproud/golang_protobuf_extensions" packages = ["pbutil"] - revision = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a" + revision = "3247c84500bff8d9fb6d579d800f20b3e091582c" + version = "v1.0.0" [[projects]] - name = "github.com/pborman/uuid" + name = "github.com/modern-go/concurrent" packages = ["."] - revision = "e790cca94e6cc75c7064b1332e63811d4aae1a53" - version = "v1.1" + revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94" + version = "1.0.3" [[projects]] - branch = "master" - name = "github.com/petar/GoLLRB" - packages = ["llrb"] - revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" + name = "github.com/modern-go/reflect2" + packages = ["."] + revision = "1df9eeb2bb81f327b96228865c5687bc2194af3f" + version = "1.0.0" [[projects]] - name = "github.com/peterbourgon/diskv" + name = "github.com/pborman/uuid" packages = ["."] - revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" - version = "v2.0.1" + revision = "e790cca94e6cc75c7064b1332e63811d4aae1a53" + version = "v1.1" [[projects]] name = "github.com/pkg/errors" @@ -311,32 +223,37 @@ version = "v0.8.0" [[projects]] + branch = "master" name = "github.com/prometheus/client_model" packages = ["go"] - revision = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6" + revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c" [[projects]] + branch = "master" name = "github.com/prometheus/common" packages = [ "expfmt", "internal/bitbucket.org/ww/goautoneg", "model" ] - revision = "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207" + revision = "6fb6fce6f8b75884b92e1889c150403fc0872c5e" [[projects]] + branch = "master" name = "github.com/prometheus/procfs" packages = [ ".", + "internal/util", + "nfs", "xfs" ] - revision = "65c1f6f8f0fc1e2185eb9863a3bc751496404259" + revision = "d274e363d5759d1c916232217be421f1cc89c5fe" [[projects]] name = "github.com/satori/uuid" packages = ["."] - revision = "879c5887cd475cd7864858769793b2ceb0d44feb" - version = "v1.1.0" + revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" + version = "v1.2.0" [[projects]] name = "github.com/sirupsen/logrus" @@ -347,14 +264,17 @@ [[projects]] name = "github.com/spf13/pflag" packages = ["."] - revision = "9ff6c6923cfffbcd502984b8e0c80539a94968b7" + revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66" + version = "v1.0.0" [[projects]] + branch = "master" name = "golang.org/x/crypto" packages = ["ssh/terminal"] - revision = "81e90905daefcd6fd217b62423c0908922eadb30" + revision = "91a49db82a88618983a78a06c1cbd4e00ab749ab" [[projects]] + branch = "master" name = "golang.org/x/net" packages = [ "context", @@ -366,9 +286,10 @@ "lex/httplex", "trace" ] - revision = "1c05540f6879653db88113bc4a2b70aec4bd491f" + revision = "22ae77b79946ea320088417e4d50825671d82d57" [[projects]] + branch = "master" name = "golang.org/x/oauth2" packages = [ ".", @@ -377,37 +298,37 @@ "jws", "jwt" ] - revision = "a6bd8cefa1811bd24b86f8902872e4e8225f74c4" + revision = "2f32c3ac0fa4fb807a0fcefb0b6f2468a0d99bd0" [[projects]] + branch = "master" name = "golang.org/x/sys" packages = [ "unix", "windows" ] - revision = "7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce" + revision = "dd2ff4accc098aceecb86b36eaa7829b2a17b1c9" [[projects]] name = "golang.org/x/text" packages = [ - "cases", - "internal", + "collate", + "collate/build", + "internal/colltab", "internal/gen", "internal/tag", "internal/triegen", "internal/ucd", "language", - "runes", "secure/bidirule", - "secure/precis", "transform", "unicode/bidi", "unicode/cldr", "unicode/norm", - "unicode/rangetable", - "width" + "unicode/rangetable" ] - revision = "b19bf474d317b857955b12035d2c5acb57ce8b01" + revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" + version = "v0.3.0" [[projects]] branch = "master" @@ -416,7 +337,6 @@ revision = "6dc17368e09b0e8634d71cac8168d853e869a0c7" [[projects]] - branch = "master" name = "google.golang.org/appengine" packages = [ ".", @@ -430,23 +350,42 @@ "internal/urlfetch", "urlfetch" ] - revision = "9d8544a6b2c7df9cff240fcf92d7b2f59bc13416" + revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a" + version = "v1.0.0" + +[[projects]] + branch = "master" + name = "google.golang.org/genproto" + packages = [ + "googleapis/api/annotations", + "googleapis/rpc/status" + ] + revision = "df60624c1e9b9d2973e889c7a1cff73155da81c4" [[projects]] name = "google.golang.org/grpc" packages = [ ".", + "balancer", "codes", + "connectivity", "credentials", + "grpclb/grpc_lb_v1/messages", "grpclog", + "health/grpc_health_v1", "internal", + "keepalive", "metadata", "naming", "peer", + "resolver", + "stats", + "status", + "tap", "transport" ] - revision = "777daa17ff9b5daef1cfdf915088a2ada3332bf0" - version = "v1.0.4" + revision = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e" + version = "v1.7.5" [[projects]] name = "gopkg.in/inf.v0" @@ -457,12 +396,15 @@ [[projects]] name = "gopkg.in/yaml.v2" packages = ["."] - revision = "53feefa2559fb8dfa8d81baad31be332c97d6c77" + revision = "7f97868eec74b32b0982dd158a51a446d1da7eb5" + version = "v2.1.1" [[projects]] name = "k8s.io/api" packages = [ "admissionregistration/v1alpha1", + "admissionregistration/v1beta1", + "apps/v1", "apps/v1beta1", "apps/v1beta2", "authentication/v1", @@ -476,6 +418,7 @@ "batch/v2alpha1", "certificates/v1beta1", "core/v1", + "events/v1beta1", "extensions/v1beta1", "networking/v1", "policy/v1beta1", @@ -485,10 +428,11 @@ "scheduling/v1alpha1", "settings/v1alpha1", "storage/v1", + "storage/v1alpha1", "storage/v1beta1" ] - revision = "4df58c811fe2e65feb879227b2b245e4dc26e7ad" - version = "kubernetes-1.8.2" + revision = "7aac3e00a1b32fa476b83078cebaaca606b2fb48" + version = "kubernetes-1.10.0-beta.1" [[projects]] name = "k8s.io/apiextensions-apiserver" @@ -499,23 +443,21 @@ "pkg/client/clientset/clientset/scheme", "pkg/client/clientset/clientset/typed/apiextensions/v1beta1" ] - revision = "e509bb64fe1116e12a32273a2032426aa1a5fd26" - version = "kubernetes-1.8.2" + revision = "10b55e130fc1162aba4f16406798909e48397aee" + version = "kubernetes-1.10.0-beta.1" [[projects]] name = "k8s.io/apimachinery" packages = [ - "pkg/api/equality", "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/apis/meta/v1beta1", "pkg/conversion", "pkg/conversion/queryparams", - "pkg/conversion/unstructured", "pkg/fields", "pkg/labels", "pkg/runtime", @@ -550,8 +492,8 @@ "third_party/forked/golang/json", "third_party/forked/golang/reflect" ] - revision = "019ae5ada31de202164b118aee88ee2d14075c31" - version = "kubernetes-1.8.2" + revision = "302974c03f7e50f16561ba237db776ab93594ef6" + version = "kubernetes-1.10.0-beta.1" [[projects]] name = "k8s.io/client-go" @@ -563,6 +505,10 @@ "kubernetes/scheme", "kubernetes/typed/admissionregistration/v1alpha1", "kubernetes/typed/admissionregistration/v1alpha1/fake", + "kubernetes/typed/admissionregistration/v1beta1", + "kubernetes/typed/admissionregistration/v1beta1/fake", + "kubernetes/typed/apps/v1", + "kubernetes/typed/apps/v1/fake", "kubernetes/typed/apps/v1beta1", "kubernetes/typed/apps/v1beta1/fake", "kubernetes/typed/apps/v1beta2", @@ -589,6 +535,8 @@ "kubernetes/typed/certificates/v1beta1/fake", "kubernetes/typed/core/v1", "kubernetes/typed/core/v1/fake", + "kubernetes/typed/events/v1beta1", + "kubernetes/typed/events/v1beta1/fake", "kubernetes/typed/extensions/v1beta1", "kubernetes/typed/extensions/v1beta1/fake", "kubernetes/typed/networking/v1", @@ -607,6 +555,8 @@ "kubernetes/typed/settings/v1alpha1/fake", "kubernetes/typed/storage/v1", "kubernetes/typed/storage/v1/fake", + "kubernetes/typed/storage/v1alpha1", + "kubernetes/typed/storage/v1alpha1/fake", "kubernetes/typed/storage/v1beta1", "kubernetes/typed/storage/v1beta1/fake", "pkg/version", @@ -628,24 +578,27 @@ "tools/record", "tools/reference", "transport", + "util/buffer", "util/cert", "util/flowcontrol", "util/homedir", "util/integer", "util/jsonpath", + "util/retry", "util/workqueue" ] - revision = "35ccd4336052e7d73018b1382413534936f34eee" - version = "kubernetes-1.8.2" + revision = "82eadfdc39007c2eb47e3ddeb7ed7d96365e409d" + version = "kubernetes-1.10.0-beta.1" [[projects]] + branch = "master" name = "k8s.io/kube-openapi" - packages = ["pkg/common"] - revision = "868f2f29720b192240e18284659231b440f9cda5" + packages = ["pkg/util/proto"] + revision = "50ae88d24ede7b8bad68e23c805b5d3da5c8abaf" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "6a9a3b434a8dc3134ec473f0ec85920bc51c91494f7380349c98b87f134a1c85" + inputs-digest = "50ad8456f61ec114c3017547d0571ec3dc15f83aed40fadeed32cdb9e30b0138" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index baf245a76..a70e4b87e 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,22 +1,26 @@ [[constraint]] name = "k8s.io/api" - version = "kubernetes-1.8.2" + version = "kubernetes-1.10.0-beta.1" [[constraint]] name = "k8s.io/apiextensions-apiserver" - version = "kubernetes-1.8.2" + version = "kubernetes-1.10.0-beta.1" [[constraint]] name = "k8s.io/apimachinery" - version = "kubernetes-1.8.2" + version = "kubernetes-1.10.0-beta.1" [[constraint]] name = "k8s.io/client-go" - version = "kubernetes-1.8.2" + version = "kubernetes-1.10.0-beta.1" [[constraint]] name = "github.com/coreos/etcd" - version = "=3.1.9" + version = "=v3.2.16" + +[[override]] + name = "google.golang.org/grpc" + version = "=v1.7.5" [[constraint]] name = "github.com/aws/aws-sdk-go"