From 42ecb5e62dcd0118ab5a9d340ffb3cb2afb37176 Mon Sep 17 00:00:00 2001 From: Laurent Demailly Date: Fri, 12 Jan 2018 16:19:23 -0800 Subject: [PATCH 1/2] Update fortio version to latest Not clear why Gopkg.lock changed so much --- Gopkg.lock | 620 ++++++++++++++++++++++++++++++++++++++++++++++---- Gopkg.toml | 9 +- istio.VERSION | 2 +- 3 files changed, 578 insertions(+), 53 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 813c8b140852..219bb8fffbfa 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -3,18 +3,38 @@ [[projects]] name = "cloud.google.com/go" - packages = ["compute/metadata","iam","internal","internal/optional","internal/version","logging","logging/apiv2","logging/internal","monitoring/apiv3","storage"] + packages = [ + "compute/metadata", + "iam", + "internal", + "internal/optional", + "internal/version", + "logging", + "logging/apiv2", + "logging/internal", + "monitoring/apiv3", + "storage" + ] revision = "050b16d2314d5fc3d4c9a51e4cd5c7468e77f162" version = "v0.17.0" [[projects]] name = "code.cloudfoundry.org/copilot" - packages = [".","api","testhelpers"] + packages = [ + ".", + "api", + "testhelpers" + ] revision = "b311fd6188b8f4f75cfe4c692692732e06b74fc3" [[projects]] name = "github.com/Azure/go-autorest" - packages = ["autorest","autorest/adal","autorest/azure","autorest/date"] + packages = [ + "autorest", + "autorest/adal", + "autorest/azure", + "autorest/date" + ] revision = "6311d7a76f54cf2b6dea03d737d9bd9a6022ac5f" version = "v9.7.1" @@ -62,7 +82,32 @@ [[projects]] name = "github.com/aws/aws-sdk-go" - packages = ["aws","aws/awserr","aws/awsutil","aws/client","aws/client/metadata","aws/corehandlers","aws/credentials","aws/credentials/ec2rolecreds","aws/credentials/endpointcreds","aws/credentials/stscreds","aws/defaults","aws/ec2metadata","aws/endpoints","aws/request","aws/session","aws/signer/v4","awstesting/unit","internal/shareddefaults","private/protocol","private/protocol/query","private/protocol/query/queryutil","private/protocol/rest","private/protocol/xml/xmlutil","service/sts"] + packages = [ + "aws", + "aws/awserr", + "aws/awsutil", + "aws/client", + "aws/client/metadata", + "aws/corehandlers", + "aws/credentials", + "aws/credentials/ec2rolecreds", + "aws/credentials/endpointcreds", + "aws/credentials/stscreds", + "aws/defaults", + "aws/ec2metadata", + "aws/endpoints", + "aws/request", + "aws/session", + "aws/signer/v4", + "awstesting/unit", + "internal/shareddefaults", + "private/protocol", + "private/protocol/query", + "private/protocol/query/queryutil", + "private/protocol/rest", + "private/protocol/xml/xmlutil", + "service/sts" + ] revision = "3c754f1d340244540350f0a00b940781bae9c905" version = "v1.12.59" @@ -74,13 +119,21 @@ [[projects]] name = "github.com/cactus/go-statsd-client" - packages = ["statsd","statsd/statsdtest"] + packages = [ + "statsd", + "statsd/statsdtest" + ] revision = "91c326c3f7bd20f0226d3d1c289dd9f8ce28d33d" version = "v3.1.0" [[projects]] name = "github.com/circonus-labs/circonus-gometrics" - packages = [".","api","api/config","checkmgr"] + packages = [ + ".", + "api", + "api/config", + "checkmgr" + ] revision = "b25d14eeef390159289ad3e8521eff3162c59685" version = "v2.1.0" @@ -128,7 +181,10 @@ [[projects]] name = "github.com/emicklei/go-restful" - packages = [".","log"] + packages = [ + ".", + "log" + ] revision = "5741799b275a3c4a5a9623a993576d7545cf7b5c" version = "v2.4.0" @@ -182,13 +238,51 @@ [[projects]] name = "github.com/gobwas/glob" - packages = [".","compiler","match","syntax","syntax/ast","syntax/lexer","util/runes","util/strings"] + packages = [ + ".", + "compiler", + "match", + "syntax", + "syntax/ast", + "syntax/lexer", + "util/runes", + "util/strings" + ] revision = "bea32b9cd2d6f55753d94a28e959b13f0244797a" version = "v0.2.2" [[projects]] name = "github.com/gogo/protobuf" - packages = ["gogoproto","jsonpb","plugin/compare","plugin/defaultcheck","plugin/description","plugin/embedcheck","plugin/enumstringer","plugin/equal","plugin/face","plugin/gostring","plugin/marshalto","plugin/oneofcheck","plugin/populate","plugin/size","plugin/stringer","plugin/testgen","plugin/union","plugin/unmarshal","proto","protoc-gen-gogo/descriptor","protoc-gen-gogo/generator","protoc-gen-gogo/grpc","protoc-gen-gogo/plugin","protoc-gen-gogoslick","sortkeys","types","vanity","vanity/command"] + packages = [ + "gogoproto", + "jsonpb", + "plugin/compare", + "plugin/defaultcheck", + "plugin/description", + "plugin/embedcheck", + "plugin/enumstringer", + "plugin/equal", + "plugin/face", + "plugin/gostring", + "plugin/marshalto", + "plugin/oneofcheck", + "plugin/populate", + "plugin/size", + "plugin/stringer", + "plugin/testgen", + "plugin/union", + "plugin/unmarshal", + "proto", + "protoc-gen-gogo/descriptor", + "protoc-gen-gogo/generator", + "protoc-gen-gogo/grpc", + "protoc-gen-gogo/plugin", + "protoc-gen-gogoslick", + "sortkeys", + "types", + "vanity", + "vanity/command" + ] revision = "342cbe0a04158f6dcb03ca0079991a51a4248c02" version = "v0.5" @@ -207,7 +301,18 @@ [[projects]] branch = "master" name = "github.com/golang/protobuf" - packages = ["jsonpb","proto","protoc-gen-go/descriptor","ptypes","ptypes/any","ptypes/duration","ptypes/empty","ptypes/struct","ptypes/timestamp","ptypes/wrappers"] + packages = [ + "jsonpb", + "proto", + "protoc-gen-go/descriptor", + "ptypes", + "ptypes/any", + "ptypes/duration", + "ptypes/empty", + "ptypes/struct", + "ptypes/timestamp", + "ptypes/wrappers" + ] revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845" [[projects]] @@ -254,14 +359,26 @@ [[projects]] name = "github.com/googleapis/gnostic" - packages = ["OpenAPIv2","compiler","extensions"] + packages = [ + "OpenAPIv2", + "compiler", + "extensions" + ] revision = "ee43cbb60db7bd22502942cccbc39059117352ab" version = "v0.1.0" [[projects]] branch = "master" name = "github.com/gophercloud/gophercloud" - packages = [".","openstack","openstack/identity/v2/tenants","openstack/identity/v2/tokens","openstack/identity/v3/tokens","openstack/utils","pagination"] + packages = [ + ".", + "openstack", + "openstack/identity/v2/tenants", + "openstack/identity/v2/tokens", + "openstack/identity/v3/tokens", + "openstack/utils", + "pagination" + ] revision = "993bca9e3fac8efeaa6cfe74b0b7b00468d8fcf5" [[projects]] @@ -285,7 +402,10 @@ [[projects]] branch = "master" name = "github.com/gregjones/httpcache" - packages = [".","diskcache"] + packages = [ + ".", + "diskcache" + ] revision = "2bcd89a1743fd4b373f7370ce8ddc14dfbd18229" [[projects]] @@ -345,7 +465,10 @@ [[projects]] branch = "master" name = "github.com/hashicorp/golang-lru" - packages = [".","simplelru"] + packages = [ + ".", + "simplelru" + ] revision = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6" [[projects]] @@ -404,7 +527,11 @@ [[projects]] branch = "master" name = "github.com/mailru/easyjson" - packages = ["buffer","jlexer","jwriter"] + packages = [ + "buffer", + "jlexer", + "jwriter" + ] revision = "32fa128f234d041f196a9f3e0fea5ac9772c08e1" [[projects]] @@ -433,18 +560,45 @@ [[projects]] name = "github.com/onsi/gomega" - packages = [".","format","internal/assertion","internal/asyncassertion","internal/oraclematcher","internal/testingtsupport","matchers","matchers/support/goraph/bipartitegraph","matchers/support/goraph/edge","matchers/support/goraph/node","matchers/support/goraph/util","types"] + packages = [ + ".", + "format", + "internal/assertion", + "internal/asyncassertion", + "internal/oraclematcher", + "internal/testingtsupport", + "matchers", + "matchers/support/goraph/bipartitegraph", + "matchers/support/goraph/edge", + "matchers/support/goraph/node", + "matchers/support/goraph/util", + "types" + ] revision = "ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64" [[projects]] name = "github.com/open-policy-agent/opa" - packages = ["ast","metrics","rego","storage","storage/inmem","topdown","topdown/builtins","types","util"] + packages = [ + "ast", + "metrics", + "rego", + "storage", + "storage/inmem", + "topdown", + "topdown/builtins", + "types", + "util" + ] revision = "4b934006914c7964e89563d54bbfc63167922aa0" version = "v0.5.13" [[projects]] name = "github.com/opentracing/opentracing-go" - packages = [".","ext","log"] + packages = [ + ".", + "ext", + "log" + ] revision = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38" version = "v1.0.2" @@ -487,12 +641,20 @@ [[projects]] branch = "master" name = "github.com/pquerna/cachecontrol" - packages = [".","cacheobject"] + packages = [ + ".", + "cacheobject" + ] revision = "0dec1b30a0215bb68605dfc568e8855066c9202d" [[projects]] name = "github.com/prometheus/client_golang" - packages = ["api","api/prometheus/v1","prometheus","prometheus/promhttp"] + packages = [ + "api", + "api/prometheus/v1", + "prometheus", + "prometheus/promhttp" + ] revision = "967789050ba94deca04a5e84cce8ad472ce313c1" version = "v0.9.0-pre1" @@ -505,13 +667,20 @@ [[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 = "89604d197083d4781071d3c65855d24ecfb0a563" [[projects]] branch = "master" name = "github.com/prometheus/procfs" - packages = [".","xfs"] + packages = [ + ".", + "xfs" + ] revision = "b15cd069a83443be3154b719d0cc9fe8117f09fb" [[projects]] @@ -528,7 +697,10 @@ [[projects]] name = "github.com/spf13/cobra" - packages = [".","doc"] + packages = [ + ".", + "doc" + ] revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b" version = "v0.0.1" @@ -564,7 +736,19 @@ [[projects]] name = "github.com/uber/jaeger-client-go" - packages = [".","internal/baggage","internal/spanlog","log","thrift-gen/agent","thrift-gen/jaeger","thrift-gen/sampling","thrift-gen/zipkincore","transport","transport/zipkin","utils"] + packages = [ + ".", + "internal/baggage", + "internal/spanlog", + "log", + "thrift-gen/agent", + "thrift-gen/jaeger", + "thrift-gen/sampling", + "thrift-gen/zipkincore", + "transport", + "transport/zipkin", + "utils" + ] revision = "f54d8ece0a66e3db6a9247e946eb1e2bd79029ea" version = "v2.11.1" @@ -588,26 +772,58 @@ [[projects]] name = "go.uber.org/zap" - packages = [".","buffer","internal/bufferpool","internal/color","internal/exit","zapcore","zapgrpc"] + packages = [ + ".", + "buffer", + "internal/bufferpool", + "internal/color", + "internal/exit", + "zapcore", + "zapgrpc" + ] revision = "35aad584952c3e7020db7b839f6b102de6271f89" version = "v1.7.1" [[projects]] branch = "master" name = "golang.org/x/crypto" - packages = ["ed25519","ed25519/internal/edwards25519","pbkdf2","scrypt","ssh/terminal"] + packages = [ + "ed25519", + "ed25519/internal/edwards25519", + "pbkdf2", + "scrypt", + "ssh/terminal" + ] revision = "5f55bce93ad2c89f411e009659bb1fd83da36e7b" [[projects]] branch = "master" name = "golang.org/x/net" - packages = ["context","context/ctxhttp","html","html/atom","html/charset","http2","http2/hpack","idna","internal/timeseries","lex/httplex","trace"] + packages = [ + "context", + "context/ctxhttp", + "html", + "html/atom", + "html/charset", + "http2", + "http2/hpack", + "idna", + "internal/timeseries", + "lex/httplex", + "trace" + ] revision = "ab555f366c4508dbe0802550b1b20c46c5c18aa0" [[projects]] branch = "master" name = "golang.org/x/oauth2" - packages = [".","google","internal","jws","jwt"] + packages = [ + ".", + "google", + "internal", + "jws", + "jwt" + ] revision = "30785a2c434e431ef7c507b54617d6a951d5f2b4" [[projects]] @@ -619,13 +835,44 @@ [[projects]] branch = "master" name = "golang.org/x/sys" - packages = ["unix","windows"] + packages = [ + "unix", + "windows" + ] revision = "810d7000345868fc619eb81f46307107118f4ae1" [[projects]] branch = "master" name = "golang.org/x/text" - packages = ["collate","collate/build","encoding","encoding/charmap","encoding/htmlindex","encoding/internal","encoding/internal/identifier","encoding/japanese","encoding/korean","encoding/simplifiedchinese","encoding/traditionalchinese","encoding/unicode","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","internal/utf8internal","language","runes","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable","width"] + packages = [ + "collate", + "collate/build", + "encoding", + "encoding/charmap", + "encoding/htmlindex", + "encoding/internal", + "encoding/internal/identifier", + "encoding/japanese", + "encoding/korean", + "encoding/simplifiedchinese", + "encoding/traditionalchinese", + "encoding/unicode", + "internal/colltab", + "internal/gen", + "internal/tag", + "internal/triegen", + "internal/ucd", + "internal/utf8internal", + "language", + "runes", + "secure/bidirule", + "transform", + "unicode/bidi", + "unicode/cldr", + "unicode/norm", + "unicode/rangetable", + "width" + ] revision = "e19ae1496984b1c655b8044a65c0300a3c878dd3" [[projects]] @@ -637,30 +884,98 @@ [[projects]] branch = "master" name = "golang.org/x/tools" - packages = ["go/ast/astutil","imports"] + packages = [ + "go/ast/astutil", + "imports" + ] revision = "fbec762f837dc349b73d1eaa820552e2ad177942" [[projects]] branch = "master" name = "google.golang.org/api" - packages = ["gensupport","googleapi","googleapi/internal/uritemplates","googleapi/transport","internal","iterator","option","servicecontrol/v1","storage/v1","support/bundler","transport","transport/grpc","transport/http"] + packages = [ + "gensupport", + "googleapi", + "googleapi/internal/uritemplates", + "googleapi/transport", + "internal", + "iterator", + "option", + "servicecontrol/v1", + "storage/v1", + "support/bundler", + "transport", + "transport/grpc", + "transport/http" + ] revision = "d2c53ea20b719a26e291430d99eaaf6c9a8eb68c" [[projects]] name = "google.golang.org/appengine" - packages = [".","internal","internal/app_identity","internal/base","internal/datastore","internal/log","internal/modules","internal/remote_api","internal/socket","internal/urlfetch","socket","urlfetch"] + packages = [ + ".", + "internal", + "internal/app_identity", + "internal/base", + "internal/datastore", + "internal/log", + "internal/modules", + "internal/remote_api", + "internal/socket", + "internal/urlfetch", + "socket", + "urlfetch" + ] revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a" version = "v1.0.0" [[projects]] branch = "master" name = "google.golang.org/genproto" - packages = ["googleapis/api/annotations","googleapis/api/distribution","googleapis/api/label","googleapis/api/metric","googleapis/api/monitoredres","googleapis/iam/v1","googleapis/logging/type","googleapis/logging/v2","googleapis/monitoring/v3","googleapis/rpc/status","protobuf/field_mask"] + packages = [ + "googleapis/api/annotations", + "googleapis/api/distribution", + "googleapis/api/label", + "googleapis/api/metric", + "googleapis/api/monitoredres", + "googleapis/iam/v1", + "googleapis/logging/type", + "googleapis/logging/v2", + "googleapis/monitoring/v3", + "googleapis/rpc/status", + "protobuf/field_mask" + ] revision = "a8101f21cf983e773d0c1133ebc5424792003214" [[projects]] name = "google.golang.org/grpc" - packages = [".","balancer","balancer/base","balancer/roundrobin","codes","connectivity","credentials","credentials/oauth","encoding","grpclb/grpc_lb_v1/messages","grpclog","internal","keepalive","metadata","naming","peer","reflection","reflection/grpc_reflection_v1alpha","resolver","resolver/dns","resolver/passthrough","stats","status","tap","transport"] + packages = [ + ".", + "balancer", + "balancer/base", + "balancer/roundrobin", + "codes", + "connectivity", + "credentials", + "credentials/oauth", + "encoding", + "grpclb/grpc_lb_v1/messages", + "grpclog", + "internal", + "keepalive", + "metadata", + "naming", + "peer", + "reflection", + "reflection/grpc_reflection_v1alpha", + "resolver", + "resolver/dns", + "resolver/passthrough", + "stats", + "status", + "tap", + "transport" + ] revision = "7cea4cc846bcf00cbb27595b07da5de875ef7de9" version = "v1.9.1" @@ -672,7 +987,11 @@ [[projects]] name = "gopkg.in/square/go-jose.v2" - packages = [".","cipher","json"] + packages = [ + ".", + "cipher", + "json" + ] revision = "f8f38de21b4dcd69d0413faf231983f5fd6634b1" version = "v2.1.3" @@ -690,13 +1009,28 @@ [[projects]] name = "istio.io/api" - packages = ["broker/v1/config","mesh/v1alpha1","mixer/v1","mixer/v1/config/client","mixer/v1/config/descriptor","mixer/v1/template","routing/v1alpha1","routing/v1alpha2"] + packages = [ + "broker/v1/config", + "mesh/v1alpha1", + "mixer/v1", + "mixer/v1/config/client", + "mixer/v1/config/descriptor", + "mixer/v1/template", + "routing/v1alpha1", + "routing/v1alpha2" + ] revision = "ba8e7cab9e80a538014df6aa8676b98d398b9779" [[projects]] name = "istio.io/fortio" - packages = ["fhttp","log","periodic","stats"] - revision = "6684bc54abfa793ee4beffe8b2a5b9ec83c782e3" + packages = [ + "fhttp", + "log", + "periodic", + "stats" + ] + revision = "488e250df2f081576d999eb96f1529adc316f735" + version = "v0.6.1" [[projects]] branch = "master" @@ -707,48 +1041,240 @@ [[projects]] branch = "release-1.9" name = "k8s.io/api" - packages = ["admission/v1beta1","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"] + packages = [ + "admission/v1beta1", + "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 = "006a217681ae70cbacdd66a5e2fca1a61a8ff28e" [[projects]] branch = "release-1.9" name = "k8s.io/apiextensions-apiserver" - packages = ["pkg/apis/apiextensions","pkg/apis/apiextensions/v1beta1","pkg/client/clientset/clientset","pkg/client/clientset/clientset/scheme","pkg/client/clientset/clientset/typed/apiextensions/v1beta1"] + packages = [ + "pkg/apis/apiextensions", + "pkg/apis/apiextensions/v1beta1", + "pkg/client/clientset/clientset", + "pkg/client/clientset/clientset/scheme", + "pkg/client/clientset/clientset/typed/apiextensions/v1beta1" + ] revision = "6f29dd12234812844d29f52bd520bb01374619ce" [[projects]] branch = "release-1.9" name = "k8s.io/apimachinery" - 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/mergepatch","pkg/util/net","pkg/util/runtime","pkg/util/sets","pkg/util/strategicpatch","pkg/util/uuid","pkg/util/validation","pkg/util/validation/field","pkg/util/wait","pkg/util/yaml","pkg/version","pkg/watch","third_party/forked/golang/json","third_party/forked/golang/reflect"] + 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/mergepatch", + "pkg/util/net", + "pkg/util/runtime", + "pkg/util/sets", + "pkg/util/strategicpatch", + "pkg/util/uuid", + "pkg/util/validation", + "pkg/util/validation/field", + "pkg/util/wait", + "pkg/util/yaml", + "pkg/version", + "pkg/watch", + "third_party/forked/golang/json", + "third_party/forked/golang/reflect" + ] revision = "68f9c3a1feb3140df59c67ced62d3a5df8e6c9c2" [[projects]] branch = "release-6.0" name = "k8s.io/client-go" - packages = ["discovery","discovery/fake","dynamic","kubernetes","kubernetes/fake","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","kubernetes/typed/apps/v1beta2/fake","kubernetes/typed/authentication/v1","kubernetes/typed/authentication/v1/fake","kubernetes/typed/authentication/v1beta1","kubernetes/typed/authentication/v1beta1/fake","kubernetes/typed/authorization/v1","kubernetes/typed/authorization/v1/fake","kubernetes/typed/authorization/v1beta1","kubernetes/typed/authorization/v1beta1/fake","kubernetes/typed/autoscaling/v1","kubernetes/typed/autoscaling/v1/fake","kubernetes/typed/autoscaling/v2beta1","kubernetes/typed/autoscaling/v2beta1/fake","kubernetes/typed/batch/v1","kubernetes/typed/batch/v1/fake","kubernetes/typed/batch/v1beta1","kubernetes/typed/batch/v1beta1/fake","kubernetes/typed/batch/v2alpha1","kubernetes/typed/batch/v2alpha1/fake","kubernetes/typed/certificates/v1beta1","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","kubernetes/typed/networking/v1/fake","kubernetes/typed/policy/v1beta1","kubernetes/typed/policy/v1beta1/fake","kubernetes/typed/rbac/v1","kubernetes/typed/rbac/v1/fake","kubernetes/typed/rbac/v1alpha1","kubernetes/typed/rbac/v1alpha1/fake","kubernetes/typed/rbac/v1beta1","kubernetes/typed/rbac/v1beta1/fake","kubernetes/typed/scheduling/v1alpha1","kubernetes/typed/scheduling/v1alpha1/fake","kubernetes/typed/settings/v1alpha1","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","plugin/pkg/client/auth","plugin/pkg/client/auth/azure","plugin/pkg/client/auth/gcp","plugin/pkg/client/auth/oidc","plugin/pkg/client/auth/openstack","rest","rest/watch","testing","third_party/forked/golang/template","tools/auth","tools/cache","tools/clientcmd","tools/clientcmd/api","tools/clientcmd/api/latest","tools/clientcmd/api/v1","tools/leaderelection","tools/leaderelection/resourcelock","tools/metrics","tools/pager","tools/record","tools/reference","transport","util/buffer","util/cert","util/flowcontrol","util/homedir","util/integer","util/jsonpath","util/workqueue"] + packages = [ + "discovery", + "discovery/fake", + "dynamic", + "kubernetes", + "kubernetes/fake", + "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", + "kubernetes/typed/apps/v1beta2/fake", + "kubernetes/typed/authentication/v1", + "kubernetes/typed/authentication/v1/fake", + "kubernetes/typed/authentication/v1beta1", + "kubernetes/typed/authentication/v1beta1/fake", + "kubernetes/typed/authorization/v1", + "kubernetes/typed/authorization/v1/fake", + "kubernetes/typed/authorization/v1beta1", + "kubernetes/typed/authorization/v1beta1/fake", + "kubernetes/typed/autoscaling/v1", + "kubernetes/typed/autoscaling/v1/fake", + "kubernetes/typed/autoscaling/v2beta1", + "kubernetes/typed/autoscaling/v2beta1/fake", + "kubernetes/typed/batch/v1", + "kubernetes/typed/batch/v1/fake", + "kubernetes/typed/batch/v1beta1", + "kubernetes/typed/batch/v1beta1/fake", + "kubernetes/typed/batch/v2alpha1", + "kubernetes/typed/batch/v2alpha1/fake", + "kubernetes/typed/certificates/v1beta1", + "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", + "kubernetes/typed/networking/v1/fake", + "kubernetes/typed/policy/v1beta1", + "kubernetes/typed/policy/v1beta1/fake", + "kubernetes/typed/rbac/v1", + "kubernetes/typed/rbac/v1/fake", + "kubernetes/typed/rbac/v1alpha1", + "kubernetes/typed/rbac/v1alpha1/fake", + "kubernetes/typed/rbac/v1beta1", + "kubernetes/typed/rbac/v1beta1/fake", + "kubernetes/typed/scheduling/v1alpha1", + "kubernetes/typed/scheduling/v1alpha1/fake", + "kubernetes/typed/settings/v1alpha1", + "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", + "plugin/pkg/client/auth", + "plugin/pkg/client/auth/azure", + "plugin/pkg/client/auth/gcp", + "plugin/pkg/client/auth/oidc", + "plugin/pkg/client/auth/openstack", + "rest", + "rest/watch", + "testing", + "third_party/forked/golang/template", + "tools/auth", + "tools/cache", + "tools/clientcmd", + "tools/clientcmd/api", + "tools/clientcmd/api/latest", + "tools/clientcmd/api/v1", + "tools/leaderelection", + "tools/leaderelection/resourcelock", + "tools/metrics", + "tools/pager", + "tools/record", + "tools/reference", + "transport", + "util/buffer", + "util/cert", + "util/flowcontrol", + "util/homedir", + "util/integer", + "util/jsonpath", + "util/workqueue" + ] revision = "9389c055a838d4f208b699b3c7c51b70f2368861" [[projects]] name = "k8s.io/helm" - packages = ["pkg/chartutil","pkg/engine","pkg/ignore","pkg/proto/hapi/chart","pkg/proto/hapi/version","pkg/timeconv","pkg/version"] + packages = [ + "pkg/chartutil", + "pkg/engine", + "pkg/ignore", + "pkg/proto/hapi/chart", + "pkg/proto/hapi/version", + "pkg/timeconv", + "pkg/version" + ] revision = "8478fb4fc723885b155c924d1c8c410b7a9444e6" version = "v2.7.2" [[projects]] name = "k8s.io/ingress" - packages = ["core/pkg/ingress/annotations/class","core/pkg/ingress/annotations/parser","core/pkg/ingress/errors","core/pkg/ingress/status","core/pkg/ingress/store","core/pkg/k8s","core/pkg/strings","core/pkg/task"] + packages = [ + "core/pkg/ingress/annotations/class", + "core/pkg/ingress/annotations/parser", + "core/pkg/ingress/errors", + "core/pkg/ingress/status", + "core/pkg/ingress/store", + "core/pkg/k8s", + "core/pkg/strings", + "core/pkg/task" + ] revision = "fe19ebb09ee22f90d60ba3111ae0a9db6027e675" version = "0.9.6" [[projects]] branch = "master" name = "k8s.io/kube-openapi" - packages = ["pkg/common","pkg/util/proto"] + packages = [ + "pkg/common", + "pkg/util/proto" + ] revision = "a07b7bbb58e7fdc5144f8d7046331d29fc9ad3b3" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "83aa23f3220905091881412201d522ef42ad7142904f66cae8ffb17ebcb45632" + inputs-digest = "e778266c122811c8f228a4258e6a5ff3d06cb4838c14c37880c136f39ed10c9b" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 4fb79604c8b1..594b9cc87c83 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -105,17 +105,16 @@ required = [ name = "github.com/apache/thrift" version = ">=0.9.3, <0.11.0" +[[constraint]] + name = "istio.io/fortio" + version = ">= v0.6.1" + ### DO NOT PIN these repos to master. It will result in inconsistent builds in circleci ### as we cache dep ensure. [[constraint]] name = "istio.io/api" revision = "ba8e7cab9e80a538014df6aa8676b98d398b9779" -[[constraint]] - name = "istio.io/fortio" - revision = "6684bc54abfa793ee4beffe8b2a5b9ec83c782e3" - - ### Begin Mixer codegen dep pinning [[override]] diff --git a/istio.VERSION b/istio.VERSION index 4e09acd97e5d..1fc35809beed 100644 --- a/istio.VERSION +++ b/istio.VERSION @@ -13,6 +13,6 @@ export AUTH_DEBIAN_URL="https://storage.googleapis.com/istio-artifacts/auth/d10e export PILOT_DEBIAN_URL="https://storage.googleapis.com/istio-artifacts/pilot/3101ea9d82a5f83b699c2d3245b371a19fa6bef4/artifacts/debs" export PROXY_DEBIAN_URL="https://storage.googleapis.com/istio-artifacts/proxy/2458e4e27bc588df858711b66de0970183e0cf66/artifacts/debs" export FORTIO_HUB="docker.io/istio" -export FORTIO_TAG="0.4.2" +export FORTIO_TAG="0.6.1" export HYPERKUBE_HUB="quay.io/coreos/hyperkube" export HYPERKUBE_TAG="v1.7.6_coreos.0" From d74cfdc79af08eef7c5ba6e986885c179e3fe0c6 Mon Sep 17 00:00:00 2001 From: Laurent Demailly Date: Fri, 12 Jan 2018 22:22:39 -0800 Subject: [PATCH 2/2] Rerun dep ensure post master revert Tried ``` dep ensure --update istio.io/fortio Warning: Gopkg.lock is out of sync with Gopkg.toml or the project's imports. ``` But it did change everything in the lock file anyway --- Gopkg.lock | 614 ++++++++++++++++++++++++++++++++++++++++++++++---- Gopkg.toml | 2 +- istio.VERSION | 2 +- 3 files changed, 569 insertions(+), 49 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 66692c12e481..217d7f4aaf22 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -3,18 +3,38 @@ [[projects]] name = "cloud.google.com/go" - packages = ["compute/metadata","iam","internal","internal/optional","internal/version","logging","logging/apiv2","logging/internal","monitoring/apiv3","storage"] + packages = [ + "compute/metadata", + "iam", + "internal", + "internal/optional", + "internal/version", + "logging", + "logging/apiv2", + "logging/internal", + "monitoring/apiv3", + "storage" + ] revision = "050b16d2314d5fc3d4c9a51e4cd5c7468e77f162" version = "v0.17.0" [[projects]] name = "code.cloudfoundry.org/copilot" - packages = [".","api","testhelpers"] + packages = [ + ".", + "api", + "testhelpers" + ] revision = "b311fd6188b8f4f75cfe4c692692732e06b74fc3" [[projects]] name = "github.com/Azure/go-autorest" - packages = ["autorest","autorest/adal","autorest/azure","autorest/date"] + packages = [ + "autorest", + "autorest/adal", + "autorest/azure", + "autorest/date" + ] revision = "6311d7a76f54cf2b6dea03d737d9bd9a6022ac5f" version = "v9.7.1" @@ -62,7 +82,32 @@ [[projects]] name = "github.com/aws/aws-sdk-go" - packages = ["aws","aws/awserr","aws/awsutil","aws/client","aws/client/metadata","aws/corehandlers","aws/credentials","aws/credentials/ec2rolecreds","aws/credentials/endpointcreds","aws/credentials/stscreds","aws/defaults","aws/ec2metadata","aws/endpoints","aws/request","aws/session","aws/signer/v4","awstesting/unit","internal/shareddefaults","private/protocol","private/protocol/query","private/protocol/query/queryutil","private/protocol/rest","private/protocol/xml/xmlutil","service/sts"] + packages = [ + "aws", + "aws/awserr", + "aws/awsutil", + "aws/client", + "aws/client/metadata", + "aws/corehandlers", + "aws/credentials", + "aws/credentials/ec2rolecreds", + "aws/credentials/endpointcreds", + "aws/credentials/stscreds", + "aws/defaults", + "aws/ec2metadata", + "aws/endpoints", + "aws/request", + "aws/session", + "aws/signer/v4", + "awstesting/unit", + "internal/shareddefaults", + "private/protocol", + "private/protocol/query", + "private/protocol/query/queryutil", + "private/protocol/rest", + "private/protocol/xml/xmlutil", + "service/sts" + ] revision = "3c754f1d340244540350f0a00b940781bae9c905" version = "v1.12.59" @@ -74,13 +119,21 @@ [[projects]] name = "github.com/cactus/go-statsd-client" - packages = ["statsd","statsd/statsdtest"] + packages = [ + "statsd", + "statsd/statsdtest" + ] revision = "91c326c3f7bd20f0226d3d1c289dd9f8ce28d33d" version = "v3.1.0" [[projects]] name = "github.com/circonus-labs/circonus-gometrics" - packages = [".","api","api/config","checkmgr"] + packages = [ + ".", + "api", + "api/config", + "checkmgr" + ] revision = "b25d14eeef390159289ad3e8521eff3162c59685" version = "v2.1.0" @@ -128,7 +181,10 @@ [[projects]] name = "github.com/emicklei/go-restful" - packages = [".","log"] + packages = [ + ".", + "log" + ] revision = "5741799b275a3c4a5a9623a993576d7545cf7b5c" version = "v2.4.0" @@ -182,13 +238,51 @@ [[projects]] name = "github.com/gobwas/glob" - packages = [".","compiler","match","syntax","syntax/ast","syntax/lexer","util/runes","util/strings"] + packages = [ + ".", + "compiler", + "match", + "syntax", + "syntax/ast", + "syntax/lexer", + "util/runes", + "util/strings" + ] revision = "bea32b9cd2d6f55753d94a28e959b13f0244797a" version = "v0.2.2" [[projects]] name = "github.com/gogo/protobuf" - packages = ["gogoproto","jsonpb","plugin/compare","plugin/defaultcheck","plugin/description","plugin/embedcheck","plugin/enumstringer","plugin/equal","plugin/face","plugin/gostring","plugin/marshalto","plugin/oneofcheck","plugin/populate","plugin/size","plugin/stringer","plugin/testgen","plugin/union","plugin/unmarshal","proto","protoc-gen-gogo/descriptor","protoc-gen-gogo/generator","protoc-gen-gogo/grpc","protoc-gen-gogo/plugin","protoc-gen-gogoslick","sortkeys","types","vanity","vanity/command"] + packages = [ + "gogoproto", + "jsonpb", + "plugin/compare", + "plugin/defaultcheck", + "plugin/description", + "plugin/embedcheck", + "plugin/enumstringer", + "plugin/equal", + "plugin/face", + "plugin/gostring", + "plugin/marshalto", + "plugin/oneofcheck", + "plugin/populate", + "plugin/size", + "plugin/stringer", + "plugin/testgen", + "plugin/union", + "plugin/unmarshal", + "proto", + "protoc-gen-gogo/descriptor", + "protoc-gen-gogo/generator", + "protoc-gen-gogo/grpc", + "protoc-gen-gogo/plugin", + "protoc-gen-gogoslick", + "sortkeys", + "types", + "vanity", + "vanity/command" + ] revision = "342cbe0a04158f6dcb03ca0079991a51a4248c02" version = "v0.5" @@ -207,7 +301,18 @@ [[projects]] branch = "master" name = "github.com/golang/protobuf" - packages = ["jsonpb","proto","protoc-gen-go/descriptor","ptypes","ptypes/any","ptypes/duration","ptypes/empty","ptypes/struct","ptypes/timestamp","ptypes/wrappers"] + packages = [ + "jsonpb", + "proto", + "protoc-gen-go/descriptor", + "ptypes", + "ptypes/any", + "ptypes/duration", + "ptypes/empty", + "ptypes/struct", + "ptypes/timestamp", + "ptypes/wrappers" + ] revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845" [[projects]] @@ -254,14 +359,26 @@ [[projects]] name = "github.com/googleapis/gnostic" - packages = ["OpenAPIv2","compiler","extensions"] + packages = [ + "OpenAPIv2", + "compiler", + "extensions" + ] revision = "ee43cbb60db7bd22502942cccbc39059117352ab" version = "v0.1.0" [[projects]] branch = "master" name = "github.com/gophercloud/gophercloud" - packages = [".","openstack","openstack/identity/v2/tenants","openstack/identity/v2/tokens","openstack/identity/v3/tokens","openstack/utils","pagination"] + packages = [ + ".", + "openstack", + "openstack/identity/v2/tenants", + "openstack/identity/v2/tokens", + "openstack/identity/v3/tokens", + "openstack/utils", + "pagination" + ] revision = "993bca9e3fac8efeaa6cfe74b0b7b00468d8fcf5" [[projects]] @@ -285,7 +402,10 @@ [[projects]] branch = "master" name = "github.com/gregjones/httpcache" - packages = [".","diskcache"] + packages = [ + ".", + "diskcache" + ] revision = "2bcd89a1743fd4b373f7370ce8ddc14dfbd18229" [[projects]] @@ -345,7 +465,10 @@ [[projects]] branch = "master" name = "github.com/hashicorp/golang-lru" - packages = [".","simplelru"] + packages = [ + ".", + "simplelru" + ] revision = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6" [[projects]] @@ -404,7 +527,11 @@ [[projects]] branch = "master" name = "github.com/mailru/easyjson" - packages = ["buffer","jlexer","jwriter"] + packages = [ + "buffer", + "jlexer", + "jwriter" + ] revision = "32fa128f234d041f196a9f3e0fea5ac9772c08e1" [[projects]] @@ -433,18 +560,45 @@ [[projects]] name = "github.com/onsi/gomega" - packages = [".","format","internal/assertion","internal/asyncassertion","internal/oraclematcher","internal/testingtsupport","matchers","matchers/support/goraph/bipartitegraph","matchers/support/goraph/edge","matchers/support/goraph/node","matchers/support/goraph/util","types"] + packages = [ + ".", + "format", + "internal/assertion", + "internal/asyncassertion", + "internal/oraclematcher", + "internal/testingtsupport", + "matchers", + "matchers/support/goraph/bipartitegraph", + "matchers/support/goraph/edge", + "matchers/support/goraph/node", + "matchers/support/goraph/util", + "types" + ] revision = "ba3724c94e4dd5d5690d37c190f1c54b2c1b4e64" [[projects]] name = "github.com/open-policy-agent/opa" - packages = ["ast","metrics","rego","storage","storage/inmem","topdown","topdown/builtins","types","util"] + packages = [ + "ast", + "metrics", + "rego", + "storage", + "storage/inmem", + "topdown", + "topdown/builtins", + "types", + "util" + ] revision = "4b934006914c7964e89563d54bbfc63167922aa0" version = "v0.5.13" [[projects]] name = "github.com/opentracing/opentracing-go" - packages = [".","ext","log"] + packages = [ + ".", + "ext", + "log" + ] revision = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38" version = "v1.0.2" @@ -487,12 +641,20 @@ [[projects]] branch = "master" name = "github.com/pquerna/cachecontrol" - packages = [".","cacheobject"] + packages = [ + ".", + "cacheobject" + ] revision = "0dec1b30a0215bb68605dfc568e8855066c9202d" [[projects]] name = "github.com/prometheus/client_golang" - packages = ["api","api/prometheus/v1","prometheus","prometheus/promhttp"] + packages = [ + "api", + "api/prometheus/v1", + "prometheus", + "prometheus/promhttp" + ] revision = "967789050ba94deca04a5e84cce8ad472ce313c1" version = "v0.9.0-pre1" @@ -505,13 +667,20 @@ [[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 = "89604d197083d4781071d3c65855d24ecfb0a563" [[projects]] branch = "master" name = "github.com/prometheus/procfs" - packages = [".","xfs"] + packages = [ + ".", + "xfs" + ] revision = "b15cd069a83443be3154b719d0cc9fe8117f09fb" [[projects]] @@ -528,7 +697,10 @@ [[projects]] name = "github.com/spf13/cobra" - packages = [".","doc"] + packages = [ + ".", + "doc" + ] revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b" version = "v0.0.1" @@ -564,7 +736,19 @@ [[projects]] name = "github.com/uber/jaeger-client-go" - packages = [".","internal/baggage","internal/spanlog","log","thrift-gen/agent","thrift-gen/jaeger","thrift-gen/sampling","thrift-gen/zipkincore","transport","transport/zipkin","utils"] + packages = [ + ".", + "internal/baggage", + "internal/spanlog", + "log", + "thrift-gen/agent", + "thrift-gen/jaeger", + "thrift-gen/sampling", + "thrift-gen/zipkincore", + "transport", + "transport/zipkin", + "utils" + ] revision = "f54d8ece0a66e3db6a9247e946eb1e2bd79029ea" version = "v2.11.1" @@ -588,26 +772,58 @@ [[projects]] name = "go.uber.org/zap" - packages = [".","buffer","internal/bufferpool","internal/color","internal/exit","zapcore","zapgrpc"] + packages = [ + ".", + "buffer", + "internal/bufferpool", + "internal/color", + "internal/exit", + "zapcore", + "zapgrpc" + ] revision = "35aad584952c3e7020db7b839f6b102de6271f89" version = "v1.7.1" [[projects]] branch = "master" name = "golang.org/x/crypto" - packages = ["ed25519","ed25519/internal/edwards25519","pbkdf2","scrypt","ssh/terminal"] + packages = [ + "ed25519", + "ed25519/internal/edwards25519", + "pbkdf2", + "scrypt", + "ssh/terminal" + ] revision = "5f55bce93ad2c89f411e009659bb1fd83da36e7b" [[projects]] branch = "master" name = "golang.org/x/net" - packages = ["context","context/ctxhttp","html","html/atom","html/charset","http2","http2/hpack","idna","internal/timeseries","lex/httplex","trace"] + packages = [ + "context", + "context/ctxhttp", + "html", + "html/atom", + "html/charset", + "http2", + "http2/hpack", + "idna", + "internal/timeseries", + "lex/httplex", + "trace" + ] revision = "ab555f366c4508dbe0802550b1b20c46c5c18aa0" [[projects]] branch = "master" name = "golang.org/x/oauth2" - packages = [".","google","internal","jws","jwt"] + packages = [ + ".", + "google", + "internal", + "jws", + "jwt" + ] revision = "30785a2c434e431ef7c507b54617d6a951d5f2b4" [[projects]] @@ -619,13 +835,44 @@ [[projects]] branch = "master" name = "golang.org/x/sys" - packages = ["unix","windows"] + packages = [ + "unix", + "windows" + ] revision = "810d7000345868fc619eb81f46307107118f4ae1" [[projects]] branch = "master" name = "golang.org/x/text" - packages = ["collate","collate/build","encoding","encoding/charmap","encoding/htmlindex","encoding/internal","encoding/internal/identifier","encoding/japanese","encoding/korean","encoding/simplifiedchinese","encoding/traditionalchinese","encoding/unicode","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","internal/utf8internal","language","runes","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable","width"] + packages = [ + "collate", + "collate/build", + "encoding", + "encoding/charmap", + "encoding/htmlindex", + "encoding/internal", + "encoding/internal/identifier", + "encoding/japanese", + "encoding/korean", + "encoding/simplifiedchinese", + "encoding/traditionalchinese", + "encoding/unicode", + "internal/colltab", + "internal/gen", + "internal/tag", + "internal/triegen", + "internal/ucd", + "internal/utf8internal", + "language", + "runes", + "secure/bidirule", + "transform", + "unicode/bidi", + "unicode/cldr", + "unicode/norm", + "unicode/rangetable", + "width" + ] revision = "e19ae1496984b1c655b8044a65c0300a3c878dd3" [[projects]] @@ -637,30 +884,98 @@ [[projects]] branch = "master" name = "golang.org/x/tools" - packages = ["go/ast/astutil","imports"] + packages = [ + "go/ast/astutil", + "imports" + ] revision = "fbec762f837dc349b73d1eaa820552e2ad177942" [[projects]] branch = "master" name = "google.golang.org/api" - packages = ["gensupport","googleapi","googleapi/internal/uritemplates","googleapi/transport","internal","iterator","option","servicecontrol/v1","storage/v1","support/bundler","transport","transport/grpc","transport/http"] + packages = [ + "gensupport", + "googleapi", + "googleapi/internal/uritemplates", + "googleapi/transport", + "internal", + "iterator", + "option", + "servicecontrol/v1", + "storage/v1", + "support/bundler", + "transport", + "transport/grpc", + "transport/http" + ] revision = "d2c53ea20b719a26e291430d99eaaf6c9a8eb68c" [[projects]] name = "google.golang.org/appengine" - packages = [".","internal","internal/app_identity","internal/base","internal/datastore","internal/log","internal/modules","internal/remote_api","internal/socket","internal/urlfetch","socket","urlfetch"] + packages = [ + ".", + "internal", + "internal/app_identity", + "internal/base", + "internal/datastore", + "internal/log", + "internal/modules", + "internal/remote_api", + "internal/socket", + "internal/urlfetch", + "socket", + "urlfetch" + ] revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a" version = "v1.0.0" [[projects]] branch = "master" name = "google.golang.org/genproto" - packages = ["googleapis/api/annotations","googleapis/api/distribution","googleapis/api/label","googleapis/api/metric","googleapis/api/monitoredres","googleapis/iam/v1","googleapis/logging/type","googleapis/logging/v2","googleapis/monitoring/v3","googleapis/rpc/status","protobuf/field_mask"] + packages = [ + "googleapis/api/annotations", + "googleapis/api/distribution", + "googleapis/api/label", + "googleapis/api/metric", + "googleapis/api/monitoredres", + "googleapis/iam/v1", + "googleapis/logging/type", + "googleapis/logging/v2", + "googleapis/monitoring/v3", + "googleapis/rpc/status", + "protobuf/field_mask" + ] revision = "a8101f21cf983e773d0c1133ebc5424792003214" [[projects]] name = "google.golang.org/grpc" - packages = [".","balancer","balancer/base","balancer/roundrobin","codes","connectivity","credentials","credentials/oauth","encoding","grpclb/grpc_lb_v1/messages","grpclog","internal","keepalive","metadata","naming","peer","reflection","reflection/grpc_reflection_v1alpha","resolver","resolver/dns","resolver/passthrough","stats","status","tap","transport"] + packages = [ + ".", + "balancer", + "balancer/base", + "balancer/roundrobin", + "codes", + "connectivity", + "credentials", + "credentials/oauth", + "encoding", + "grpclb/grpc_lb_v1/messages", + "grpclog", + "internal", + "keepalive", + "metadata", + "naming", + "peer", + "reflection", + "reflection/grpc_reflection_v1alpha", + "resolver", + "resolver/dns", + "resolver/passthrough", + "stats", + "status", + "tap", + "transport" + ] revision = "7cea4cc846bcf00cbb27595b07da5de875ef7de9" version = "v1.9.1" @@ -672,7 +987,11 @@ [[projects]] name = "gopkg.in/square/go-jose.v2" - packages = [".","cipher","json"] + packages = [ + ".", + "cipher", + "json" + ] revision = "f8f38de21b4dcd69d0413faf231983f5fd6634b1" version = "v2.1.3" @@ -690,7 +1009,16 @@ [[projects]] name = "istio.io/api" - packages = ["broker/v1/config","mesh/v1alpha1","mixer/v1","mixer/v1/config/client","mixer/v1/config/descriptor","mixer/v1/template","routing/v1alpha1","routing/v1alpha2"] + packages = [ + "broker/v1/config", + "mesh/v1alpha1", + "mixer/v1", + "mixer/v1/config/client", + "mixer/v1/config/descriptor", + "mixer/v1/template", + "routing/v1alpha1", + "routing/v1alpha2" + ] revision = "ba8e7cab9e80a538014df6aa8676b98d398b9779" [[projects]] @@ -701,8 +1029,8 @@ "periodic", "stats" ] - revision = "488e250df2f081576d999eb96f1529adc316f735" - version = "v0.6.1" + revision = "19635c4d749c06541f8202734992a243ef09db70" + version = "v0.6.2" [[projects]] branch = "master" @@ -713,48 +1041,240 @@ [[projects]] branch = "release-1.9" name = "k8s.io/api" - packages = ["admission/v1beta1","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"] + packages = [ + "admission/v1beta1", + "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 = "006a217681ae70cbacdd66a5e2fca1a61a8ff28e" [[projects]] branch = "release-1.9" name = "k8s.io/apiextensions-apiserver" - packages = ["pkg/apis/apiextensions","pkg/apis/apiextensions/v1beta1","pkg/client/clientset/clientset","pkg/client/clientset/clientset/scheme","pkg/client/clientset/clientset/typed/apiextensions/v1beta1"] + packages = [ + "pkg/apis/apiextensions", + "pkg/apis/apiextensions/v1beta1", + "pkg/client/clientset/clientset", + "pkg/client/clientset/clientset/scheme", + "pkg/client/clientset/clientset/typed/apiextensions/v1beta1" + ] revision = "6f29dd12234812844d29f52bd520bb01374619ce" [[projects]] branch = "release-1.9" name = "k8s.io/apimachinery" - 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/mergepatch","pkg/util/net","pkg/util/runtime","pkg/util/sets","pkg/util/strategicpatch","pkg/util/uuid","pkg/util/validation","pkg/util/validation/field","pkg/util/wait","pkg/util/yaml","pkg/version","pkg/watch","third_party/forked/golang/json","third_party/forked/golang/reflect"] + 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/mergepatch", + "pkg/util/net", + "pkg/util/runtime", + "pkg/util/sets", + "pkg/util/strategicpatch", + "pkg/util/uuid", + "pkg/util/validation", + "pkg/util/validation/field", + "pkg/util/wait", + "pkg/util/yaml", + "pkg/version", + "pkg/watch", + "third_party/forked/golang/json", + "third_party/forked/golang/reflect" + ] revision = "68f9c3a1feb3140df59c67ced62d3a5df8e6c9c2" [[projects]] branch = "release-6.0" name = "k8s.io/client-go" - packages = ["discovery","discovery/fake","dynamic","kubernetes","kubernetes/fake","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","kubernetes/typed/apps/v1beta2/fake","kubernetes/typed/authentication/v1","kubernetes/typed/authentication/v1/fake","kubernetes/typed/authentication/v1beta1","kubernetes/typed/authentication/v1beta1/fake","kubernetes/typed/authorization/v1","kubernetes/typed/authorization/v1/fake","kubernetes/typed/authorization/v1beta1","kubernetes/typed/authorization/v1beta1/fake","kubernetes/typed/autoscaling/v1","kubernetes/typed/autoscaling/v1/fake","kubernetes/typed/autoscaling/v2beta1","kubernetes/typed/autoscaling/v2beta1/fake","kubernetes/typed/batch/v1","kubernetes/typed/batch/v1/fake","kubernetes/typed/batch/v1beta1","kubernetes/typed/batch/v1beta1/fake","kubernetes/typed/batch/v2alpha1","kubernetes/typed/batch/v2alpha1/fake","kubernetes/typed/certificates/v1beta1","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","kubernetes/typed/networking/v1/fake","kubernetes/typed/policy/v1beta1","kubernetes/typed/policy/v1beta1/fake","kubernetes/typed/rbac/v1","kubernetes/typed/rbac/v1/fake","kubernetes/typed/rbac/v1alpha1","kubernetes/typed/rbac/v1alpha1/fake","kubernetes/typed/rbac/v1beta1","kubernetes/typed/rbac/v1beta1/fake","kubernetes/typed/scheduling/v1alpha1","kubernetes/typed/scheduling/v1alpha1/fake","kubernetes/typed/settings/v1alpha1","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","plugin/pkg/client/auth","plugin/pkg/client/auth/azure","plugin/pkg/client/auth/gcp","plugin/pkg/client/auth/oidc","plugin/pkg/client/auth/openstack","rest","rest/watch","testing","third_party/forked/golang/template","tools/auth","tools/cache","tools/clientcmd","tools/clientcmd/api","tools/clientcmd/api/latest","tools/clientcmd/api/v1","tools/leaderelection","tools/leaderelection/resourcelock","tools/metrics","tools/pager","tools/record","tools/reference","transport","util/buffer","util/cert","util/flowcontrol","util/homedir","util/integer","util/jsonpath","util/workqueue"] + packages = [ + "discovery", + "discovery/fake", + "dynamic", + "kubernetes", + "kubernetes/fake", + "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", + "kubernetes/typed/apps/v1beta2/fake", + "kubernetes/typed/authentication/v1", + "kubernetes/typed/authentication/v1/fake", + "kubernetes/typed/authentication/v1beta1", + "kubernetes/typed/authentication/v1beta1/fake", + "kubernetes/typed/authorization/v1", + "kubernetes/typed/authorization/v1/fake", + "kubernetes/typed/authorization/v1beta1", + "kubernetes/typed/authorization/v1beta1/fake", + "kubernetes/typed/autoscaling/v1", + "kubernetes/typed/autoscaling/v1/fake", + "kubernetes/typed/autoscaling/v2beta1", + "kubernetes/typed/autoscaling/v2beta1/fake", + "kubernetes/typed/batch/v1", + "kubernetes/typed/batch/v1/fake", + "kubernetes/typed/batch/v1beta1", + "kubernetes/typed/batch/v1beta1/fake", + "kubernetes/typed/batch/v2alpha1", + "kubernetes/typed/batch/v2alpha1/fake", + "kubernetes/typed/certificates/v1beta1", + "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", + "kubernetes/typed/networking/v1/fake", + "kubernetes/typed/policy/v1beta1", + "kubernetes/typed/policy/v1beta1/fake", + "kubernetes/typed/rbac/v1", + "kubernetes/typed/rbac/v1/fake", + "kubernetes/typed/rbac/v1alpha1", + "kubernetes/typed/rbac/v1alpha1/fake", + "kubernetes/typed/rbac/v1beta1", + "kubernetes/typed/rbac/v1beta1/fake", + "kubernetes/typed/scheduling/v1alpha1", + "kubernetes/typed/scheduling/v1alpha1/fake", + "kubernetes/typed/settings/v1alpha1", + "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", + "plugin/pkg/client/auth", + "plugin/pkg/client/auth/azure", + "plugin/pkg/client/auth/gcp", + "plugin/pkg/client/auth/oidc", + "plugin/pkg/client/auth/openstack", + "rest", + "rest/watch", + "testing", + "third_party/forked/golang/template", + "tools/auth", + "tools/cache", + "tools/clientcmd", + "tools/clientcmd/api", + "tools/clientcmd/api/latest", + "tools/clientcmd/api/v1", + "tools/leaderelection", + "tools/leaderelection/resourcelock", + "tools/metrics", + "tools/pager", + "tools/record", + "tools/reference", + "transport", + "util/buffer", + "util/cert", + "util/flowcontrol", + "util/homedir", + "util/integer", + "util/jsonpath", + "util/workqueue" + ] revision = "9389c055a838d4f208b699b3c7c51b70f2368861" [[projects]] name = "k8s.io/helm" - packages = ["pkg/chartutil","pkg/engine","pkg/ignore","pkg/proto/hapi/chart","pkg/proto/hapi/version","pkg/timeconv","pkg/version"] + packages = [ + "pkg/chartutil", + "pkg/engine", + "pkg/ignore", + "pkg/proto/hapi/chart", + "pkg/proto/hapi/version", + "pkg/timeconv", + "pkg/version" + ] revision = "8478fb4fc723885b155c924d1c8c410b7a9444e6" version = "v2.7.2" [[projects]] name = "k8s.io/ingress" - packages = ["core/pkg/ingress/annotations/class","core/pkg/ingress/annotations/parser","core/pkg/ingress/errors","core/pkg/ingress/status","core/pkg/ingress/store","core/pkg/k8s","core/pkg/strings","core/pkg/task"] + packages = [ + "core/pkg/ingress/annotations/class", + "core/pkg/ingress/annotations/parser", + "core/pkg/ingress/errors", + "core/pkg/ingress/status", + "core/pkg/ingress/store", + "core/pkg/k8s", + "core/pkg/strings", + "core/pkg/task" + ] revision = "fe19ebb09ee22f90d60ba3111ae0a9db6027e675" version = "0.9.6" [[projects]] branch = "master" name = "k8s.io/kube-openapi" - packages = ["pkg/common","pkg/util/proto"] + packages = [ + "pkg/common", + "pkg/util/proto" + ] revision = "a07b7bbb58e7fdc5144f8d7046331d29fc9ad3b3" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "e778266c122811c8f228a4258e6a5ff3d06cb4838c14c37880c136f39ed10c9b" + inputs-digest = "50d79483060442f7699dd134b8b38a2cdcb9ad523d5dcef5b0001296bb937084" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 594b9cc87c83..de5dff629a57 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -107,7 +107,7 @@ required = [ [[constraint]] name = "istio.io/fortio" - version = ">= v0.6.1" + version = ">= v0.6.2" ### DO NOT PIN these repos to master. It will result in inconsistent builds in circleci ### as we cache dep ensure. diff --git a/istio.VERSION b/istio.VERSION index 1fc35809beed..9f638050458e 100644 --- a/istio.VERSION +++ b/istio.VERSION @@ -13,6 +13,6 @@ export AUTH_DEBIAN_URL="https://storage.googleapis.com/istio-artifacts/auth/d10e export PILOT_DEBIAN_URL="https://storage.googleapis.com/istio-artifacts/pilot/3101ea9d82a5f83b699c2d3245b371a19fa6bef4/artifacts/debs" export PROXY_DEBIAN_URL="https://storage.googleapis.com/istio-artifacts/proxy/2458e4e27bc588df858711b66de0970183e0cf66/artifacts/debs" export FORTIO_HUB="docker.io/istio" -export FORTIO_TAG="0.6.1" +export FORTIO_TAG="0.6.2" export HYPERKUBE_HUB="quay.io/coreos/hyperkube" export HYPERKUBE_TAG="v1.7.6_coreos.0"