From 96c03b05523f58edc060dd7d3ebaf442f29a1a69 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Mon, 5 Jun 2017 15:56:06 -0700 Subject: [PATCH 1/2] Update libcalico-go to v1.3.0 --- glide.lock | 196 ++++++++++++++++-------------------- glide.yaml | 2 +- pkg/config/config_params.go | 3 +- 3 files changed, 89 insertions(+), 112 deletions(-) diff --git a/glide.lock b/glide.lock index faaf6369..45e10669 100644 --- a/glide.lock +++ b/glide.lock @@ -1,46 +1,29 @@ -hash: 0b53be95ca15901b4a24af69caf0448e71835a3c8789f0bb489737f88f542027 -updated: 2017-06-01T16:14:22.130373544Z +hash: e6ab1487475e8922e46786882266448807d004c6e83b4079d0f5ea39a4e53cf7 +updated: 2017-06-05T15:55:16.060857028-07:00 imports: -- name: cloud.google.com/go - version: 3b1ae45394a234c385be014e9a488f2bb6eef821 - subpackages: - - compute/metadata - - internal - name: github.com/beorn7/perks version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 subpackages: - quantile -- name: github.com/blang/semver - version: 31b736133b98f26d5e078ec9eb591666edfd091f - name: github.com/coreos/etcd - version: f03ed33c8705fbdf14af44319ea981ea2dafa6f4 + version: d267ca9c184e953554257d0acdd1dc9c47d38229 subpackages: - client + - pkg/fileutil - pkg/pathutil - - pkg/srv - pkg/tlsutil - pkg/transport - pkg/types - - version -- name: github.com/coreos/go-oidc - version: 5644a2f50e2d2d5ba0b474bc5bc55fea1925936d - subpackages: - - http - - jose - - key - - oauth2 - - oidc -- name: github.com/coreos/go-semver - version: 8ab6407b697782a06568d4b7f1db25550ec2e4c6 +- name: github.com/coreos/go-systemd + version: 48702e0da86bd25e76cfef347e2adeb434a0d0a6 subpackages: - - semver + - daemon + - journal + - util - name: github.com/coreos/pkg version: 3ac0863d7acf3bc44daf49afef8919af12f704ef subpackages: - capnslog - - health - - httputil - - timeutil - name: github.com/davecgh/go-spew version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d subpackages: @@ -53,16 +36,16 @@ imports: - name: github.com/docopt/docopt-go version: 784ddc588536785e7299f7272f39101f7faccc3f - name: github.com/emicklei/go-restful - version: 89ef8af493ab468a45a42bb0d89a06fccdd2fb22 + version: 09691a3b6378b740595c1002f40c34dd5f218a22 subpackages: - log - swagger - name: github.com/gavv/monotime version: 47d58efa69556a936a3c15eb2ed42706d968ab01 - name: github.com/ghodss/yaml - version: 0ca9ea5df5451ffdf184b4428c902747c2c11cd7 + version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee - name: github.com/go-ini/ini - version: 36da989cdc560b989d8f195aec46214d33665d20 + version: d3de07a94d22b4a0972deb4b96d790c2c0ce8333 - name: github.com/go-openapi/jsonpointer version: 46af16f9f7b149af66e5d1bd010e3574dc06de98 - name: github.com/go-openapi/jsonreference @@ -79,23 +62,21 @@ imports: - name: github.com/golang/glog version: 44145f04b68cf362d9c4df2182967c2275eaefed - name: github.com/golang/protobuf - version: 6e4cc92cc905d5f4a73041c1b8228ea08f4c6147 + version: 8616e8ee5e20a1704615e6c8d7afcdac06087a67 subpackages: - proto - name: github.com/google/gofuzz - version: bbcb9da2d746f8bdbd6a936686a0a6067ada0ec5 + version: 44d81051d367757e1c7c6a5a86423ece9afcf63c - name: github.com/howeyc/gopass version: 3ca23474a7c7203e0a0a070fd33508f6efdb9b3d - name: github.com/imdario/mergo version: 6633656539c1639d9d78127b7d47c622b5d7b6dc -- name: github.com/jonboulle/clockwork - version: 2eee05ed794112d45db504eb05aa693efd2b8b09 - name: github.com/juju/ratelimit version: 77ed1c8a01217656d2080ad51981f6e99adaa177 - name: github.com/kardianos/osext version: ae77be60afb1dcacde03767a8c37337fad28ac14 - name: github.com/kelseyhightower/envconfig - version: 70f0258d44cbaa3b6a2581d82f58da01a38e4de4 + version: 8bf4bbfc795e2c7c8a5ea47b707453ed019e2ad4 - name: github.com/mailru/easyjson version: d5b7844b561a7bc640052f1b935f7b800330d7e0 subpackages: @@ -129,8 +110,6 @@ imports: - reporters/stenographer/support/go-colorable - reporters/stenographer/support/go-isatty - types -- name: github.com/pborman/uuid - version: ca53cad383cad2479bbba7f7a1a05797ec1386e4 - name: github.com/projectcalico/go-json version: 6219dc7339ba20ee4c57df0a8baac62317d19cb1 subpackages: @@ -140,7 +119,7 @@ imports: - name: github.com/projectcalico/go-yaml-wrapper version: 598e54215bee41a19677faa4f0c32acd2a87eb56 - name: github.com/projectcalico/libcalico-go - version: aafc4f711b0f74563cd718833b5c3631e349f8c7 + version: 050be2ca2d8a88e2d429b4684b8666a48c42f7ae subpackages: - lib - lib/api @@ -154,6 +133,7 @@ imports: - lib/backend/k8s/thirdparty - lib/backend/model - lib/client + - lib/converter - lib/errors - lib/hash - lib/hwm @@ -190,9 +170,9 @@ imports: - name: github.com/PuerkitoBio/urlesc version: 5bd2802263f21d8788851d5305584c82a5c75d7e - name: github.com/satori/go.uuid - version: 5bf94b69c6b68ee1b541973bb8e1144db23a194b + version: b061729afc07e77a8aa4fad0a2fd840958f1942a - name: github.com/Sirupsen/logrus - version: 5e5dc898656f695e2a086b8e12559febbfc01562 + version: ba1b36c82c5e05c4f912a88eab0dcd91a171688f - name: github.com/spf13/pflag version: 08b1a584251b5b62f458943640fc8ebd4d50aaa5 - name: github.com/ugorji/go @@ -214,21 +194,13 @@ imports: version: 3da985ce5951d99de868be4385f21ea6c2b22f24 subpackages: - context - - context/ctxhttp - http2 - http2/hpack - idna - idna/ - lex/httplex -- name: golang.org/x/oauth2 - version: 3c3a985cb79f52a3190fbc056984415ca6763d01 - subpackages: - - google - - internal - - jws - - jwt - name: golang.org/x/sys - version: b90f89a1e7a9c1f6b918820b3daa7f08488c8594 + version: 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9 subpackages: - unix - name: golang.org/x/text @@ -245,18 +217,6 @@ imports: - unicode/bidi - unicode/norm - width -- name: google.golang.org/appengine - version: 4f7eeb5305a4ba1966344836ba4af9996b7b4e05 - subpackages: - - internal - - internal/app_identity - - internal/base - - internal/datastore - - internal/log - - internal/modules - - internal/remote_api - - internal/urlfetch - - urlfetch - name: gopkg.in/go-playground/validator.v8 version: 5f57d2222ad794d0dffb07e664ea05e2ee07d60c - name: gopkg.in/inf.v0 @@ -266,116 +226,129 @@ imports: subpackages: - patricia - name: gopkg.in/yaml.v2 - version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b + version: 53feefa2559fb8dfa8d81baad31be332c97d6c77 +- name: k8s.io/apimachinery + version: b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215 + subpackages: + - 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/conversion + - pkg/conversion/queryparams + - 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/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 - name: k8s.io/client-go - version: 243d8a9cb66a51ad8676157f79e71033b4014a2a + version: 4a3ab2f5be5177366f8206fd79ce55ca80e417fa subpackages: - discovery - kubernetes + - kubernetes/scheme - 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/v1alpha1 + - kubernetes/typed/certificates/v1beta1 - kubernetes/typed/core/v1 - kubernetes/typed/extensions/v1beta1 - 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/errors - pkg/api/install - pkg/api/meta - - pkg/api/resource - pkg/api/unversioned - pkg/api/v1 - - pkg/api/validation/path - - pkg/apimachinery - - pkg/apimachinery/announced - - pkg/apimachinery/registered - pkg/apis/apps - pkg/apis/apps/install - pkg/apis/apps/v1beta1 - pkg/apis/authentication - pkg/apis/authentication/install + - pkg/apis/authentication/v1 - pkg/apis/authentication/v1beta1 - pkg/apis/authorization - pkg/apis/authorization/install + - pkg/apis/authorization/v1 - pkg/apis/authorization/v1beta1 - pkg/apis/autoscaling - pkg/apis/autoscaling/install - pkg/apis/autoscaling/v1 + - pkg/apis/autoscaling/v2alpha1 - pkg/apis/batch - pkg/apis/batch/install - pkg/apis/batch/v1 - pkg/apis/batch/v2alpha1 - pkg/apis/certificates - pkg/apis/certificates/install - - pkg/apis/certificates/v1alpha1 + - pkg/apis/certificates/v1beta1 - pkg/apis/extensions - pkg/apis/extensions/install - pkg/apis/extensions/v1beta1 - - pkg/apis/meta/v1 - - pkg/apis/meta/v1/unstructured - pkg/apis/policy - pkg/apis/policy/install - pkg/apis/policy/v1beta1 - pkg/apis/rbac - pkg/apis/rbac/install - pkg/apis/rbac/v1alpha1 + - pkg/apis/rbac/v1beta1 + - pkg/apis/settings + - pkg/apis/settings/install + - pkg/apis/settings/v1alpha1 - pkg/apis/storage - pkg/apis/storage/install + - pkg/apis/storage/v1 - pkg/apis/storage/v1beta1 - - pkg/auth/user - - pkg/conversion - - pkg/conversion/queryparams - pkg/fields - - pkg/genericapiserver/openapi/common - - 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/third_party/forked/golang/reflect - - pkg/third_party/forked/golang/template - - pkg/types - pkg/util - - pkg/util/cert - - pkg/util/clock - - pkg/util/diff - - pkg/util/errors - - pkg/util/flowcontrol - - pkg/util/framer - - pkg/util/homedir - - pkg/util/integer - - pkg/util/intstr - - pkg/util/json - - pkg/util/jsonpath - - pkg/util/labels - - pkg/util/net - pkg/util/parsers - - pkg/util/rand - - pkg/util/runtime - - pkg/util/sets - - pkg/util/uuid - - pkg/util/validation - - pkg/util/validation/field - pkg/util/wait - - pkg/util/yaml - pkg/version - pkg/watch - - pkg/watch/versioned - - plugin/pkg/client/auth - - plugin/pkg/client/auth/gcp - - plugin/pkg/client/auth/oidc - rest + - rest/watch - tools/auth - tools/cache - tools/clientcmd @@ -384,6 +357,11 @@ imports: - tools/clientcmd/api/v1 - tools/metrics - transport + - util/cert + - util/clock + - util/flowcontrol + - util/homedir + - util/integer testImports: - name: github.com/onsi/gomega version: 9b8c753e8dfb382618ba8fa19b4197b5dcb0434c diff --git a/glide.yaml b/glide.yaml index 0365e656..9d4cbc50 100644 --- a/glide.yaml +++ b/glide.yaml @@ -22,7 +22,7 @@ import: - package: github.com/go-ini/ini version: ^1.21.0 - package: github.com/projectcalico/libcalico-go - version: v1.2.2 + version: v1.3.0 subpackages: - lib - package: github.com/Sirupsen/logrus diff --git a/pkg/config/config_params.go b/pkg/config/config_params.go index 98584754..58a3b210 100644 --- a/pkg/config/config_params.go +++ b/pkg/config/config_params.go @@ -27,7 +27,6 @@ import ( "time" "github.com/projectcalico/libcalico-go/lib/api" - "github.com/projectcalico/libcalico-go/lib/backend/etcd" "github.com/projectcalico/libcalico-go/lib/client" ) @@ -255,7 +254,7 @@ func (config *Config) DatastoreConfig() api.CalicoAPIConfig { } else { etcdEndpoints = strings.Join(config.EtcdEndpoints, ",") } - etcdCfg := etcd.EtcdConfig{ + etcdCfg := api.EtcdConfig{ EtcdEndpoints: etcdEndpoints, EtcdKeyFile: config.EtcdKeyFile, EtcdCertFile: config.EtcdCertFile, From 8996e0c419d895bb8ce785f0a93926f41122d859 Mon Sep 17 00:00:00 2001 From: Casey Davenport Date: Mon, 5 Jun 2017 16:19:59 -0700 Subject: [PATCH 2/2] Add gopkg.in/yaml.v2 license whitelist --- check-licenses/check_licenses.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/check-licenses/check_licenses.go b/check-licenses/check_licenses.go index c4bd5a2a..f71b9764 100644 --- a/check-licenses/check_licenses.go +++ b/check-licenses/check_licenses.go @@ -40,6 +40,8 @@ var ( // allowing us to distribute a binary based on them as long as we don't modify them. {pkgName: "github.com/projectcalico/typha/vendor/github.com/juju/ratelimit", license: "GNU Lesser General Public License v3.0 (94%)"}, + {pkgName: "github.com/projectcalico/typha/vendor/gopkg.in/yaml.v2", + license: "GNU Lesser General Public License v3.0 (95%)"}, // Licensed under Apache + some files with MIT/BSD style. {pkgName: "github.com/projectcalico/typha/vendor/gopkg.in/yaml.v2",