From b9caa27c1d426de7d5b9d6e707fb689a8cc2ccad Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Wed, 4 Oct 2017 16:52:33 -0700 Subject: [PATCH 1/2] replace glide with dep --- .circleci/config.yml | 2 +- Gopkg.lock | 436 +++++++++++++++++++++++++++++++++++ Gopkg.toml | 73 ++++++ Makefile | 12 +- docs/developers.md | 5 +- docs/install.md | 2 +- glide.lock | 530 ------------------------------------------- glide.yaml | 86 ------- 8 files changed, 518 insertions(+), 628 deletions(-) create mode 100644 Gopkg.lock create mode 100644 Gopkg.toml delete mode 100644 glide.lock delete mode 100644 glide.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index 273643b7c..80eb99a98 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: name: install dependencies command: make bootstrap - save_cache: - key: vendor-{{ checksum "glide.yaml" }}-{{ checksum "glide.lock" }} + key: vendor-{{ checksum "Gopkg.toml" }}-{{ checksum "Gopkg.lock" }} paths: - vendor - run: diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 index 000000000..02aaebf51 --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,436 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + name = "cloud.google.com/go" + packages = ["compute/metadata","internal"] + revision = "3b1ae45394a234c385be014e9a488f2bb6eef821" + +[[projects]] + name = "github.com/Azure/go-autorest" + packages = ["autorest","autorest/adal","autorest/azure","autorest/date"] + revision = "58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d" + version = "v8.0.0" + +[[projects]] + name = "github.com/BurntSushi/toml" + packages = ["."] + revision = "b26d9c308763d68093482582cea63d69be07a0f0" + version = "v0.3.0" + +[[projects]] + name = "github.com/Masterminds/semver" + packages = ["."] + revision = "517734cc7d6470c0d07130e40fd40bdeb9bcd3fd" + version = "v1.3.1" + +[[projects]] + name = "github.com/Masterminds/sprig" + packages = ["."] + revision = "4c164950cd0a8d3724ddb78982e2c56dc7f47112" + version = "v2.13.0" + +[[projects]] + name = "github.com/Masterminds/vcs" + packages = ["."] + revision = "3084677c2c188840777bff30054f2b553729d329" + version = "v1.11.1" + +[[projects]] + name = "github.com/PuerkitoBio/purell" + packages = ["."] + revision = "8a290539e2e8629dbc4e6bad948158f790ec31f4" + version = "v1.0.0" + +[[projects]] + name = "github.com/PuerkitoBio/urlesc" + packages = ["."] + revision = "5bd2802263f21d8788851d5305584c82a5c75d7e" + +[[projects]] + name = "github.com/aokoli/goutils" + packages = ["."] + revision = "9c37978a95bd5c709a15883b6242714ea6709e64" + +[[projects]] + name = "github.com/asaskevich/govalidator" + packages = ["."] + revision = "7664702784775e51966f0885f5cd27435916517b" + version = "v4" + +[[projects]] + name = "github.com/beorn7/perks" + packages = ["quantile"] + revision = "3ac7bf7a47d159a033b107610db8a1b6575507a4" + +[[projects]] + name = "github.com/cpuguy83/go-md2man" + packages = ["md2man"] + revision = "71acacd42f85e5e82f70a55327789582a5200a90" + version = "v1.0.4" + +[[projects]] + name = "github.com/davecgh/go-spew" + packages = ["spew"] + revision = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d" + +[[projects]] + name = "github.com/dgrijalva/jwt-go" + packages = ["."] + revision = "01aeca54ebda6e0fbfafd0a524d234159c05ec20" + +[[projects]] + name = "github.com/docker/distribution" + packages = ["digest","reference"] + revision = "03efb43768979f4d2ea5187bef995656441829e5" + version = "v2.4.1" + +[[projects]] + name = "github.com/docker/engine-api" + packages = ["types","types/blkiodev","types/container","types/filters","types/network","types/registry","types/strslice","types/versions"] + revision = "dea108d3aa0c67d7162a3fd8aa65f38a430019fd" + +[[projects]] + name = "github.com/docker/go-connections" + packages = ["nat"] + revision = "f549a9393d05688dff0992ef3efd8bbe6c628aeb" + +[[projects]] + name = "github.com/docker/go-units" + packages = ["."] + revision = "e30f1e79f3cd72542f2026ceec18d3bd67ab859c" + +[[projects]] + name = "github.com/docker/spdystream" + packages = [".","spdy"] + revision = "449fdfce4d962303d702fec724ef0ad181c92528" + +[[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/evanphx/json-patch" + packages = ["."] + revision = "ba18e35c5c1b36ef6334cad706eb681153d2d379" + +[[projects]] + branch = "master" + name = "github.com/exponent-io/jsonpath" + packages = ["."] + revision = "d6023ce2651d8eafb5c75bb0c7167536102ec9f5" + +[[projects]] + branch = "master" + name = "github.com/fatih/camelcase" + packages = ["."] + revision = "f6a740d52f961c60348ebb109adde9f4635d7540" + +[[projects]] + name = "github.com/ghodss/yaml" + packages = ["."] + revision = "73d445a93680fa1a78ae23a5839bad48f32ba1ee" + +[[projects]] + name = "github.com/go-openapi/analysis" + packages = ["."] + revision = "b44dc874b601d9e4e2f6e19140e794ba24bead3b" + +[[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/loads" + packages = ["."] + revision = "18441dfa706d924a39a030ee2c3b1d8d81917b38" + +[[projects]] + name = "github.com/go-openapi/spec" + packages = ["."] + revision = "6aced65f8501fe1217321abf0749d354824ba2ff" + +[[projects]] + name = "github.com/go-openapi/swag" + packages = ["."] + revision = "1d0bd113de87027671077d3c71eb3ac5d7dbba72" + +[[projects]] + name = "github.com/gobwas/glob" + 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 = ["proto","sortkeys"] + revision = "c0656edd0d9eab7c66d1eb0c568f9039345796f7" + +[[projects]] + name = "github.com/golang/glog" + packages = ["."] + revision = "44145f04b68cf362d9c4df2182967c2275eaefed" + +[[projects]] + name = "github.com/golang/groupcache" + packages = ["lru"] + revision = "02826c3e79038b59d737d3b1c0a1d937f71a4433" + +[[projects]] + name = "github.com/golang/protobuf" + packages = ["proto","ptypes/any","ptypes/timestamp"] + revision = "4bd1920723d7b7c925de087aa32e2187708897f7" + +[[projects]] + name = "github.com/google/gofuzz" + packages = ["."] + revision = "44d81051d367757e1c7c6a5a86423ece9afcf63c" + +[[projects]] + branch = "master" + name = "github.com/gosuri/uitable" + packages = [".","util/strutil","util/wordwrap"] + revision = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42" + +[[projects]] + name = "github.com/grpc-ecosystem/go-grpc-prometheus" + packages = ["."] + revision = "2500245aa6110c562d17020fb31a2c133d737799" + +[[projects]] + name = "github.com/hashicorp/golang-lru" + packages = [".","simplelru"] + revision = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4" + +[[projects]] + name = "github.com/howeyc/gopass" + packages = ["."] + revision = "3ca23474a7c7203e0a0a070fd33508f6efdb9b3d" + +[[projects]] + name = "github.com/huandu/xstrings" + packages = ["."] + revision = "3959339b333561bf62a38b424fd41517c2c90f40" + +[[projects]] + name = "github.com/imdario/mergo" + packages = ["."] + revision = "6633656539c1639d9d78127b7d47c622b5d7b6dc" + +[[projects]] + name = "github.com/inconshreveable/mousetrap" + packages = ["."] + revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" + version = "v1.0" + +[[projects]] + name = "github.com/json-iterator/go" + packages = ["."] + revision = "6ed27152e0428abfde127acb33b08b03a1e67cac" + version = "1.0.2" + +[[projects]] + branch = "master" + name = "github.com/juju/ratelimit" + packages = ["."] + revision = "5b9ff866471762aa2ab2dced63c9fb6f53921342" + +[[projects]] + name = "github.com/mailru/easyjson" + packages = ["buffer","jlexer","jwriter"] + revision = "d5b7844b561a7bc640052f1b935f7b800330d7e0" + +[[projects]] + name = "github.com/mattn/go-runewidth" + packages = ["."] + revision = "d6bea18f789704b5f83375793155289da36a3c7f" + version = "v0.0.1" + +[[projects]] + name = "github.com/matttproud/golang_protobuf_extensions" + packages = ["pbutil"] + revision = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a" + +[[projects]] + name = "github.com/pborman/uuid" + packages = ["."] + revision = "ca53cad383cad2479bbba7f7a1a05797ec1386e4" + +[[projects]] + name = "github.com/pmezard/go-difflib" + packages = ["difflib"] + revision = "d8ed2627bdf02c080bf22230dbb337003b7aba2d" + +[[projects]] + name = "github.com/prometheus/client_golang" + packages = ["prometheus","prometheus/promhttp"] + revision = "c5b7fccd204277076155f10851dad72b76a49317" + version = "v0.8.0" + +[[projects]] + name = "github.com/prometheus/client_model" + packages = ["go"] + revision = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6" + +[[projects]] + name = "github.com/prometheus/common" + packages = ["expfmt","internal/bitbucket.org/ww/goautoneg","model"] + revision = "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207" + +[[projects]] + name = "github.com/prometheus/procfs" + packages = [".","xfs"] + revision = "65c1f6f8f0fc1e2185eb9863a3bc751496404259" + +[[projects]] + name = "github.com/russross/blackfriday" + packages = ["."] + revision = "300106c228d52c8941d4b3de6054a6062a86dda3" + +[[projects]] + name = "github.com/satori/go.uuid" + packages = ["."] + revision = "879c5887cd475cd7864858769793b2ceb0d44feb" + version = "v1.1.0" + +[[projects]] + name = "github.com/shurcooL/sanitized_anchor_name" + packages = ["."] + revision = "10ef21a441db47d8b13ebcc5fd2310f636973c77" + +[[projects]] + name = "github.com/spf13/cobra" + packages = [".","doc"] + revision = "f62e98d28ab7ad31d707ba837a966378465c7b57" + +[[projects]] + name = "github.com/spf13/pflag" + packages = ["."] + revision = "9ff6c6923cfffbcd502984b8e0c80539a94968b7" + +[[projects]] + name = "github.com/stretchr/testify" + packages = ["assert"] + revision = "e3a8ff8ce36581f87a15341206f205b1da467059" + +[[projects]] + name = "github.com/technosophos/moniker" + packages = ["."] + revision = "9f956786b91d9786ca11aa5be6104542fa911546" + +[[projects]] + name = "github.com/ugorji/go" + packages = ["codec"] + revision = "ded73eae5db7e7a0ef6f55aace87a2873c5d2b74" + +[[projects]] + name = "golang.org/x/crypto" + packages = ["cast5","openpgp","openpgp/armor","openpgp/clearsign","openpgp/elgamal","openpgp/errors","openpgp/packet","openpgp/s2k","pbkdf2","scrypt","ssh/terminal"] + revision = "d172538b2cfce0c13cee31e647d0367aa8cd2486" + +[[projects]] + name = "golang.org/x/net" + packages = ["context","context/ctxhttp","http2","http2/hpack","idna","internal/timeseries","lex/httplex","trace"] + revision = "f2499483f923065a842d38eb4c7f1927e6fc6e6d" + +[[projects]] + name = "golang.org/x/oauth2" + packages = [".","google","internal","jws","jwt"] + revision = "a6bd8cefa1811bd24b86f8902872e4e8225f74c4" + +[[projects]] + name = "golang.org/x/sys" + packages = ["unix"] + revision = "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9" + +[[projects]] + name = "golang.org/x/text" + packages = ["cases","encoding","encoding/internal","encoding/internal/identifier","encoding/unicode","internal/gen","internal/tag","internal/triegen","internal/ucd","internal/utf8internal","language","runes","secure/bidirule","secure/precis","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable","width"] + revision = "2910a502d2bf9e43193af9d68ca516529614eed3" + +[[projects]] + name = "google.golang.org/appengine" + packages = [".","internal","internal/app_identity","internal/base","internal/datastore","internal/log","internal/modules","internal/remote_api","internal/urlfetch","urlfetch"] + revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a" + version = "v1.0.0" + +[[projects]] + name = "google.golang.org/grpc" + packages = [".","codes","credentials","grpclog","internal","keepalive","metadata","naming","peer","stats","tap","transport"] + revision = "8050b9cbc271307e5a716a9d782803d09b0d6f2d" + version = "v1.2.1" + +[[projects]] + name = "gopkg.in/inf.v0" + packages = ["."] + revision = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4" + version = "v0.9.0" + +[[projects]] + name = "gopkg.in/yaml.v2" + packages = ["."] + revision = "53feefa2559fb8dfa8d81baad31be332c97d6c77" + +[[projects]] + name = "k8s.io/api" + packages = ["core/v1"] + revision = "4fe9229aaa9d704f8a2a21cdcd50de2bbb6e1b57" + +[[projects]] + branch = "master" + name = "k8s.io/apimachinery" + packages = ["pkg/api/equality","pkg/api/errors","pkg/api/meta","pkg/api/resource","pkg/api/validation","pkg/apimachinery","pkg/apimachinery/announced","pkg/apimachinery/registered","pkg/apis/meta/v1","pkg/apis/meta/v1/unstructured","pkg/apis/meta/v1/validation","pkg/apis/meta/v1alpha1","pkg/conversion","pkg/conversion/queryparams","pkg/conversion/unstructured","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/httpstream","pkg/util/httpstream/spdy","pkg/util/intstr","pkg/util/json","pkg/util/mergepatch","pkg/util/net","pkg/util/rand","pkg/util/remotecommand","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/netutil","third_party/forked/golang/reflect"] + revision = "3b05bbfa0a45413bfa184edbf9af617e277962fb" + +[[projects]] + name = "k8s.io/apiserver" + packages = ["pkg/admission","pkg/apis/apiserver","pkg/apis/apiserver/install","pkg/apis/apiserver/v1alpha1","pkg/authentication/authenticator","pkg/authentication/serviceaccount","pkg/authentication/user","pkg/endpoints/request","pkg/features","pkg/util/feature","pkg/util/flag"] + revision = "2308857ad3b8b18abf74ff734853973eda9da94d" + +[[projects]] + 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/apps/v1beta1","kubernetes/typed/apps/v1beta1/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/v2alpha1","kubernetes/typed/autoscaling/v2alpha1/fake","kubernetes/typed/batch/v1","kubernetes/typed/batch/v1/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/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/v1alpha1","kubernetes/typed/rbac/v1alpha1/fake","kubernetes/typed/rbac/v1beta1","kubernetes/typed/rbac/v1beta1/fake","kubernetes/typed/settings/v1alpha1","kubernetes/typed/settings/v1alpha1/fake","kubernetes/typed/storage/v1","kubernetes/typed/storage/v1/fake","kubernetes/typed/storage/v1beta1","kubernetes/typed/storage/v1beta1/fake","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","plugin/pkg/client/auth","plugin/pkg/client/auth/azure","plugin/pkg/client/auth/gcp","plugin/pkg/client/auth/oidc","rest","rest/fake","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/metrics","tools/portforward","tools/record","tools/remotecommand","transport","util/cert","util/exec","util/flowcontrol","util/homedir","util/integer","util/jsonpath","util/workqueue"] + revision = "d92e8497f71b7b4e0494e5bd204b48d34bd6f254" + version = "v4.0.0" + +[[projects]] + branch = "master" + name = "k8s.io/kube-openapi" + packages = ["pkg/common"] + revision = "abfc5fbe1cf87ee697db107fdfd24c32fe4397a8" + +[[projects]] + name = "k8s.io/kubernetes" + packages = ["cmd/kubeadm/app/apis/kubeadm","federation/apis/federation","federation/apis/federation/install","federation/apis/federation/v1beta1","federation/client/clientset_generated/federation_internalclientset","federation/client/clientset_generated/federation_internalclientset/scheme","federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion","federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion","federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion","federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion","federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion","pkg/api","pkg/api/events","pkg/api/helper","pkg/api/helper/qos","pkg/api/install","pkg/api/pod","pkg/api/ref","pkg/api/resource","pkg/api/service","pkg/api/testapi","pkg/api/util","pkg/api/v1","pkg/api/v1/helper","pkg/api/v1/helper/qos","pkg/api/v1/pod","pkg/api/v1/ref","pkg/api/validation","pkg/apis/admission","pkg/apis/admission/install","pkg/apis/admission/v1alpha1","pkg/apis/admissionregistration","pkg/apis/admissionregistration/install","pkg/apis/admissionregistration/v1alpha1","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/v1beta1","pkg/apis/componentconfig","pkg/apis/componentconfig/install","pkg/apis/componentconfig/v1alpha1","pkg/apis/extensions","pkg/apis/extensions/install","pkg/apis/extensions/v1beta1","pkg/apis/imagepolicy","pkg/apis/imagepolicy/install","pkg/apis/imagepolicy/v1alpha1","pkg/apis/networking","pkg/apis/networking/install","pkg/apis/networking/v1","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/util","pkg/apis/storage/v1","pkg/apis/storage/v1beta1","pkg/capabilities","pkg/client/clientset_generated/clientset","pkg/client/clientset_generated/clientset/scheme","pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1","pkg/client/clientset_generated/clientset/typed/apps/v1beta1","pkg/client/clientset_generated/clientset/typed/authentication/v1","pkg/client/clientset_generated/clientset/typed/authentication/v1beta1","pkg/client/clientset_generated/clientset/typed/authorization/v1","pkg/client/clientset_generated/clientset/typed/authorization/v1beta1","pkg/client/clientset_generated/clientset/typed/autoscaling/v1","pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1","pkg/client/clientset_generated/clientset/typed/batch/v1","pkg/client/clientset_generated/clientset/typed/batch/v2alpha1","pkg/client/clientset_generated/clientset/typed/certificates/v1beta1","pkg/client/clientset_generated/clientset/typed/core/v1","pkg/client/clientset_generated/clientset/typed/extensions/v1beta1","pkg/client/clientset_generated/clientset/typed/networking/v1","pkg/client/clientset_generated/clientset/typed/policy/v1beta1","pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1","pkg/client/clientset_generated/clientset/typed/rbac/v1beta1","pkg/client/clientset_generated/clientset/typed/settings/v1alpha1","pkg/client/clientset_generated/clientset/typed/storage/v1","pkg/client/clientset_generated/clientset/typed/storage/v1beta1","pkg/client/clientset_generated/internalclientset","pkg/client/clientset_generated/internalclientset/fake","pkg/client/clientset_generated/internalclientset/scheme","pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion","pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion/fake","pkg/client/clientset_generated/internalclientset/typed/apps/internalversion","pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake","pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion","pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake","pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion","pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake","pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion","pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake","pkg/client/clientset_generated/internalclientset/typed/batch/internalversion","pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake","pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion","pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake","pkg/client/clientset_generated/internalclientset/typed/core/internalversion","pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake","pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion","pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake","pkg/client/clientset_generated/internalclientset/typed/networking/internalversion","pkg/client/clientset_generated/internalclientset/typed/networking/internalversion/fake","pkg/client/clientset_generated/internalclientset/typed/policy/internalversion","pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake","pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion","pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake","pkg/client/clientset_generated/internalclientset/typed/settings/internalversion","pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/fake","pkg/client/clientset_generated/internalclientset/typed/storage/internalversion","pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake","pkg/client/informers/informers_generated/externalversions/apps/v1beta1","pkg/client/informers/informers_generated/externalversions/core/v1","pkg/client/informers/informers_generated/externalversions/extensions/v1beta1","pkg/client/informers/informers_generated/externalversions/internalinterfaces","pkg/client/leaderelection/resourcelock","pkg/client/listers/apps/v1beta1","pkg/client/listers/core/v1","pkg/client/listers/extensions/v1beta1","pkg/client/retry","pkg/client/unversioned","pkg/controller","pkg/controller/daemon","pkg/controller/daemon/util","pkg/controller/deployment/util","pkg/credentialprovider","pkg/features","pkg/fieldpath","pkg/kubectl","pkg/kubectl/cmd/testing","pkg/kubectl/cmd/util","pkg/kubectl/cmd/util/openapi","pkg/kubectl/plugins","pkg/kubectl/resource","pkg/kubectl/util","pkg/kubelet/apis","pkg/kubelet/qos","pkg/kubelet/types","pkg/master/ports","pkg/printers","pkg/printers/internalversion","pkg/registry/rbac/validation","pkg/security/apparmor","pkg/serviceaccount","pkg/util","pkg/util/exec","pkg/util/hash","pkg/util/labels","pkg/util/metrics","pkg/util/mount","pkg/util/net/sets","pkg/util/node","pkg/util/parsers","pkg/util/slice","pkg/version","pkg/volume/util","pkg/watch/json","plugin/pkg/scheduler/algorithm","plugin/pkg/scheduler/algorithm/predicates","plugin/pkg/scheduler/algorithm/priorities/util","plugin/pkg/scheduler/api","plugin/pkg/scheduler/schedulercache","plugin/pkg/scheduler/util"] + revision = "8e1552342355496b62754e61ad5f802a0f3f1fa7" + version = "v1.7.7" + +[[projects]] + name = "k8s.io/metrics" + packages = ["pkg/apis/metrics","pkg/apis/metrics/v1alpha1","pkg/client/clientset_generated/clientset","pkg/client/clientset_generated/clientset/scheme","pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1"] + revision = "8efbc8e22d00b9c600afec5f1c14073fd2412fce" + +[[projects]] + name = "vbom.ml/util" + packages = ["sortorder"] + revision = "db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "05e0359a241707e4125539125bc398f8669568882801445a83b13f9de217c286" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 index 000000000..5629280e0 --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,73 @@ +ignored = ["k8s.io/client-go","k8s.io/apimachinery","k8s.io/apiserver","k8s.io/metrics"] + +[[constraint]] + name = "github.com/BurntSushi/toml" + version = "~0.3.0" + +[[constraint]] + name = "github.com/Masterminds/semver" + version = "~1.3.1" + +[[constraint]] + name = "github.com/Masterminds/sprig" + version = "~2.13.0" + +[[constraint]] + name = "github.com/Masterminds/vcs" + version = "~1.11.0" + +[[constraint]] + name = "github.com/asaskevich/govalidator" + version = "^4.0.0" + +[[constraint]] + name = "github.com/evanphx/json-patch" + +[[constraint]] + name = "github.com/ghodss/yaml" + +[[constraint]] + name = "github.com/gobwas/glob" + version = "^0.2.1" + +[[constraint]] + name = "github.com/gogo/protobuf" + +[[constraint]] + name = "github.com/golang/protobuf" + +[[constraint]] + name = "github.com/gosuri/uitable" + +[[constraint]] + name = "github.com/grpc-ecosystem/go-grpc-prometheus" + +[[constraint]] + name = "github.com/prometheus/client_golang" + version = "0.8.0" + +[[constraint]] + name = "github.com/spf13/cobra" + +[[constraint]] + name = "github.com/spf13/pflag" + +[[constraint]] + name = "github.com/stretchr/testify" + +[[constraint]] + name = "github.com/technosophos/moniker" + +[[constraint]] + name = "golang.org/x/crypto" + +[[constraint]] + name = "golang.org/x/net" + +[[constraint]] + name = "google.golang.org/grpc" + version = "1.2.1" + +[[constraint]] + name = "k8s.io/kubernetes" + version = "~1.7.0" diff --git a/Makefile b/Makefile index 737be298c..94fa92839 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,7 @@ APP = helm # go option GO ?= go -PKG := $(shell glide novendor) TAGS := -TESTS := . TESTFLAGS := LDFLAGS := GOFLAGS := @@ -90,7 +88,7 @@ test: test-unit test-unit: @echo @echo "==> Running unit tests <==" - HELM_HOME=/no/such/dir $(GO) test $(GOFLAGS) -run $(TESTS) $(PKG) $(TESTFLAGS) + HELM_HOME=/no/such/dir $(GO) test $(GOFLAGS) ./... $(TESTFLAGS) .PHONY: test-style test-style: @@ -117,15 +115,15 @@ clean: coverage: @scripts/coverage.sh -HAS_GLIDE := $(shell command -v glide;) +HAS_DEP := $(shell command -v dep;) HAS_GOX := $(shell command -v gox;) HAS_GIT := $(shell command -v git;) HAS_HG := $(shell command -v hg;) .PHONY: bootstrap bootstrap: -ifndef HAS_GLIDE - go get -u github.com/Masterminds/glide +ifndef HAS_DEP + go get -u github.com/golang/dep/cmd/dep endif ifndef HAS_GOX go get -u github.com/mitchellh/gox @@ -137,7 +135,7 @@ endif ifndef HAS_HG $(error You must install Mercurial) endif - glide install --strip-vendor + dep ensure go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go scripts/setup-apimachinery.sh diff --git a/docs/developers.md b/docs/developers.md index 9720b99f0..d000a7fa3 100644 --- a/docs/developers.md +++ b/docs/developers.md @@ -5,8 +5,7 @@ Helm and Tiller. ## Prerequisites -- Go 1.6.0 or later -- Glide 0.12.0 or later +- Go 1.9.0 or later - kubectl 1.2 or later - A Kubernetes cluster (optional) - The gRPC toolchain @@ -139,7 +138,7 @@ The code for the Helm project is organized as follows: - The `docs/` folder is used for documentation and examples. Go dependencies are managed with -[Glide](https://github.com/Masterminds/glide) and stored in the +[dep](https://github.com/golang/dep) and stored in the `vendor/` directory. ### Git Conventions diff --git a/docs/install.md b/docs/install.md index af5d57a7b..c91ff0b15 100755 --- a/docs/install.md +++ b/docs/install.md @@ -70,7 +70,7 @@ Building Helm from source is slightly more work, but is the best way to go if you want to test the latest (pre-release) Helm version. You must have a working Go environment with -[glide](https://github.com/Masterminds/glide) and Mercurial installed. +[dep](https://github.com/golang/dep) and Mercurial installed. ```console $ cd $GOPATH diff --git a/glide.lock b/glide.lock deleted file mode 100644 index c368466fb..000000000 --- a/glide.lock +++ /dev/null @@ -1,530 +0,0 @@ -hash: 0759b118eb4017d612af767460cdec467d6f78013ad1efff1c82676f1df84a75 -updated: 2017-09-26T15:21:30.833774-07:00 -imports: -- name: cloud.google.com/go - version: 3b1ae45394a234c385be014e9a488f2bb6eef821 -- name: github.com/aokoli/goutils - version: 9c37978a95bd5c709a15883b6242714ea6709e64 -- name: github.com/asaskevich/govalidator - version: 7664702784775e51966f0885f5cd27435916517b -- name: github.com/Azure/go-autorest - version: 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d -- name: github.com/beorn7/perks - version: 3ac7bf7a47d159a033b107610db8a1b6575507a4 - subpackages: - - quantile -- name: github.com/BurntSushi/toml - version: b26d9c308763d68093482582cea63d69be07a0f0 -- name: github.com/chai2010/gettext-go - version: bf70f2a70fb1b1f36d90d671a72795984eab0fcb -- name: github.com/cpuguy83/go-md2man - version: 71acacd42f85e5e82f70a55327789582a5200a90 - subpackages: - - md2man -- name: github.com/davecgh/go-spew - version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d - subpackages: - - spew -- name: github.com/dgrijalva/jwt-go - version: 01aeca54ebda6e0fbfafd0a524d234159c05ec20 -- name: github.com/docker/distribution - version: 03efb43768979f4d2ea5187bef995656441829e5 - subpackages: - - digest - - reference -- name: github.com/docker/engine-api - version: dea108d3aa0c67d7162a3fd8aa65f38a430019fd - subpackages: - - client - - client/transport - - client/transport/cancellable - - types - - types/blkiodev - - types/container - - types/filters - - types/network - - types/reference - - types/registry - - types/strslice - - types/time - - types/versions -- name: github.com/docker/go-connections - version: f549a9393d05688dff0992ef3efd8bbe6c628aeb - subpackages: - - nat - - sockets - - tlsconfig -- name: github.com/docker/go-units - version: e30f1e79f3cd72542f2026ceec18d3bd67ab859c -- name: github.com/docker/spdystream - version: 449fdfce4d962303d702fec724ef0ad181c92528 -- name: github.com/emicklei/go-restful - version: ff4f55a206334ef123e4f79bbf348980da81ca46 - subpackages: - - log -- name: github.com/emicklei/go-restful-swagger12 - version: dcef7f55730566d41eae5db10e7d6981829720f6 -- name: github.com/evanphx/json-patch - version: ba18e35c5c1b36ef6334cad706eb681153d2d379 -- name: github.com/exponent-io/jsonpath - version: d6023ce2651d8eafb5c75bb0c7167536102ec9f5 -- name: github.com/fatih/camelcase - version: f6a740d52f961c60348ebb109adde9f4635d7540 -- name: github.com/ghodss/yaml - version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee -- name: github.com/go-openapi/analysis - version: b44dc874b601d9e4e2f6e19140e794ba24bead3b -- name: github.com/go-openapi/errors - version: d24ebc2075bad502fac3a8ae27aa6dd58e1952dc -- name: github.com/go-openapi/jsonpointer - version: 46af16f9f7b149af66e5d1bd010e3574dc06de98 -- name: github.com/go-openapi/jsonreference - version: 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272 -- name: github.com/go-openapi/loads - version: 18441dfa706d924a39a030ee2c3b1d8d81917b38 -- name: github.com/go-openapi/spec - version: 6aced65f8501fe1217321abf0749d354824ba2ff -- name: github.com/go-openapi/strfmt - version: d65c7fdb29eca313476e529628176fe17e58c488 -- name: github.com/go-openapi/swag - version: 1d0bd113de87027671077d3c71eb3ac5d7dbba72 -- name: github.com/gobwas/glob - version: bea32b9cd2d6f55753d94a28e959b13f0244797a - subpackages: - - compiler - - match - - syntax - - syntax/ast - - syntax/lexer - - util/runes - - util/strings -- name: github.com/gogo/protobuf - version: c0656edd0d9eab7c66d1eb0c568f9039345796f7 - subpackages: - - gogoproto - - 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 - - sortkeys - - vanity - - vanity/command -- name: github.com/golang/glog - version: 44145f04b68cf362d9c4df2182967c2275eaefed -- name: github.com/golang/groupcache - version: 02826c3e79038b59d737d3b1c0a1d937f71a4433 - subpackages: - - lru -- name: github.com/golang/protobuf - version: 4bd1920723d7b7c925de087aa32e2187708897f7 - subpackages: - - proto - - ptypes/any - - ptypes/timestamp -- name: github.com/google/gofuzz - version: 44d81051d367757e1c7c6a5a86423ece9afcf63c -- name: github.com/gosuri/uitable - version: 36ee7e946282a3fb1cfecd476ddc9b35d8847e42 - subpackages: - - util/strutil - - util/wordwrap -- name: github.com/grpc-ecosystem/go-grpc-prometheus - version: 2500245aa6110c562d17020fb31a2c133d737799 -- name: github.com/hashicorp/golang-lru - version: a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4 -- name: github.com/howeyc/gopass - version: 3ca23474a7c7203e0a0a070fd33508f6efdb9b3d -- name: github.com/huandu/xstrings - version: 3959339b333561bf62a38b424fd41517c2c90f40 -- name: github.com/imdario/mergo - version: 6633656539c1639d9d78127b7d47c622b5d7b6dc -- name: github.com/inconshreveable/mousetrap - version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -- name: github.com/juju/ratelimit - version: 5b9ff866471762aa2ab2dced63c9fb6f53921342 -- name: github.com/mailru/easyjson - version: d5b7844b561a7bc640052f1b935f7b800330d7e0 - subpackages: - - buffer - - jlexer - - jwriter -- name: github.com/Masterminds/semver - version: 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd -- name: github.com/Masterminds/sprig - version: 4c164950cd0a8d3724ddb78982e2c56dc7f47112 -- name: github.com/Masterminds/vcs - version: 3084677c2c188840777bff30054f2b553729d329 -- name: github.com/mattn/go-runewidth - version: d6bea18f789704b5f83375793155289da36a3c7f -- name: github.com/matttproud/golang_protobuf_extensions - version: fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a - subpackages: - - pbutil -- name: github.com/mitchellh/mapstructure - version: 740c764bc6149d3f1806231418adb9f52c11bcbf -- name: github.com/naoina/go-stringutil - version: 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b -- name: github.com/pborman/uuid - version: ca53cad383cad2479bbba7f7a1a05797ec1386e4 -- name: github.com/prometheus/client_golang - version: c5b7fccd204277076155f10851dad72b76a49317 - subpackages: - - prometheus - - prometheus/promhttp -- name: github.com/prometheus/client_model - version: fa8ad6fec33561be4280a8f0514318c79d7f6cb6 - subpackages: - - go -- name: github.com/prometheus/common - version: 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207 - subpackages: - - expfmt - - internal/bitbucket.org/ww/goautoneg - - model -- name: github.com/prometheus/procfs - version: 65c1f6f8f0fc1e2185eb9863a3bc751496404259 - subpackages: - - xfs -- name: github.com/PuerkitoBio/purell - version: 8a290539e2e8629dbc4e6bad948158f790ec31f4 -- name: github.com/PuerkitoBio/urlesc - version: 5bd2802263f21d8788851d5305584c82a5c75d7e -- name: github.com/russross/blackfriday - version: 300106c228d52c8941d4b3de6054a6062a86dda3 -- name: github.com/satori/go.uuid - version: 879c5887cd475cd7864858769793b2ceb0d44feb -- name: github.com/shurcooL/sanitized_anchor_name - version: 10ef21a441db47d8b13ebcc5fd2310f636973c77 -- name: github.com/spf13/cobra - version: f62e98d28ab7ad31d707ba837a966378465c7b57 - subpackages: - - doc -- name: github.com/spf13/pflag - version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7 -- name: github.com/technosophos/moniker - version: 9f956786b91d9786ca11aa5be6104542fa911546 -- name: github.com/ugorji/go - version: ded73eae5db7e7a0ef6f55aace87a2873c5d2b74 - subpackages: - - codec - - codec/codecgen -- name: golang.org/x/crypto - version: d172538b2cfce0c13cee31e647d0367aa8cd2486 - subpackages: - - cast5 - - openpgp - - openpgp/armor - - openpgp/clearsign - - openpgp/elgamal - - openpgp/errors - - openpgp/packet - - openpgp/s2k - - pbkdf2 - - scrypt - - ssh/terminal -- name: golang.org/x/net - version: f2499483f923065a842d38eb4c7f1927e6fc6e6d - subpackages: - - context - - http2 - - http2/hpack - - idna - - internal/timeseries - - lex/httplex - - trace -- name: golang.org/x/oauth2 - version: a6bd8cefa1811bd24b86f8902872e4e8225f74c4 -- name: golang.org/x/sys - version: 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9 - subpackages: - - unix -- name: golang.org/x/text - version: 2910a502d2bf9e43193af9d68ca516529614eed3 - subpackages: - - cases - - encoding - - encoding/internal - - encoding/internal/identifier - - encoding/unicode - - internal/tag - - internal/utf8internal - - language - - runes - - secure/bidirule - - secure/precis - - transform - - unicode/bidi - - unicode/norm - - width -- name: google.golang.org/grpc - version: 8050b9cbc271307e5a716a9d782803d09b0d6f2d - subpackages: - - codes - - credentials - - grpclog - - internal - - keepalive - - metadata - - naming - - peer - - stats - - tap - - transport -- name: gopkg.in/inf.v0 - version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 -- name: gopkg.in/mgo.v2 - version: 3f83fa5005286a7fe593b055f0d7771a7dce4655 - subpackages: - - bson -- name: gopkg.in/yaml.v2 - version: 53feefa2559fb8dfa8d81baad31be332c97d6c77 -- name: k8s.io/api - version: 4fe9229aaa9d704f8a2a21cdcd50de2bbb6e1b57 - subpackages: - - core/v1 -- name: k8s.io/apiserver - version: 2308857ad3b8b18abf74ff734853973eda9da94d - subpackages: - - pkg/admission - - pkg/apis/apiserver - - pkg/apis/apiserver/install - - pkg/apis/apiserver/v1alpha1 - - pkg/authentication/authenticator - - pkg/authentication/serviceaccount - - pkg/authentication/user - - pkg/endpoints/request - - pkg/features - - pkg/util/feature - - pkg/util/flag -- name: k8s.io/kubernetes - version: d3faa3f8f2e85c8089e80a661955626ae24abf80 - subpackages: - - cmd/kubeadm/app/apis/kubeadm - - federation/apis/federation - - federation/apis/federation/install - - federation/apis/federation/v1beta1 - - federation/client/clientset_generated/federation_internalclientset - - federation/client/clientset_generated/federation_internalclientset/scheme - - federation/client/clientset_generated/federation_internalclientset/typed/autoscaling/internalversion - - federation/client/clientset_generated/federation_internalclientset/typed/batch/internalversion - - federation/client/clientset_generated/federation_internalclientset/typed/core/internalversion - - federation/client/clientset_generated/federation_internalclientset/typed/extensions/internalversion - - federation/client/clientset_generated/federation_internalclientset/typed/federation/internalversion - - pkg/api - - pkg/api/events - - pkg/api/helper - - pkg/api/helper/qos - - pkg/api/install - - pkg/api/pod - - pkg/api/ref - - pkg/api/resource - - pkg/api/service - - pkg/api/testapi - - pkg/api/util - - pkg/api/v1 - - pkg/api/v1/helper - - pkg/api/v1/helper/qos - - pkg/api/v1/pod - - pkg/api/v1/ref - - pkg/api/validation - - pkg/apis/admission - - pkg/apis/admission/install - - pkg/apis/admission/v1alpha1 - - pkg/apis/admissionregistration - - pkg/apis/admissionregistration/install - - pkg/apis/admissionregistration/v1alpha1 - - 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/v1beta1 - - pkg/apis/componentconfig - - pkg/apis/componentconfig/install - - pkg/apis/componentconfig/v1alpha1 - - pkg/apis/extensions - - pkg/apis/extensions/install - - pkg/apis/extensions/v1beta1 - - pkg/apis/imagepolicy - - pkg/apis/imagepolicy/install - - pkg/apis/imagepolicy/v1alpha1 - - pkg/apis/networking - - pkg/apis/networking/install - - pkg/apis/networking/v1 - - 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/util - - pkg/apis/storage/v1 - - pkg/apis/storage/v1beta1 - - pkg/capabilities - - pkg/client/clientset_generated/clientset - - pkg/client/clientset_generated/clientset/scheme - - pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1 - - pkg/client/clientset_generated/clientset/typed/apps/v1beta1 - - pkg/client/clientset_generated/clientset/typed/authentication/v1 - - pkg/client/clientset_generated/clientset/typed/authentication/v1beta1 - - pkg/client/clientset_generated/clientset/typed/authorization/v1 - - pkg/client/clientset_generated/clientset/typed/authorization/v1beta1 - - pkg/client/clientset_generated/clientset/typed/autoscaling/v1 - - pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1 - - pkg/client/clientset_generated/clientset/typed/batch/v1 - - pkg/client/clientset_generated/clientset/typed/batch/v2alpha1 - - pkg/client/clientset_generated/clientset/typed/certificates/v1beta1 - - pkg/client/clientset_generated/clientset/typed/core/v1 - - pkg/client/clientset_generated/clientset/typed/extensions/v1beta1 - - pkg/client/clientset_generated/clientset/typed/networking/v1 - - pkg/client/clientset_generated/clientset/typed/policy/v1beta1 - - pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1 - - pkg/client/clientset_generated/clientset/typed/rbac/v1beta1 - - pkg/client/clientset_generated/clientset/typed/settings/v1alpha1 - - pkg/client/clientset_generated/clientset/typed/storage/v1 - - pkg/client/clientset_generated/clientset/typed/storage/v1beta1 - - pkg/client/clientset_generated/internalclientset - - pkg/client/clientset_generated/internalclientset/fake - - pkg/client/clientset_generated/internalclientset/scheme - - pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion - - pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion/fake - - pkg/client/clientset_generated/internalclientset/typed/apps/internalversion - - pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake - - pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion - - pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake - - pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion - - pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake - - pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion - - pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake - - pkg/client/clientset_generated/internalclientset/typed/batch/internalversion - - pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake - - pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion - - pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake - - pkg/client/clientset_generated/internalclientset/typed/core/internalversion - - pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake - - pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion - - pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake - - pkg/client/clientset_generated/internalclientset/typed/networking/internalversion - - pkg/client/clientset_generated/internalclientset/typed/networking/internalversion/fake - - pkg/client/clientset_generated/internalclientset/typed/policy/internalversion - - pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake - - pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion - - pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake - - pkg/client/clientset_generated/internalclientset/typed/settings/internalversion - - pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/fake - - pkg/client/clientset_generated/internalclientset/typed/storage/internalversion - - pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake - - pkg/client/informers/informers_generated/externalversions/apps/v1beta1 - - pkg/client/informers/informers_generated/externalversions/core/v1 - - pkg/client/informers/informers_generated/externalversions/extensions/v1beta1 - - pkg/client/informers/informers_generated/externalversions/internalinterfaces - - pkg/client/leaderelection/resourcelock - - pkg/client/listers/apps/v1beta1 - - pkg/client/listers/core/v1 - - pkg/client/listers/extensions/v1beta1 - - pkg/client/retry - - pkg/client/unversioned - - pkg/controller - - pkg/controller/daemon - - pkg/controller/daemon/util - - pkg/controller/deployment/util - - pkg/credentialprovider - - pkg/features - - pkg/fieldpath - - pkg/kubectl - - pkg/kubectl/cmd/testing - - pkg/kubectl/cmd/util - - pkg/kubectl/cmd/util/openapi - - pkg/kubectl/plugins - - pkg/kubectl/resource - - pkg/kubectl/util - - pkg/kubelet/apis - - pkg/kubelet/qos - - pkg/kubelet/types - - pkg/master/ports - - pkg/printers - - pkg/printers/internalversion - - pkg/registry/rbac/validation - - pkg/security/apparmor - - pkg/serviceaccount - - pkg/util - - pkg/util/exec - - pkg/util/hash - - pkg/util/labels - - pkg/util/metrics - - pkg/util/mount - - pkg/util/net/sets - - pkg/util/node - - pkg/util/parsers - - pkg/util/slice - - pkg/version - - pkg/volume/util - - pkg/watch/json - - plugin/pkg/scheduler/algorithm - - plugin/pkg/scheduler/algorithm/predicates - - plugin/pkg/scheduler/algorithm/priorities/util - - plugin/pkg/scheduler/api - - plugin/pkg/scheduler/schedulercache - - plugin/pkg/scheduler/util -- name: k8s.io/metrics - version: 8efbc8e22d00b9c600afec5f1c14073fd2412fce - subpackages: - - pkg/apis/metrics - - pkg/apis/metrics/v1alpha1 - - pkg/client/clientset_generated/clientset - - pkg/client/clientset_generated/clientset/scheme - - pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1 -- name: vbom.ml/util - version: db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 - repo: https://github.com/fvbommel/util.git - vcs: git - subpackages: - - sortorder -testImports: -- name: github.com/pmezard/go-difflib - version: d8ed2627bdf02c080bf22230dbb337003b7aba2d - subpackages: - - difflib -- name: github.com/stretchr/testify - version: e3a8ff8ce36581f87a15341206f205b1da467059 - subpackages: - - assert diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index 6b231c417..000000000 --- a/glide.yaml +++ /dev/null @@ -1,86 +0,0 @@ -package: k8s.io/helm -import: -- package: golang.org/x/net - subpackages: - - context -- package: github.com/spf13/cobra - version: f62e98d28ab7ad31d707ba837a966378465c7b57 -- package: github.com/spf13/pflag - version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7 -- package: github.com/Masterminds/vcs - version: ~1.11.0 - - # Pin version of mergo that is compatible with both sprig and Kubernetes -- package: github.com/imdario/mergo - version: 6633656539c1639d9d78127b7d47c622b5d7b6dc -- package: github.com/Masterminds/sprig - version: ^2.13 -- package: github.com/ghodss/yaml -- package: github.com/Masterminds/semver - version: ~1.3.1 -- package: github.com/technosophos/moniker -- package: github.com/golang/protobuf - version: 4bd1920723d7b7c925de087aa32e2187708897f7 - subpackages: - - proto - - ptypes/any - - ptypes/timestamp -- package: google.golang.org/grpc - version: 1.2.1 -- package: k8s.io/kubernetes - version: ~1.7.0 -- package: github.com/gosuri/uitable -- package: github.com/asaskevich/govalidator - version: ^4.0.0 -- package: golang.org/x/crypto - subpackages: - - openpgp -- package: github.com/gobwas/glob - version: ^0.2.1 -- package: github.com/evanphx/json-patch -- package: github.com/BurntSushi/toml - version: ~0.3.0 -- package: github.com/naoina/go-stringutil - version: ~0.1.0 -- package: github.com/chai2010/gettext-go -- package: github.com/prometheus/client_golang - version: 0.8.0 -- package: vbom.ml/util - repo: https://github.com/fvbommel/util.git - vcs: git -- package: github.com/docker/distribution - version: ~2.4.0 - -# hacks for kubernetes v1.7 -- package: cloud.google.com/go -- package: github.com/Azure/go-autorest - version: v8.0.0 -- package: github.com/dgrijalva/jwt-go -- package: github.com/docker/spdystream -- package: github.com/go-openapi/analysis - version: b44dc874b601d9e4e2f6e19140e794ba24bead3b -- package: github.com/go-openapi/errors - version: d24ebc2075bad502fac3a8ae27aa6dd58e1952dc -- package: github.com/go-openapi/loads - version: 18441dfa706d924a39a030ee2c3b1d8d81917b38 -- package: github.com/go-openapi/spec - version: 6aced65f8501fe1217321abf0749d354824ba2ff -- package: github.com/google/gofuzz -- package: github.com/hashicorp/golang-lru -- package: github.com/howeyc/gopass -- package: github.com/juju/ratelimit - version: 5b9ff866471762aa2ab2dced63c9fb6f53921342 -- package: github.com/pborman/uuid -- package: golang.org/x/oauth2 -- package: gopkg.in/inf.v0 -- package: github.com/go-openapi/strfmt -- package: github.com/mitchellh/mapstructure -- package: gopkg.in/mgo.v2/bson -ignore: - - k8s.io/client-go - - k8s.io/apimachinery -testImports: -- package: github.com/stretchr/testify - version: ^1.1.4 - subpackages: - - assert From 0d6ec08b95d0c5652a83946b8ea3b90138d113fc Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Wed, 4 Oct 2017 16:56:47 -0700 Subject: [PATCH 2/2] bump to go 1.9 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 80eb99a98..b5d423384 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ jobs: working_directory: /go/src/k8s.io/helm parallelism: 3 docker: - - image: golang:1.8 + - image: golang:1.9 environment: PROJECT_NAME: "kubernetes-helm" steps: