From e3137d106a3a8126da3c067674bf90c1f79218bd Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Fri, 22 Mar 2019 11:23:13 -0400 Subject: [PATCH 1/4] Migrating dependency management to go modules Signed-off-by: Matt Farina --- .circleci/config.yml | 13 +- Gopkg.lock | 1908 --------------------------------------- Gopkg.toml | 126 --- Makefile | 43 +- go.mod | 182 ++++ go.sum | 730 +++++++++++++++ pkg/kube/client.go | 2 +- pkg/kube/client_test.go | 2 +- pkg/kube/factory.go | 2 +- 9 files changed, 937 insertions(+), 2071 deletions(-) delete mode 100644 Gopkg.lock delete mode 100644 Gopkg.toml create mode 100644 go.mod create mode 100644 go.sum diff --git a/.circleci/config.yml b/.circleci/config.yml index bbdbd3aa7..3db11f614 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,18 +3,20 @@ version: 2 jobs: build: - working_directory: /go/src/helm.sh/helm + working_directory: ~/helm.sh/helm parallelism: 3 docker: - image: circleci/golang:1.13 environment: - - GOCACHE: "/tmp/go/cache" + GOCACHE: "/tmp/go/cache" steps: - checkout - restore_cache: - key: gopkg-{{ checksum "Gopkg.lock" }} + keys: + - gomod-{{ checksum "go.mod" }} + - gomod- - restore_cache: keys: - build-cache-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }} @@ -25,10 +27,9 @@ jobs: name: test command: make test-coverage - save_cache: - key: gopkg-{{ checksum "Gopkg.lock" }} + key: gomod-{{ checksum "go.mod" }} paths: - - /go/src/helm.sh/helm/vendor - - /go/pkg/dep + - /go/pkg/mod - save_cache: key: build-cache-{{ .Environment.CIRCLE_BUILD_NUM }} paths: diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 56189fff4..000000000 --- a/Gopkg.lock +++ /dev/null @@ -1,1908 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:e4549155be72f065cf860ada7148bbeb0857360e81da2d5e28b799bd8720f1bc" - name = "cloud.google.com/go" - packages = ["compute/metadata"] - pruneopts = "T" - revision = "0ebda48a7f143b1cce9eb37a8c1106ac762a3430" - version = "v0.34.0" - -[[projects]] - digest = "1:b92928b73320648b38c93cacb9082c0fe3f8ac3383ad9bd537eef62c380e0e7a" - name = "contrib.go.opencensus.io/exporter/ocagent" - packages = ["."] - pruneopts = "T" - revision = "00af367e65149ff1f2f4b93bbfbb84fd9297170d" - version = "v0.2.0" - -[[projects]] - branch = "master" - digest = "1:6da51e5ec493ad2b44cb04129e2d0a068c8fb9bd6cb5739d199573558696bb94" - name = "github.com/Azure/go-ansiterm" - packages = [ - ".", - "winterm", - ] - pruneopts = "T" - revision = "d6e3b3328b783f23731bc4d058875b0371ff8109" - -[[projects]] - digest = "1:4827c7440869600b1e44806702a649c5055692063056e165026d46518e33db12" - name = "github.com/Azure/go-autorest" - packages = [ - "autorest", - "autorest/adal", - "autorest/azure", - "autorest/date", - "logger", - "tracing", - ] - pruneopts = "T" - revision = "f401b1ccc8eb505927fae7a0c7f6406d37ca1c7e" - version = "v11.2.8" - -[[projects]] - digest = "1:147748cfa709da38076c3df47f6bca6814c8ced6cba510065ec03f2120cc4819" - name = "github.com/BurntSushi/toml" - packages = ["."] - pruneopts = "T" - revision = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005" - version = "v0.3.1" - -[[projects]] - branch = "master" - digest = "1:414b0f57170d23e2941aa5cd393e99d0ab7a639e27d9784ef3949eae6cddfdb3" - name = "github.com/MakeNowJust/heredoc" - packages = ["."] - pruneopts = "T" - revision = "e9091a26100e9cfb2b6a8f470085bfa541931a91" - -[[projects]] - digest = "1:3b10c6fd33854dc41de2cf78b7bae105da94c2789b6fa5b9ac9e593ea43484ac" - name = "github.com/Masterminds/goutils" - packages = ["."] - pruneopts = "T" - revision = "41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0" - version = "v1.1.0" - -[[projects]] - digest = "1:55388fd080150b9a072912f97b1f5891eb0b50df43401f8b75fb4273d3fec9fc" - name = "github.com/Masterminds/semver" - packages = ["."] - pruneopts = "T" - revision = "c7af12943936e8c39859482e61f0574c2fd7fc75" - version = "v1.4.2" - -[[projects]] - digest = "1:167d20f2417c3188e4f4d02a8870ac65b4d4f9fe0ac6f450873fcffa39623a37" - name = "github.com/Masterminds/sprig" - packages = ["."] - pruneopts = "T" - revision = "258b00ffa7318e8b109a141349980ffbd30a35db" - version = "v2.20.0" - -[[projects]] - digest = "1:74334b154a542b15a7391df3db5428675fdaa56b4d3f3de7b750289b9500d70e" - name = "github.com/Masterminds/vcs" - packages = ["."] - pruneopts = "T" - revision = "b4f55832432b95a611cf1495272b5c8e24952a1a" - version = "v1.13.0" - -[[projects]] - digest = "1:ef2f0eff765cd6c60594654adc602ac5ba460462ac395c6f3c144e5bea24babe" - name = "github.com/Microsoft/go-winio" - packages = ["."] - pruneopts = "T" - revision = "1a8911d1ed007260465c3bfbbc785ac6915a0bb8" - version = "v0.4.12" - -[[projects]] - digest = "1:7d96aed6ffe311c3bc9f4657b887ca2b118a43e702ac4da13ef27fdf28cfc374" - name = "github.com/Microsoft/hcsshim" - packages = [ - ".", - "internal/guestrequest", - "internal/guid", - "internal/hcs", - "internal/hcserror", - "internal/hns", - "internal/interop", - "internal/logfields", - "internal/longpath", - "internal/mergemaps", - "internal/safefile", - "internal/schema1", - "internal/schema2", - "internal/timeout", - "internal/wclayer", - ] - pruneopts = "T" - revision = "f92b8fb9c92e17da496af5a69e3ee13fbe9916e1" - version = "v0.8.6" - -[[projects]] - branch = "master" - digest = "1:3721a10686511b80c052323423f0de17a8c06d417dbdd3b392b1578432a33aae" - name = "github.com/Nvveen/Gotty" - packages = ["."] - pruneopts = "T" - revision = "cd527374f1e5bff4938207604a14f2e38a9cf512" - -[[projects]] - digest = "1:352fc094dbd1438593b64251de6788bffdf30f9925cf763c7f62e1fd27142b76" - name = "github.com/PuerkitoBio/purell" - packages = ["."] - pruneopts = "T" - revision = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4" - version = "v1.1.0" - -[[projects]] - branch = "master" - digest = "1:c739832d67eb1e9cc478a19cc1a1ccd78df0397bf8a32978b759152e205f644b" - name = "github.com/PuerkitoBio/urlesc" - packages = ["."] - pruneopts = "T" - revision = "de5bf2ad457846296e2031421a34e2568e304e35" - -[[projects]] - branch = "master" - digest = "1:5b8a3b9e8d146a93f6d0538d3be408c9adff07fd694d4094b814a376b4727b14" - name = "github.com/Shopify/logrus-bugsnag" - packages = ["."] - pruneopts = "T" - revision = "577dee27f20dd8f1a529f82210094af593be12bd" - -[[projects]] - digest = "1:297a3c21bf1d3b4695a222e43e982bb52b4b9e156ca2eadbe32b898d0a1ae551" - name = "github.com/asaskevich/govalidator" - packages = ["."] - pruneopts = "T" - revision = "ccb8e960c48f04d6935e72476ae4a51028f9e22f" - version = "v9" - -[[projects]] - branch = "master" - digest = "1:ad4589ec239820ee99eb01c1ad47ebc5f8e02c4f5103a9b210adff9696d89f36" - name = "github.com/beorn7/perks" - packages = ["quantile"] - pruneopts = "T" - revision = "3a771d992973f24aa725d07868b467d1ddfceafb" - -[[projects]] - digest = "1:7b81d2ed76bf960333a8020c4b8c22abd6072f0b54ad31c66e90e6a17a19315a" - name = "github.com/bshuster-repo/logrus-logstash-hook" - packages = ["."] - pruneopts = "T" - revision = "dbc1e22735aa6ed7bd9579a407c17bc7c4a4e046" - version = "v0.4.1" - -[[projects]] - digest = "1:f18852f146423bf4c60dcd2f84e8819cfeabac15a875d7ea49daddb2d021f9d5" - name = "github.com/bugsnag/bugsnag-go" - packages = [ - ".", - "errors", - ] - pruneopts = "T" - revision = "3f5889f222e9c07aa1f62c5e8c202e402ce574cd" - version = "v1.3.2" - -[[projects]] - digest = "1:3049c43c6d1cfaa347acd27d6342187f8f38d9f416bbba7b02b43f82848302d2" - name = "github.com/bugsnag/panicwrap" - packages = ["."] - pruneopts = "T" - revision = "4009b2b7c78d820cc4a2e42f035bb557ce4ae45b" - version = "v1.2.0" - -[[projects]] - digest = "1:0b2d5839372f6dc106fcaa70b6bd5832789a633c4e470540f76c2ec6c560e1c1" - name = "github.com/census-instrumentation/opencensus-proto" - packages = [ - "gen-go/agent/common/v1", - "gen-go/agent/trace/v1", - "gen-go/resource/v1", - "gen-go/trace/v1", - ] - pruneopts = "T" - revision = "7f2434bc10da710debe5c4315ed6d4df454b4024" - version = "v0.1.0" - -[[projects]] - digest = "1:9d535dbb6316d0227c1335649d12161b0832f6fa60d5754c559a9ba82859fc1e" - name = "github.com/containerd/containerd" - packages = [ - "archive/compression", - "content", - "content/local", - "errdefs", - "filters", - "images", - "labels", - "log", - "platforms", - "reference", - "remotes", - "remotes/docker", - "remotes/docker/schema1", - "sys", - "version", - ] - pruneopts = "T" - revision = "640860a042b93c26c0a33081ee02230def486f81" - version = "v1.3.0-beta.2" - -[[projects]] - branch = "master" - digest = "1:1271f7f8cc5f5b2eb0c683f92c7adf8fca1813b9da5218d6df1c9cf4bdc3f8d5" - name = "github.com/containerd/continuity" - packages = ["pathdriver"] - pruneopts = "T" - revision = "004b46473808b3e7a4a3049c20e4376c91eb966d" - -[[projects]] - digest = "1:607c4f1f646bfe5ec1a4eac4a505608f280829550ed546a243698a525d3c5fe8" - name = "github.com/cpuguy83/go-md2man" - packages = ["md2man"] - pruneopts = "T" - revision = "20f5889cbdc3c73dbd2862796665e7c465ade7d1" - version = "v1.0.8" - -[[projects]] - digest = "1:9f42202ac457c462ad8bb9642806d275af9ab4850cf0b1960b9c6f083d4a309a" - name = "github.com/davecgh/go-spew" - packages = ["spew"] - pruneopts = "T" - revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" - version = "v1.1.1" - -[[projects]] - digest = "1:8b5f943c7eec36fe9341e1bd9de2b2c0f0bee16374fe461ed0837b4dcdcea711" - name = "github.com/deislabs/oras" - packages = [ - "pkg/auth", - "pkg/auth/docker", - "pkg/content", - "pkg/context", - "pkg/oras", - ] - pruneopts = "T" - revision = "7467008b2683c5eff5fb13fe91c5b17b2eec75a3" - version = "v0.7.0" - -[[projects]] - digest = "1:6b014c67cb522566c30ef02116f9acb50cd60954708cf92c6654e2985696db18" - name = "github.com/dgrijalva/jwt-go" - packages = ["."] - pruneopts = "T" - revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" - version = "v3.2.0" - -[[projects]] - digest = "1:82905edd0b7a5bca3774725e162e1befecd500cd95df2c9909358d4835d36310" - name = "github.com/docker/cli" - packages = [ - "cli/config", - "cli/config/configfile", - "cli/config/credentials", - "cli/config/types", - ] - pruneopts = "T" - revision = "f28d9cc92972044feb72ab6833699102992d40a2" - version = "v19.03.0-beta3" - -[[projects]] - digest = "1:bd3ffa8395e5f3cee7a1d38a7f4de0df088301e25c4e6910fc53936c4be09278" - name = "github.com/docker/distribution" - packages = [ - ".", - "configuration", - "context", - "digestset", - "health", - "health/checks", - "manifest", - "manifest/manifestlist", - "manifest/ocischema", - "manifest/schema1", - "manifest/schema2", - "metrics", - "notifications", - "reference", - "registry", - "registry/api/errcode", - "registry/api/v2", - "registry/auth", - "registry/auth/htpasswd", - "registry/client", - "registry/client/auth", - "registry/client/auth/challenge", - "registry/client/transport", - "registry/handlers", - "registry/listener", - "registry/middleware/registry", - "registry/middleware/repository", - "registry/proxy", - "registry/proxy/scheduler", - "registry/storage", - "registry/storage/cache", - "registry/storage/cache/memory", - "registry/storage/cache/redis", - "registry/storage/driver", - "registry/storage/driver/base", - "registry/storage/driver/factory", - "registry/storage/driver/inmemory", - "registry/storage/driver/middleware", - "uuid", - "version", - ] - pruneopts = "T" - revision = "40b7b5830a2337bb07627617740c0e39eb92800c" - version = "v2.7.0" - -[[projects]] - branch = "master" - digest = "1:3d23e50eab6b3aa4ced1b1cc8b5c40534b9c9a54b0f5648a2e76d72599134e4e" - name = "github.com/docker/docker" - packages = [ - "api/types", - "api/types/blkiodev", - "api/types/container", - "api/types/filters", - "api/types/mount", - "api/types/network", - "api/types/registry", - "api/types/strslice", - "api/types/swarm", - "api/types/swarm/runtime", - "api/types/versions", - "errdefs", - "pkg/homedir", - "pkg/idtools", - "pkg/ioutils", - "pkg/jsonmessage", - "pkg/longpath", - "pkg/mount", - "pkg/stringid", - "pkg/system", - "pkg/tarsum", - "pkg/term", - "pkg/term/windows", - "registry", - "registry/resumable", - ] - pruneopts = "T" - revision = "2cb26cfe9cbf8a64c5046c74d65f4528b22e67f4" - -[[projects]] - digest = "1:523611f6876df8a1fd1aea07499e6ae33585238e8fdd8793f48a2441438a12d6" - name = "github.com/docker/docker-credential-helpers" - packages = [ - "client", - "credentials", - ] - pruneopts = "T" - revision = "5241b46610f2491efdf9d1c85f1ddf5b02f6d962" - version = "v0.6.1" - -[[projects]] - digest = "1:b64eea95d41af3792092af9c951efcd2d8d8bfd2335c851f7afaf54d6be12c66" - name = "github.com/docker/go-connections" - packages = [ - "nat", - "sockets", - "tlsconfig", - ] - pruneopts = "T" - revision = "7395e3f8aa162843a74ed6d48e79627d9792ac55" - version = "v0.4.0" - -[[projects]] - branch = "master" - digest = "1:2b126e77be4ab4b92cdb3924c87894dd76bf365ba282f358a13133e848aa0059" - name = "github.com/docker/go-metrics" - packages = ["."] - pruneopts = "T" - revision = "b84716841b82eab644a0c64fc8b42d480e49add5" - -[[projects]] - digest = "1:6f82cacd0af5921e99bf3f46748705239b36489464f4529a1589bc895764fb18" - name = "github.com/docker/go-units" - packages = ["."] - pruneopts = "T" - revision = "47565b4f722fb6ceae66b95f853feed578a4a51c" - version = "v0.3.3" - -[[projects]] - branch = "master" - digest = "1:46cb138b11721830161dd8293356e3dc5dd7ec774825b7fc5f2bf2fbbf2bed33" - name = "github.com/docker/libtrust" - packages = ["."] - pruneopts = "T" - revision = "aabc10ec26b754e797f9028f4589c5b7bd90dc20" - -[[projects]] - branch = "master" - digest = "1:0d4540d92fd82f9957e1f718e2b1e5f2d301ed8169e2923bba23558fbbbd08a1" - name = "github.com/docker/spdystream" - packages = [ - ".", - "spdy", - ] - pruneopts = "T" - revision = "6480d4af844c189cf5dd913db24ddd339d3a4f85" - -[[projects]] - digest = "1:0ffd93121f3971aea43f6a26b3eaaa64c8af20fb0ff0731087d8dab7164af5a8" - name = "github.com/emicklei/go-restful" - packages = [ - ".", - "log", - ] - pruneopts = "T" - revision = "3eb9738c1697594ea6e71a7156a9bb32ed216cf0" - version = "v2.8.0" - -[[projects]] - digest = "1:75c3d1e7907ed7a800afd0569783a99a2b6421b634c404565de537b224826703" - name = "github.com/evanphx/json-patch" - packages = ["."] - pruneopts = "T" - revision = "afac545df32f2287a079e2dfb7ba2745a643747e" - version = "v3.0.0" - -[[projects]] - branch = "master" - digest = "1:5e0da1aba1a7b125f46e6ddca43e98b40cf6eaea3322b016c331cf6afe53c30a" - name = "github.com/exponent-io/jsonpath" - packages = ["."] - pruneopts = "T" - revision = "d6023ce2651d8eafb5c75bb0c7167536102ec9f5" - -[[projects]] - digest = "1:bbc4aacabe6880bdbce849c64cb061b7eddf39f132af4ea2853ddd32f85fbec3" - name = "github.com/fatih/camelcase" - packages = ["."] - pruneopts = "T" - revision = "44e46d280b43ec1531bb25252440e34f1b800b65" - version = "v1.0.0" - -[[projects]] - digest = "1:30c81df6bc8e5518535aee2b1eacb1a9dab172ee608eeadb40f4db30f007027e" - name = "github.com/garyburd/redigo" - packages = [ - "internal", - "redis", - ] - pruneopts = "T" - revision = "a69d19351219b6dd56f274f96d85a7014a2ec34e" - version = "v1.6.0" - -[[projects]] - digest = "1:2cd7915ab26ede7d95b8749e6b1f933f1c6d5398030684e6505940a10f31cfda" - name = "github.com/ghodss/yaml" - packages = ["."] - pruneopts = "T" - revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7" - version = "v1.0.0" - -[[projects]] - digest = "1:701ec53dfa0182bf25e5c09e664906f11d697e779b59461a2607dbd4dc75a4f9" - name = "github.com/go-openapi/jsonpointer" - packages = ["."] - pruneopts = "T" - revision = "ef5f0afec364d3b9396b7b77b43dbe26bf1f8004" - version = "v0.17.2" - -[[projects]] - digest = "1:3f17ebd557845adeb347c9e398394e96ebc18e0ec94cc04972be87851a4679e0" - name = "github.com/go-openapi/jsonreference" - packages = ["."] - pruneopts = "T" - revision = "8483a886a90412cd6858df4ea3483dce9c8e35a3" - version = "v0.17.2" - -[[projects]] - digest = "1:76b8b440ca412e287dff607469a5a40a9445fe7168ad1fb85916d87c66011c83" - name = "github.com/go-openapi/spec" - packages = ["."] - pruneopts = "T" - revision = "5bae59e25b21498baea7f9d46e9c147ec106a42e" - version = "v0.17.2" - -[[projects]] - digest = "1:0d8057a212a27a625bb8e57b1e25fb8e8e4a0feb0b7df543fd46d8d15c31d870" - name = "github.com/go-openapi/swag" - packages = ["."] - pruneopts = "T" - revision = "5899d5c5e619fda5fa86e14795a835f473ca284c" - version = "v0.17.2" - -[[projects]] - digest = "1:0a5d2a670ac050354afcf572e65aceabefdebdbb90973ea729d8640fa211a9e2" - name = "github.com/gobwas/glob" - packages = [ - ".", - "compiler", - "match", - "syntax", - "syntax/ast", - "syntax/lexer", - "util/runes", - "util/strings", - ] - pruneopts = "T" - revision = "5ccd90ef52e1e632236f7326478d4faa74f99438" - version = "v0.2.3" - -[[projects]] - digest = "1:d7b2d6ad2a9768bb5c9e3bfa4d9ceaa635ca2737cca288507986f116fa4b8da2" - name = "github.com/gofrs/flock" - packages = ["."] - pruneopts = "T" - revision = "392e7fae8f1b0bdbd67dad7237d23f618feb6dbb" - version = "v0.7.1" - -[[projects]] - digest = "1:f5ccd717b5f093cbabc51ee2e7a5979b92f17d217f9031d6d64f337101c408e4" - name = "github.com/gogo/protobuf" - packages = [ - "proto", - "sortkeys", - ] - pruneopts = "T" - revision = "4cbf7e384e768b4e01799441fdf2a706a5635ae7" - version = "v1.2.0" - -[[projects]] - branch = "master" - digest = "1:8f3489cb7352125027252a6517757cbd1706523119f1e14e20741ae8d2f70428" - name = "github.com/golang/groupcache" - packages = ["lru"] - pruneopts = "T" - revision = "c65c006176ff7ff98bb916961c7abbc6b0afc0aa" - -[[projects]] - digest = "1:a2ecb56e5053d942aafc86738915fb94c9131bac848c543b8b6764365fd69080" - name = "github.com/golang/protobuf" - packages = [ - "proto", - "ptypes", - "ptypes/any", - "ptypes/duration", - "ptypes/timestamp", - "ptypes/wrappers", - ] - pruneopts = "T" - revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" - version = "v1.2.0" - -[[projects]] - branch = "master" - digest = "1:0bfbe13936953a98ae3cfe8ed6670d396ad81edf069a806d2f6515d7bb6950df" - name = "github.com/google/btree" - packages = ["."] - pruneopts = "T" - revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306" - -[[projects]] - digest = "1:ec7c114271a6226a146c64cb0d95348ac85350fde7dbb2564a1911165aa63ced" - name = "github.com/google/go-cmp" - packages = [ - "cmp", - "cmp/internal/diff", - "cmp/internal/flags", - "cmp/internal/function", - "cmp/internal/value", - ] - pruneopts = "T" - revision = "6f77996f0c42f7b84e5a2b252227263f93432e9b" - version = "v0.3.0" - -[[projects]] - branch = "master" - digest = "1:3ee90c0d94da31b442dde97c99635aaafec68d0b8a3c12ee2075c6bdabeec6bb" - name = "github.com/google/gofuzz" - packages = ["."] - pruneopts = "T" - revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" - -[[projects]] - digest = "1:236d7e1bdb50d8f68559af37dbcf9d142d56b431c9b2176d41e2a009b664cda8" - name = "github.com/google/uuid" - packages = ["."] - pruneopts = "T" - revision = "9b3b1e0f5f99ae461456d768e7d301a7acdaa2d8" - version = "v1.1.0" - -[[projects]] - digest = "1:35735e2255fa34521c2a1355fb2a3a2300bc9949f487be1c1ce8ee8efcfa2d04" - name = "github.com/googleapis/gnostic" - packages = [ - "OpenAPIv2", - "compiler", - "extensions", - ] - pruneopts = "T" - revision = "7c663266750e7d82587642f65e60bc4083f1f84e" - version = "v0.2.0" - -[[projects]] - branch = "master" - digest = "1:115dd91e62130f4751ab7bf3f9e892bc3b46670a99d5f680128082fe470cbcf4" - name = "github.com/gophercloud/gophercloud" - packages = [ - ".", - "openstack", - "openstack/identity/v2/tenants", - "openstack/identity/v2/tokens", - "openstack/identity/v3/tokens", - "openstack/utils", - "pagination", - ] - pruneopts = "T" - revision = "94924357ebf6c7d448c70d65082ff7ca6f78ddc5" - -[[projects]] - digest = "1:664d37ea261f0fc73dd17f4a1f5f46d01fbb0b0d75f6375af064824424109b7d" - name = "github.com/gorilla/handlers" - packages = ["."] - pruneopts = "T" - revision = "7e0847f9db758cdebd26c149d0ae9d5d0b9c98ce" - version = "v1.4.0" - -[[projects]] - digest = "1:03e234a7f71e1bab87804517e5f729b4cc3534cabd2b7cc692052282f6215192" - name = "github.com/gorilla/mux" - packages = ["."] - pruneopts = "T" - revision = "a7962380ca08b5a188038c69871b8d3fbdf31e89" - version = "v1.7.0" - -[[projects]] - branch = "master" - digest = "1:fae5efc46b655e70e982e4d8b6af5a829333bc98edfaa91dde5ac608f142c00c" - name = "github.com/gosuri/uitable" - packages = [ - ".", - "util/strutil", - "util/wordwrap", - ] - pruneopts = "T" - revision = "36ee7e946282a3fb1cfecd476ddc9b35d8847e42" - -[[projects]] - branch = "master" - digest = "1:8c0ceab65d43f49dce22aac0e8f670c170fc74dcf2dfba66d3a89516f7ae2c15" - name = "github.com/gregjones/httpcache" - packages = [ - ".", - "diskcache", - ] - pruneopts = "T" - revision = "c63ab54fda8f77302f8d414e19933f2b6026a089" - -[[projects]] - digest = "1:8ec8d88c248041a6df5f6574b87bc00e7e0b493881dad2e7ef47b11dc69093b5" - name = "github.com/hashicorp/golang-lru" - packages = [ - ".", - "simplelru", - ] - pruneopts = "T" - revision = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768" - version = "v0.5.0" - -[[projects]] - digest = "1:f9a5e090336881be43cfc1cf468330c1bdd60abdc9dd194e0b1ab69f4b94dd7c" - name = "github.com/huandu/xstrings" - packages = ["."] - pruneopts = "T" - revision = "f02667b379e2fb5916c3cda2cf31e0eb885d79f8" - version = "v1.2.0" - -[[projects]] - digest = "1:3477d9dd8c135faab978bac762eaeafb31f28d6da97ef500d5c271966f74140a" - name = "github.com/imdario/mergo" - packages = ["."] - pruneopts = "T" - revision = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4" - version = "v0.3.6" - -[[projects]] - digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" - name = "github.com/inconshreveable/mousetrap" - packages = ["."] - pruneopts = "T" - revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" - version = "v1.0" - -[[projects]] - digest = "1:5d713dbcad44f3358fec51fd5573d4f733c02cac5a40dcb177787ad5ffe9272f" - name = "github.com/json-iterator/go" - packages = ["."] - pruneopts = "T" - revision = "1624edc4454b8682399def8740d46db5e4362ba4" - version = "v1.1.5" - -[[projects]] - branch = "master" - digest = "1:caf6db28595425c0e0f2301a00257d11712f65c1878e12cffc42f6b9a9cf3f23" - name = "github.com/kardianos/osext" - packages = ["."] - pruneopts = "T" - revision = "ae77be60afb1dcacde03767a8c37337fad28ac14" - -[[projects]] - digest = "1:0a69a1c0db3591fcefb47f115b224592c8dfa4368b7ba9fae509d5e16cdc95c8" - name = "github.com/konsorten/go-windows-terminal-sequences" - packages = ["."] - pruneopts = "T" - revision = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242" - version = "v1.0.1" - -[[projects]] - branch = "master" - digest = "1:4be65cb3a11626a0d89fc72b34f62a8768040512d45feb086184ac30fdfbef65" - name = "github.com/mailru/easyjson" - packages = [ - "buffer", - "jlexer", - "jwriter", - ] - pruneopts = "T" - revision = "60711f1a8329503b04e1c88535f419d0bb440bff" - -[[projects]] - digest = "1:0356f3312c9bd1cbeda81505b7fd437501d8e778ab66998ef69f00d7f9b3a0d7" - name = "github.com/mattn/go-runewidth" - packages = ["."] - pruneopts = "T" - revision = "3ee7d812e62a0804a7d0a324e0249ca2db3476d3" - version = "v0.0.4" - -[[projects]] - digest = "1:7efe48dea4db6b35dcc15e15394b627247e5b3fb814242de986b746ba8e0abf0" - name = "github.com/mattn/go-shellwords" - packages = ["."] - pruneopts = "T" - revision = "02e3cf038dcea8290e44424da473dd12be796a8a" - version = "v1.0.3" - -[[projects]] - digest = "1:a8e3d14801bed585908d130ebfc3b925ba642208e6f30d879437ddfc7bb9b413" - name = "github.com/matttproud/golang_protobuf_extensions" - packages = ["pbutil"] - pruneopts = "T" - revision = "c12348ce28de40eed0136aa2b644d0ee0650e56c" - version = "v1.0.1" - -[[projects]] - digest = "1:ceb81990372dadfe39e96b9b3df793d4838bbc21cfa02d2f34e7fcbbed227f37" - name = "github.com/miekg/dns" - packages = ["."] - pruneopts = "T" - revision = "0d29b283ac0f967dd3a02739bf26a22702210d7a" - -[[projects]] - digest = "1:abf08734a6527df70ed361d7c369fb580e6840d8f7a6012e5f609fdfd93b4e48" - name = "github.com/mitchellh/go-wordwrap" - packages = ["."] - pruneopts = "T" - revision = "9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c" - version = "v1.0.0" - -[[projects]] - digest = "1:33422d238f147d247752996a26574ac48dcf472976eda7f5134015f06bf16563" - name = "github.com/modern-go/concurrent" - packages = ["."] - pruneopts = "T" - revision = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94" - version = "1.0.3" - -[[projects]] - digest = "1:e32bdbdb7c377a07a9a46378290059822efdce5c8d96fe71940d87cb4f918855" - name = "github.com/modern-go/reflect2" - packages = ["."] - pruneopts = "T" - revision = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd" - version = "1.0.1" - -[[projects]] - digest = "1:ee4d4af67d93cc7644157882329023ce9a7bcfce956a079069a9405521c7cc8d" - name = "github.com/opencontainers/go-digest" - packages = ["."] - pruneopts = "T" - revision = "279bed98673dd5bef374d3b6e4b09e2af76183bf" - version = "v1.0.0-rc1" - -[[projects]] - digest = "1:eb47da2fdabb69f64ce3a42a1790ec0ed9da6718c8378f3fdc41cbe6af184519" - name = "github.com/opencontainers/image-spec" - packages = [ - "specs-go", - "specs-go/v1", - ] - pruneopts = "T" - revision = "d60099175f88c47cd379c4738d158884749ed235" - version = "v1.0.1" - -[[projects]] - digest = "1:52254f0d6ce1358972c08cb1ecd91a449af3a7f927f829abec962613fb167403" - name = "github.com/opencontainers/runc" - packages = [ - "libcontainer/system", - "libcontainer/user", - ] - pruneopts = "T" - revision = "baf6536d6259209c3edfa2b22237af82942d3dfa" - version = "v0.1.1" - -[[projects]] - branch = "master" - digest = "1:0c29d499ffc3b9f33e7136444575527d0c3a9463a89b3cbeda0523b737f910b3" - name = "github.com/petar/GoLLRB" - packages = ["llrb"] - pruneopts = "T" - revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" - -[[projects]] - digest = "1:598241bd36d3a5f6d9102a306bd9bf78f3bc253672460d92ac70566157eae648" - name = "github.com/peterbourgon/diskv" - packages = ["."] - pruneopts = "T" - revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" - version = "v2.0.1" - -[[projects]] - digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "T" - revision = "645ef00459ed84a119197bfb8d8205042c6df63d" - version = "v0.8.0" - -[[projects]] - digest = "1:22aa691fe0213cb5c07d103f9effebcb7ad04bee45a0ce5fe5369d0ca2ec3a1f" - name = "github.com/pmezard/go-difflib" - packages = ["difflib"] - pruneopts = "T" - revision = "792786c7400a136282c1664665ae0a8db921c6c2" - version = "v1.0.0" - -[[projects]] - digest = "1:3b5729e3fc486abc6fc16ce026331c3d196e788c3b973081ecf5d28ae3e1050d" - name = "github.com/prometheus/client_golang" - packages = [ - "prometheus", - "prometheus/internal", - "prometheus/promhttp", - ] - pruneopts = "T" - revision = "505eaef017263e299324067d40ca2c48f6a2cf50" - version = "v0.9.2" - -[[projects]] - branch = "master" - digest = "1:cd67319ee7536399990c4b00fae07c3413035a53193c644549a676091507cadc" - name = "github.com/prometheus/client_model" - packages = ["go"] - pruneopts = "T" - revision = "fd36f4220a901265f90734c3183c5f0c91daa0b8" - -[[projects]] - digest = "1:1688d03416102590c2a93f23d44e4297cb438bff146830aae35e66b33c9af114" - name = "github.com/prometheus/common" - packages = [ - "expfmt", - "internal/bitbucket.org/ww/goautoneg", - "model", - ] - pruneopts = "T" - revision = "cfeb6f9992ffa54aaa4f2170ade4067ee478b250" - version = "v0.2.0" - -[[projects]] - branch = "master" - digest = "1:eb94fa4ad4d1e3c7a084f6f19d60a7dbafa3194147655e2b5db14e8bc9dcef74" - name = "github.com/prometheus/procfs" - packages = [ - ".", - "internal/util", - "nfs", - "xfs", - ] - pruneopts = "T" - revision = "316cf8ccfec56d206735d46333ca162eb374da8b" - -[[projects]] - digest = "1:40e527269f1feb16b3069bfe80ff05a462d190eacfe07eb0a59fa25c381db7af" - name = "github.com/russross/blackfriday" - packages = ["."] - pruneopts = "T" - revision = "05f3235734ad95d0016f6a23902f06461fcf567a" - version = "v1.5.2" - -[[projects]] - digest = "1:425d221445ea27aaad740ed99e2be7cb463528526e63f6c599ad7d28f7ecea45" - name = "github.com/sirupsen/logrus" - packages = ["."] - pruneopts = "T" - revision = "839c75faf7f98a33d445d181f3018b5c3409a45e" - version = "v1.4.2" - -[[projects]] - digest = "1:674fedb5641490b913f0f01e4f97f3f578f7a1c5f106cd47cfd5394eca8155db" - name = "github.com/spf13/cobra" - packages = [ - ".", - "doc", - ] - pruneopts = "T" - revision = "67fc4837d267bc9bfd6e47f77783fcc3dffc68de" - version = "v0.0.4" - -[[projects]] - digest = "1:0f775ea7a72e30d5574267692aaa9ff265aafd15214a7ae7db26bc77f2ca04dc" - name = "github.com/spf13/pflag" - packages = ["."] - pruneopts = "T" - revision = "298182f68c66c05229eb03ac171abe6e309ee79a" - version = "v1.0.3" - -[[projects]] - digest = "1:17c4ccf5cdb1627aaaeb5c1725cb13aec97b63ea2033d4a6824dcaedf94223dc" - name = "github.com/stretchr/testify" - packages = [ - "assert", - "require", - "suite", - ] - pruneopts = "T" - revision = "ffdc059bfe9ce6a4e144ba849dbedead332c6053" - version = "v1.3.0" - -[[projects]] - branch = "master" - digest = "1:f4e5276a3b356f4692107047fd2890f2fe534f4feeb6b1fd2f6dfbd87f1ccf54" - name = "github.com/xeipuuv/gojsonpointer" - packages = ["."] - pruneopts = "T" - revision = "4e3ac2762d5f479393488629ee9370b50873b3a6" - -[[projects]] - branch = "master" - digest = "1:dc6a6c28ca45d38cfce9f7cb61681ee38c5b99ec1425339bfc1e1a7ba769c807" - name = "github.com/xeipuuv/gojsonreference" - packages = ["."] - pruneopts = "T" - revision = "bd5ef7bd5415a7ac448318e64f11a24cd21e594b" - -[[projects]] - digest = "1:6d01aadbf9c582bc90c520707fcab1e63af19649218d785c49d6aa561c8948a8" - name = "github.com/xeipuuv/gojsonschema" - packages = ["."] - pruneopts = "T" - revision = "f971f3cd73b2899de6923801c147f075263e0c50" - version = "v1.1.0" - -[[projects]] - digest = "1:89d64b91ff6c1ede3cbc3f3ff6ac101977ee5e56547aebb85af5504adbdb4c63" - name = "github.com/xenolf/lego" - packages = ["acme"] - pruneopts = "T" - revision = "a9d8cec0e6563575e5868a005359ac97911b5985" - -[[projects]] - branch = "master" - digest = "1:f5abbb52b11b97269d74b7ebf9e057e8e34d477eedd171741fe21cc190bedb02" - name = "github.com/yvasiyarov/go-metrics" - packages = ["."] - pruneopts = "T" - revision = "c25f46c4b94079672242ec48a545e7ca9ebe3aec" - -[[projects]] - digest = "1:6ce16ef7a4c7f60d648676d2c1fbf142c6dbdb96624743472078260150d519c2" - name = "github.com/yvasiyarov/gorelic" - packages = ["."] - pruneopts = "T" - revision = "4dc1bb7ab951bc884feb2c009092b1a454152355" - version = "v0.0.6" - -[[projects]] - digest = "1:c20b060d66ecf0fe4dfbef1bc7d314b352289b8f6cd37069abb5ba6a0f8e0b91" - name = "github.com/yvasiyarov/newrelic_platform_go" - packages = ["."] - pruneopts = "T" - revision = "b21fdbd4370f3717f3bbd2bf41c223bc273068e6" - -[[projects]] - digest = "1:b6f574d818cb549185939ce3c228983b339eeba4aee229c74c5848ff9e806836" - name = "go.opencensus.io" - packages = [ - ".", - "exemplar", - "internal", - "internal/tagencoding", - "plugin/ochttp", - "plugin/ochttp/propagation/b3", - "plugin/ochttp/propagation/tracecontext", - "stats", - "stats/internal", - "stats/view", - "tag", - "trace", - "trace/internal", - "trace/propagation", - "trace/tracestate", - ] - pruneopts = "T" - revision = "b7bf3cdb64150a8c8c53b769fdeb2ba581bd4d4b" - version = "v0.18.0" - -[[projects]] - branch = "master" - digest = "1:d470cb69884835b1800e93ceceb85afcf981ea647e61d99398a76af7a95bad6a" - name = "golang.org/x/crypto" - packages = [ - "bcrypt", - "blowfish", - "cast5", - "ed25519", - "ed25519/internal/edwards25519", - "ocsp", - "openpgp", - "openpgp/armor", - "openpgp/clearsign", - "openpgp/elgamal", - "openpgp/errors", - "openpgp/packet", - "openpgp/s2k", - "pbkdf2", - "scrypt", - "ssh/terminal", - ] - pruneopts = "T" - revision = "505ab145d0a99da450461ae2c1a9f6cd10d1f447" - -[[projects]] - branch = "master" - digest = "1:6a668f89e7e121bf970a6dc37c729f05f5261ae64e27945326d896ad158e5a10" - name = "golang.org/x/net" - packages = [ - "bpf", - "context", - "context/ctxhttp", - "http/httpguts", - "http2", - "http2/hpack", - "idna", - "internal/iana", - "internal/socket", - "internal/socks", - "internal/timeseries", - "ipv4", - "ipv6", - "proxy", - "publicsuffix", - "trace", - ] - pruneopts = "T" - revision = "927f97764cc334a6575f4b7a1584a147864d5723" - -[[projects]] - branch = "master" - digest = "1:320e5ba9ea8000060bec710764b8b26c251ee28f6012422b669cb8cb100c9815" - name = "golang.org/x/oauth2" - packages = [ - ".", - "google", - "internal", - "jws", - "jwt", - ] - pruneopts = "T" - revision = "d668ce993890a79bda886613ee587a69dd5da7a6" - -[[projects]] - branch = "master" - digest = "1:6932d1ef4294f3ea819748e89d1003f5df3804b20b84b5f1c60f8f1d7c933e2d" - name = "golang.org/x/sync" - packages = [ - "errgroup", - "semaphore", - ] - pruneopts = "T" - revision = "37e7f081c4d4c64e13b10787722085407fe5d15f" - -[[projects]] - branch = "master" - digest = "1:50eb9e3f847dc29971fecac71bf84a32e9d756dd34216cf9219c50bd3801b4c4" - name = "golang.org/x/sys" - packages = [ - "unix", - "windows", - ] - pruneopts = "T" - revision = "b4a75ba826a64a70990f11a225237acd6ef35c9f" - -[[projects]] - digest = "1:6164911cb5e94e8d8d5131d646613ff82c14f5a8ce869de2f6d80d9889df8c5a" - name = "golang.org/x/text" - packages = [ - "collate", - "collate/build", - "encoding", - "encoding/internal", - "encoding/internal/identifier", - "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", - ] - pruneopts = "T" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" - -[[projects]] - branch = "master" - digest = "1:077216d94c076b8cd7bd057cb6f7c6d224970cc991bdfe49c0c7a24e8e39ee33" - name = "golang.org/x/time" - packages = ["rate"] - pruneopts = "T" - revision = "85acf8d2951cb2a3bde7632f9ff273ef0379bcbd" - -[[projects]] - branch = "master" - digest = "1:9eaf0fc3f9a9b24531d89e1e0adf916e0d3f5ac7d3ce61f520af19212b1798b0" - name = "google.golang.org/api" - packages = ["support/bundler"] - pruneopts = "T" - revision = "65a46cafb132eff435c7d1e0f439cc73c8eebb85" - -[[projects]] - digest = "1:1469235a5a8e192cfe6a99c4804b883a02f0ff96a693cd1660515a3a3b94d5ac" - name = "google.golang.org/appengine" - packages = [ - ".", - "internal", - "internal/app_identity", - "internal/base", - "internal/datastore", - "internal/log", - "internal/modules", - "internal/remote_api", - "internal/urlfetch", - "urlfetch", - ] - pruneopts = "T" - revision = "e9657d882bb81064595ca3b56cbe2546bbabf7b1" - version = "v1.4.0" - -[[projects]] - branch = "master" - digest = "1:8c7bf8f974d0b63a83834e83b6dd39c2b40d61d409d76172c81d67eba8fee4a8" - name = "google.golang.org/genproto" - packages = ["googleapis/rpc/status"] - pruneopts = "T" - revision = "bd9b4fb69e2ffd37621a6caa54dcbead29b546f2" - -[[projects]] - digest = "1:c32026b4d2b9f7240ad72edf0dffca4e5863d5edc1ea25416d64929926b5ac67" - name = "google.golang.org/grpc" - packages = [ - ".", - "balancer", - "balancer/base", - "balancer/roundrobin", - "binarylog/grpc_binarylog_v1", - "codes", - "connectivity", - "credentials", - "credentials/internal", - "encoding", - "encoding/proto", - "grpclog", - "internal", - "internal/backoff", - "internal/binarylog", - "internal/channelz", - "internal/envconfig", - "internal/grpcrand", - "internal/grpcsync", - "internal/syscall", - "internal/transport", - "keepalive", - "metadata", - "naming", - "peer", - "resolver", - "resolver/dns", - "resolver/passthrough", - "stats", - "status", - "tap", - ] - pruneopts = "T" - revision = "df014850f6dee74ba2fc94874043a9f3f75fbfd8" - version = "v1.17.0" - -[[projects]] - digest = "1:2d1fbdc6777e5408cabeb02bf336305e724b925ff4546ded0fa8715a7267922a" - name = "gopkg.in/inf.v0" - packages = ["."] - pruneopts = "T" - revision = "d2d2541c53f18d2a059457998ce2876cc8e67cbf" - source = "https://github.com/go-inf/inf.git" - version = "v0.9.1" - -[[projects]] - digest = "1:12f4009e9a437d974387eaf60699ac6a401d146fe8560b01c16478c629af59b4" - name = "gopkg.in/square/go-jose.v1" - packages = [ - ".", - "cipher", - "json", - ] - pruneopts = "T" - revision = "56062818b5e15ee405eb8363f9498c7113e98337" - source = "https://github.com/square/go-jose.git" - version = "v1.1.2" - -[[projects]] - digest = "1:3effe4e6f8af2d27c9cd6070c7c332344490cbeeaa5476ae2bc9e05eb1079f0c" - name = "gopkg.in/square/go-jose.v2" - packages = [ - ".", - "cipher", - "json", - "jwt", - ] - pruneopts = "T" - revision = "628223f44a71f715d2881ea69afc795a1e9c01be" - source = "https://github.com/square/go-jose.git" - version = "v2.3.0" - -[[projects]] - digest = "1:4d2e5a73dc1500038e504a8d78b986630e3626dc027bc030ba5c75da257cdb96" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "T" - revision = "51d6538a90f86fe93ac480b35f37b2be17fef232" - source = "https://github.com/go-yaml/yaml" - version = "v2.2.2" - -[[projects]] - branch = "release-1.15" - digest = "1:0f34ccf9357fb875ee20b8ba48a240576dfbb1a247d0f1c763f2fec6e93d2e32" - name = "k8s.io/api" - packages = [ - "admission/v1beta1", - "admissionregistration/v1beta1", - "apps/v1", - "apps/v1beta1", - "apps/v1beta2", - "auditregistration/v1alpha1", - "authentication/v1", - "authentication/v1beta1", - "authorization/v1", - "authorization/v1beta1", - "autoscaling/v1", - "autoscaling/v2beta1", - "autoscaling/v2beta2", - "batch/v1", - "batch/v1beta1", - "batch/v2alpha1", - "certificates/v1beta1", - "coordination/v1", - "coordination/v1beta1", - "core/v1", - "events/v1beta1", - "extensions/v1beta1", - "imagepolicy/v1alpha1", - "networking/v1", - "networking/v1beta1", - "node/v1alpha1", - "node/v1beta1", - "policy/v1beta1", - "rbac/v1", - "rbac/v1alpha1", - "rbac/v1beta1", - "scheduling/v1", - "scheduling/v1alpha1", - "scheduling/v1beta1", - "settings/v1alpha1", - "storage/v1", - "storage/v1alpha1", - "storage/v1beta1", - ] - pruneopts = "T" - revision = "1634385ce4626e4da21367d139c4ee5d72437e3b" - -[[projects]] - branch = "release-1.15" - digest = "1:dffbde7aabb4d8c613f9dd53317fd5b3aa0b2722cd4d7159772be68637116793" - name = "k8s.io/apiextensions-apiserver" - packages = [ - "pkg/apis/apiextensions", - "pkg/apis/apiextensions/v1beta1", - "pkg/features", - ] - pruneopts = "T" - revision = "23f08c7096c0273b53178de488b95473d5cd3808" - -[[projects]] - branch = "release-1.15" - digest = "1:2656a0f23465fb97265dd7dc176fada8e954dd191f198aa32e6bb52597514aa4" - name = "k8s.io/apimachinery" - packages = [ - "pkg/api/equality", - "pkg/api/errors", - "pkg/api/meta", - "pkg/api/meta/testrestmapper", - "pkg/api/resource", - "pkg/api/validation", - "pkg/apis/meta/internalversion", - "pkg/apis/meta/v1", - "pkg/apis/meta/v1/unstructured", - "pkg/apis/meta/v1/unstructured/unstructuredscheme", - "pkg/apis/meta/v1/validation", - "pkg/apis/meta/v1beta1", - "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/duration", - "pkg/util/errors", - "pkg/util/framer", - "pkg/util/httpstream", - "pkg/util/httpstream/spdy", - "pkg/util/intstr", - "pkg/util/json", - "pkg/util/mergepatch", - "pkg/util/naming", - "pkg/util/net", - "pkg/util/rand", - "pkg/util/remotecommand", - "pkg/util/runtime", - "pkg/util/sets", - "pkg/util/strategicpatch", - "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", - ] - pruneopts = "T" - revision = "1799e75a07195de9460b8ef7300883499f12127b" - -[[projects]] - branch = "release-1.15" - digest = "1:9e18a8310252d4101ea877fb517b52ca76975742065d86e9cf525f3ddda38b7e" - name = "k8s.io/apiserver" - packages = [ - "pkg/authentication/authenticator", - "pkg/authentication/serviceaccount", - "pkg/authentication/user", - "pkg/features", - "pkg/util/feature", - ] - pruneopts = "T" - revision = "07da2c5601ffacb40aecb4ad92adea2c775d1dd9" - -[[projects]] - branch = "master" - digest = "1:cd2774546a9f0db8e29e6a9792a1b5a7fabf7c0091f7b2845ad048652d74fcc2" - name = "k8s.io/cli-runtime" - packages = [ - "pkg/genericclioptions", - "pkg/kustomize", - "pkg/kustomize/k8sdeps", - "pkg/kustomize/k8sdeps/configmapandsecret", - "pkg/kustomize/k8sdeps/kunstruct", - "pkg/kustomize/k8sdeps/kv", - "pkg/kustomize/k8sdeps/transformer", - "pkg/kustomize/k8sdeps/transformer/hash", - "pkg/kustomize/k8sdeps/transformer/patch", - "pkg/kustomize/k8sdeps/validator", - "pkg/printers", - "pkg/resource", - ] - pruneopts = "T" - revision = "44a48934c135b31e4f1c0d12e91d384e1cb2304c" - -[[projects]] - digest = "1:0b9d76929add96339229991d4aeabf4ad1dc716bc8e1353e17a3d3d543480070" - name = "k8s.io/client-go" - packages = [ - "discovery", - "discovery/cached/disk", - "discovery/fake", - "dynamic", - "dynamic/dynamicinformer", - "dynamic/dynamiclister", - "dynamic/fake", - "informers", - "informers/admissionregistration", - "informers/admissionregistration/v1beta1", - "informers/apps", - "informers/apps/v1", - "informers/apps/v1beta1", - "informers/apps/v1beta2", - "informers/auditregistration", - "informers/auditregistration/v1alpha1", - "informers/autoscaling", - "informers/autoscaling/v1", - "informers/autoscaling/v2beta1", - "informers/autoscaling/v2beta2", - "informers/batch", - "informers/batch/v1", - "informers/batch/v1beta1", - "informers/batch/v2alpha1", - "informers/certificates", - "informers/certificates/v1beta1", - "informers/coordination", - "informers/coordination/v1", - "informers/coordination/v1beta1", - "informers/core", - "informers/core/v1", - "informers/events", - "informers/events/v1beta1", - "informers/extensions", - "informers/extensions/v1beta1", - "informers/internalinterfaces", - "informers/networking", - "informers/networking/v1", - "informers/networking/v1beta1", - "informers/node", - "informers/node/v1alpha1", - "informers/node/v1beta1", - "informers/policy", - "informers/policy/v1beta1", - "informers/rbac", - "informers/rbac/v1", - "informers/rbac/v1alpha1", - "informers/rbac/v1beta1", - "informers/scheduling", - "informers/scheduling/v1", - "informers/scheduling/v1alpha1", - "informers/scheduling/v1beta1", - "informers/settings", - "informers/settings/v1alpha1", - "informers/storage", - "informers/storage/v1", - "informers/storage/v1alpha1", - "informers/storage/v1beta1", - "kubernetes", - "kubernetes/fake", - "kubernetes/scheme", - "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/auditregistration/v1alpha1", - "kubernetes/typed/auditregistration/v1alpha1/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/autoscaling/v2beta2", - "kubernetes/typed/autoscaling/v2beta2/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/coordination/v1", - "kubernetes/typed/coordination/v1/fake", - "kubernetes/typed/coordination/v1beta1", - "kubernetes/typed/coordination/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/networking/v1beta1", - "kubernetes/typed/networking/v1beta1/fake", - "kubernetes/typed/node/v1alpha1", - "kubernetes/typed/node/v1alpha1/fake", - "kubernetes/typed/node/v1beta1", - "kubernetes/typed/node/v1beta1/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/v1", - "kubernetes/typed/scheduling/v1/fake", - "kubernetes/typed/scheduling/v1alpha1", - "kubernetes/typed/scheduling/v1alpha1/fake", - "kubernetes/typed/scheduling/v1beta1", - "kubernetes/typed/scheduling/v1beta1/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", - "listers/admissionregistration/v1beta1", - "listers/apps/v1", - "listers/apps/v1beta1", - "listers/apps/v1beta2", - "listers/auditregistration/v1alpha1", - "listers/autoscaling/v1", - "listers/autoscaling/v2beta1", - "listers/autoscaling/v2beta2", - "listers/batch/v1", - "listers/batch/v1beta1", - "listers/batch/v2alpha1", - "listers/certificates/v1beta1", - "listers/coordination/v1", - "listers/coordination/v1beta1", - "listers/core/v1", - "listers/events/v1beta1", - "listers/extensions/v1beta1", - "listers/networking/v1", - "listers/networking/v1beta1", - "listers/node/v1alpha1", - "listers/node/v1beta1", - "listers/policy/v1beta1", - "listers/rbac/v1", - "listers/rbac/v1alpha1", - "listers/rbac/v1beta1", - "listers/scheduling/v1", - "listers/scheduling/v1alpha1", - "listers/scheduling/v1beta1", - "listers/settings/v1alpha1", - "listers/storage/v1", - "listers/storage/v1alpha1", - "listers/storage/v1beta1", - "pkg/apis/clientauthentication", - "pkg/apis/clientauthentication/v1alpha1", - "pkg/apis/clientauthentication/v1beta1", - "pkg/version", - "plugin/pkg/client/auth", - "plugin/pkg/client/auth/azure", - "plugin/pkg/client/auth/exec", - "plugin/pkg/client/auth/gcp", - "plugin/pkg/client/auth/oidc", - "plugin/pkg/client/auth/openstack", - "rest", - "rest/fake", - "rest/watch", - "restmapper", - "scale", - "scale/scheme", - "scale/scheme/appsint", - "scale/scheme/appsv1beta1", - "scale/scheme/appsv1beta2", - "scale/scheme/autoscalingv1", - "scale/scheme/extensionsint", - "scale/scheme/extensionsv1beta1", - "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/pager", - "tools/record", - "tools/record/util", - "tools/reference", - "tools/remotecommand", - "tools/watch", - "transport", - "transport/spdy", - "util/cert", - "util/connrotation", - "util/exec", - "util/flowcontrol", - "util/homedir", - "util/jsonpath", - "util/keyutil", - "util/retry", - ] - pruneopts = "T" - revision = "8e956561bbf57253b1d19c449d0f24e8cb18d467" - version = "kubernetes-1.15.1" - -[[projects]] - branch = "master" - digest = "1:bde2bf8d78ad97dbe011a98ed73e0706f2e2d8c80e80caf90f35c6a9620af623" - name = "k8s.io/component-base" - packages = ["featuregate"] - pruneopts = "T" - revision = "b4f50308a6168b3e1e8687b3fb46e9bf1a112ee5" - -[[projects]] - digest = "1:7a3ef99d492d30157b8e933624a8f0292b4cee5934c23269f7640c8030eb83cd" - name = "k8s.io/klog" - packages = ["."] - pruneopts = "T" - revision = "a5bc97fbc634d635061f3146511332c7e313a55a" - version = "v0.1.0" - -[[projects]] - branch = "master" - digest = "1:90f16a49f856e6d94089444e487c535f4cd41f59a1e90c51deb9dcf965f3c50b" - name = "k8s.io/kube-openapi" - packages = [ - "pkg/common", - "pkg/util/proto", - "pkg/util/proto/testing", - "pkg/util/proto/validation", - ] - pruneopts = "T" - revision = "0317810137be915b9cf888946c6e115c1bfac693" - -[[projects]] - branch = "release-1.15" - digest = "1:06497e8bfb946cef502730eb1ab10dc4e60bac72123f634eef162aaf44999474" - name = "k8s.io/kubernetes" - packages = [ - "pkg/api/legacyscheme", - "pkg/api/service", - "pkg/api/v1/pod", - "pkg/apis/apps", - "pkg/apis/autoscaling", - "pkg/apis/core", - "pkg/apis/core/helper", - "pkg/apis/core/install", - "pkg/apis/core/pods", - "pkg/apis/core/v1", - "pkg/apis/core/v1/helper", - "pkg/apis/core/validation", - "pkg/apis/scheduling", - "pkg/capabilities", - "pkg/controller", - "pkg/controller/deployment/util", - "pkg/features", - "pkg/fieldpath", - "pkg/kubectl", - "pkg/kubectl/apps", - "pkg/kubectl/cmd/testing", - "pkg/kubectl/cmd/util", - "pkg/kubectl/cmd/util/openapi", - "pkg/kubectl/cmd/util/openapi/testing", - "pkg/kubectl/cmd/util/openapi/validation", - "pkg/kubectl/describe", - "pkg/kubectl/describe/versioned", - "pkg/kubectl/scheme", - "pkg/kubectl/util", - "pkg/kubectl/util/certificate", - "pkg/kubectl/util/deployment", - "pkg/kubectl/util/event", - "pkg/kubectl/util/fieldpath", - "pkg/kubectl/util/interrupt", - "pkg/kubectl/util/podutils", - "pkg/kubectl/util/qos", - "pkg/kubectl/util/rbac", - "pkg/kubectl/util/resource", - "pkg/kubectl/util/slice", - "pkg/kubectl/util/storage", - "pkg/kubectl/util/templates", - "pkg/kubectl/util/term", - "pkg/kubectl/validation", - "pkg/kubectl/version", - "pkg/kubelet/types", - "pkg/master/ports", - "pkg/security/apparmor", - "pkg/serviceaccount", - "pkg/util/hash", - "pkg/util/labels", - "pkg/util/parsers", - "pkg/util/taints", - ] - pruneopts = "T" - revision = "92b2e906d7aa618588167817feaed137a44e6d92" - -[[projects]] - branch = "master" - digest = "1:50d36d11cbcdc86bca9c3eede8bf7bee9947e2f350b3013a28282edf8d6e8b58" - name = "k8s.io/utils" - packages = [ - "buffer", - "exec", - "integer", - "net", - "path", - "pointer", - "trace", - ] - pruneopts = "T" - revision = "21c4ce38f2a793ec01e925ddc31216500183b773" - -[[projects]] - branch = "master" - digest = "1:15fbb9f95a13abe2be748b1159b491369d46a2ccc3f378e0f93c391f89608929" - name = "rsc.io/letsencrypt" - packages = ["."] - pruneopts = "T" - revision = "1847a81d2087eba73081db43989e54dabe0768cd" - source = "https://github.com/dmcgowan/letsencrypt.git" - -[[projects]] - digest = "1:663cc8454702691d4d089e6df5acc61d87b9c9a933a28b7615200e5b5a4f0cfd" - name = "sigs.k8s.io/kustomize" - packages = [ - "pkg/commands/build", - "pkg/constants", - "pkg/expansion", - "pkg/factory", - "pkg/fs", - "pkg/git", - "pkg/gvk", - "pkg/ifc", - "pkg/ifc/transformer", - "pkg/image", - "pkg/internal/error", - "pkg/loader", - "pkg/patch", - "pkg/patch/transformer", - "pkg/resid", - "pkg/resmap", - "pkg/resource", - "pkg/target", - "pkg/transformers", - "pkg/transformers/config", - "pkg/transformers/config/defaultconfig", - "pkg/types", - ] - pruneopts = "T" - revision = "a6f65144121d1955266b0cd836ce954c04122dc8" - version = "v2.0.3" - -[[projects]] - digest = "1:7719608fe0b52a4ece56c2dde37bedd95b938677d1ab0f84b8a7852e4c59f849" - name = "sigs.k8s.io/yaml" - packages = ["."] - pruneopts = "T" - revision = "fd68e9863619f6ec2fdd8625fe1f02e7c877e480" - version = "v1.1.0" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/BurntSushi/toml", - "github.com/Masterminds/semver", - "github.com/Masterminds/sprig", - "github.com/Masterminds/vcs", - "github.com/asaskevich/govalidator", - "github.com/containerd/containerd/content", - "github.com/containerd/containerd/errdefs", - "github.com/containerd/containerd/remotes", - "github.com/deislabs/oras/pkg/auth", - "github.com/deislabs/oras/pkg/auth/docker", - "github.com/deislabs/oras/pkg/content", - "github.com/deislabs/oras/pkg/context", - "github.com/deislabs/oras/pkg/oras", - "github.com/docker/distribution/configuration", - "github.com/docker/distribution/registry", - "github.com/docker/distribution/registry/auth/htpasswd", - "github.com/docker/distribution/registry/storage/driver/inmemory", - "github.com/docker/docker/pkg/term", - "github.com/docker/go-units", - "github.com/evanphx/json-patch", - "github.com/gobwas/glob", - "github.com/gofrs/flock", - "github.com/gosuri/uitable", - "github.com/mattn/go-shellwords", - "github.com/opencontainers/go-digest", - "github.com/opencontainers/image-spec/specs-go", - "github.com/opencontainers/image-spec/specs-go/v1", - "github.com/pkg/errors", - "github.com/sirupsen/logrus", - "github.com/spf13/cobra", - "github.com/spf13/cobra/doc", - "github.com/spf13/pflag", - "github.com/stretchr/testify/assert", - "github.com/stretchr/testify/require", - "github.com/stretchr/testify/suite", - "github.com/xeipuuv/gojsonschema", - "golang.org/x/crypto/bcrypt", - "golang.org/x/crypto/openpgp", - "golang.org/x/crypto/openpgp/clearsign", - "golang.org/x/crypto/openpgp/errors", - "golang.org/x/crypto/openpgp/packet", - "golang.org/x/crypto/ssh/terminal", - "gopkg.in/yaml.v2", - "k8s.io/api/apps/v1", - "k8s.io/api/apps/v1beta1", - "k8s.io/api/apps/v1beta2", - "k8s.io/api/batch/v1", - "k8s.io/api/core/v1", - "k8s.io/api/extensions/v1beta1", - "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1", - "k8s.io/apimachinery/pkg/api/errors", - "k8s.io/apimachinery/pkg/api/meta", - "k8s.io/apimachinery/pkg/apis/meta/v1", - "k8s.io/apimachinery/pkg/labels", - "k8s.io/apimachinery/pkg/runtime", - "k8s.io/apimachinery/pkg/runtime/schema", - "k8s.io/apimachinery/pkg/types", - "k8s.io/apimachinery/pkg/util/intstr", - "k8s.io/apimachinery/pkg/util/strategicpatch", - "k8s.io/apimachinery/pkg/util/validation", - "k8s.io/apimachinery/pkg/util/wait", - "k8s.io/apimachinery/pkg/watch", - "k8s.io/cli-runtime/pkg/genericclioptions", - "k8s.io/cli-runtime/pkg/resource", - "k8s.io/client-go/discovery", - "k8s.io/client-go/kubernetes", - "k8s.io/client-go/kubernetes/fake", - "k8s.io/client-go/kubernetes/scheme", - "k8s.io/client-go/kubernetes/typed/core/v1", - "k8s.io/client-go/plugin/pkg/client/auth", - "k8s.io/client-go/rest", - "k8s.io/client-go/rest/fake", - "k8s.io/client-go/tools/clientcmd", - "k8s.io/client-go/tools/watch", - "k8s.io/client-go/util/homedir", - "k8s.io/klog", - "k8s.io/kubernetes/pkg/controller/deployment/util", - "k8s.io/kubernetes/pkg/kubectl/cmd/testing", - "k8s.io/kubernetes/pkg/kubectl/cmd/util", - "k8s.io/kubernetes/pkg/kubectl/validation", - "sigs.k8s.io/yaml", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 117f11949..000000000 --- a/Gopkg.toml +++ /dev/null @@ -1,126 +0,0 @@ -[[constraint]] - name = "github.com/BurntSushi/toml" - version = "~0.3.1" - -[[constraint]] - name = "github.com/Masterminds/semver" - version = "~1.4.2" - -[[constraint]] - name = "github.com/Masterminds/sprig" - version = "^2.20.0" - -[[constraint]] - name = "github.com/Masterminds/vcs" - version = "~1.13.0" - -[[constraint]] - name = "github.com/asaskevich/govalidator" - version = "9.0.0" - -[[constraint]] - name = "github.com/gobwas/glob" - version = "~0.2.3" - -[[constraint]] - name = "github.com/gosuri/uitable" - branch = "master" - -[[constraint]] - name = "k8s.io/api" - branch = "release-1.15" - -[[constraint]] - name = "k8s.io/apimachinery" - branch = "release-1.15" - -[[constraint]] - name = "k8s.io/client-go" - version = "kubernetes-1.15.1" - -[[constraint]] - name = "k8s.io/kubernetes" - branch = "release-1.15" - -[[constraint]] - name = "github.com/deislabs/oras" - version = "0.7.0" - -[[constraint]] - name = "github.com/containerd/containerd" - version = "1.3.0-beta.2" - -[[constraint]] - name = "github.com/sirupsen/logrus" - version = "1.4.2" - -[[constraint]] - name = "github.com/docker/go-units" - version = "~0.3.3" - -[[constraint]] - name = "github.com/stretchr/testify" - version = "^1.3.0" - -[[constraint]] - name = "github.com/xeipuuv/gojsonschema" - version = "1.1.0" - -[[constraint]] - name = "github.com/spf13/cobra" - version = "0.0.4" - -[[constraint]] - name = "sigs.k8s.io/yaml" - version = "1.1.0" - -[[constraint]] - name = "github.com/gofrs/flock" - version = "0.7.1" - -[[override]] - name = "sigs.k8s.io/kustomize" - version = "2.0.3" - -[[override]] - name = "k8s.io/apiserver" - branch = "release-1.15" - -[[override]] - name = "k8s.io/apiextensions-apiserver" - branch = "release-1.15" - -[[override]] - name = "github.com/imdario/mergo" - version = "v0.3.5" - -# This override below necessary for using docker/distribution as a test dependency -[[override]] - name = "rsc.io/letsencrypt" - branch = "master" - source = "https://github.com/dmcgowan/letsencrypt.git" - -# gopkg.in is broken -# -# https://github.com/golang/dep/issues/1760 - -[[override]] - name = "gopkg.in/inf.v0" - source = "https://github.com/go-inf/inf.git" - -[[override]] - name = "gopkg.in/square/go-jose.v1" - version = "~1.1.2" - source = "https://github.com/square/go-jose.git" - -[[override]] - name = "gopkg.in/square/go-jose.v2" - version = "~2.3.0" - source = "https://github.com/square/go-jose.git" - -[[override]] - name = "gopkg.in/yaml.v2" - source = "https://github.com/go-yaml/yaml" - -[prune] - go-tests = true diff --git a/Makefile b/Makefile index f01089cc3..e91beb5e3 100644 --- a/Makefile +++ b/Makefile @@ -56,8 +56,8 @@ all: build .PHONY: build build: $(BINDIR)/$(BINNAME) -$(BINDIR)/$(BINNAME): $(SRC) vendor - go build $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $(BINDIR)/$(BINNAME) helm.sh/helm/cmd/helm +$(BINDIR)/$(BINNAME): $(SRC) + GO111MODULE=on go build $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $(BINDIR)/$(BINNAME) helm.sh/helm/cmd/helm # ------------------------------------------------------------------------------ # test @@ -69,20 +69,20 @@ test: test-style test: test-unit .PHONY: test-unit -test-unit: vendor +test-unit: @echo @echo "==> Running unit tests <==" - go test $(GOFLAGS) -run $(TESTS) $(PKG) $(TESTFLAGS) + GO111MODULE=on go test $(GOFLAGS) -run $(TESTS) $(PKG) $(TESTFLAGS) .PHONY: test-coverage -test-coverage: vendor +test-coverage: @echo @echo "==> Running unit tests with coverage <==" @ ./scripts/coverage.sh .PHONY: test-style -test-style: vendor $(GOLANGCI_LINT) - $(GOLANGCI_LINT) run +test-style: $(GOLANGCI_LINT) + GO111MODULE=on $(GOLANGCI_LINT) run @scripts/validate-license.sh .PHONY: test-acceptance @@ -110,44 +110,31 @@ coverage: .PHONY: format format: $(GOIMPORTS) - go list -f '{{.Dir}}' ./... | xargs $(GOIMPORTS) -w -local helm.sh/helm + GO111MODULE=on go list -f '{{.Dir}}' ./... | xargs $(GOIMPORTS) -w -local helm.sh/helm # ------------------------------------------------------------------------------ # dependencies -.PHONY: bootstrap -bootstrap: vendor - -$(DEP): - go get -u github.com/golang/dep/cmd/dep +# If go get is run from inside the project directory it will add the dependencies +# to the go.mod file. To avoid that we change to a directory without a go.mod file +# when downloading the following dependencies $(GOX): - go get -u github.com/mitchellh/gox + (cd /; GO111MODULE=on GO111MODULE=on go get -u github.com/mitchellh/gox) $(GOLANGCI_LINT): - go get -u github.com/golangci/golangci-lint/cmd/golangci-lint + (cd /; GO111MODULE=on go get -u github.com/golangci/golangci-lint/cmd/golangci-lint) $(GOIMPORTS): - go get -u golang.org/x/tools/cmd/goimports - -# install vendored dependencies -vendor: Gopkg.lock - $(DEP) ensure --vendor-only - -# update vendored dependencies -Gopkg.lock: Gopkg.toml - $(DEP) ensure --no-vendor - -Gopkg.toml: $(DEP) + (cd /; GO111MODULE=on GO111MODULE=on go get -u golang.org/x/tools/cmd/goimports) # ------------------------------------------------------------------------------ # release .PHONY: build-cross build-cross: LDFLAGS += -extldflags "-static" -build-cross: vendor build-cross: $(GOX) - CGO_ENABLED=0 $(GOX) -parallel=3 -output="_dist/{{.OS}}-{{.Arch}}/$(BINNAME)" -osarch='$(TARGETS)' $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' helm.sh/helm/cmd/helm + GO111MODULE=on CGO_ENABLED=0 $(GOX) -parallel=3 -output="_dist/{{.OS}}-{{.Arch}}/$(BINNAME)" -osarch='$(TARGETS)' $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' helm.sh/helm/cmd/helm .PHONY: dist dist: diff --git a/go.mod b/go.mod new file mode 100644 index 000000000..c7592ce40 --- /dev/null +++ b/go.mod @@ -0,0 +1,182 @@ +module helm.sh/helm + +go 1.13 + +require ( + cloud.google.com/go v0.38.0 + contrib.go.opencensus.io/exporter/ocagent v0.2.0 + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 + github.com/Azure/go-autorest/autorest v0.9.0 + github.com/BurntSushi/toml v0.3.1 + github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e + github.com/Masterminds/goutils v1.1.0 + github.com/Masterminds/semver v1.4.2 + github.com/Masterminds/sprig v2.20.0+incompatible + github.com/Masterminds/vcs v1.13.0 + github.com/Microsoft/go-winio v0.4.12 + github.com/Microsoft/hcsshim v0.8.6 + github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 + github.com/PuerkitoBio/purell v1.1.1 + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 + github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d + github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a + github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 + github.com/bshuster-repo/logrus-logstash-hook v0.4.1 + github.com/bugsnag/bugsnag-go v1.5.0 + github.com/bugsnag/panicwrap v1.2.0 + github.com/census-instrumentation/opencensus-proto v0.1.0 + github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4 + github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 + github.com/cpuguy83/go-md2man v1.0.10 + github.com/davecgh/go-spew v1.1.1 + github.com/deislabs/oras v0.7.0 + github.com/dgrijalva/jwt-go v3.2.0+incompatible + github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d + github.com/docker/distribution v2.7.1+incompatible + github.com/docker/docker v1.4.2-0.20181221150755-2cb26cfe9cbf + github.com/docker/docker-credential-helpers v0.6.1 + github.com/docker/go-connections v0.4.0 + github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 + github.com/docker/go-units v0.3.3 + github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 + github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c + github.com/emicklei/go-restful v2.9.5+incompatible + github.com/evanphx/json-patch v4.2.0+incompatible + github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d + github.com/fatih/camelcase v1.0.0 + github.com/garyburd/redigo v1.6.0 + github.com/ghodss/yaml v1.0.0 + github.com/go-inf/inf v0.9.1 + github.com/go-openapi/jsonpointer v0.19.2 + github.com/go-openapi/jsonreference v0.19.2 + github.com/go-openapi/spec v0.19.2 + github.com/go-openapi/swag v0.19.2 + github.com/gobwas/glob v0.2.3 + github.com/gofrs/flock v0.7.1 + github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d + github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff + github.com/golang/protobuf v1.3.1 + github.com/google/btree v1.0.0 + github.com/google/go-cmp v0.3.0 + github.com/google/gofuzz v1.0.0 + github.com/google/uuid v1.1.1 + github.com/googleapis/gnostic v0.2.0 + github.com/gophercloud/gophercloud v0.1.0 + github.com/gorilla/handlers v1.4.0 + github.com/gorilla/mux v1.7.0 + github.com/gosuri/uitable v0.0.1 + github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f + github.com/grpc-ecosystem/grpc-gateway v1.5.0 // indirect + github.com/hashicorp/golang-lru v0.5.1 + github.com/huandu/xstrings v1.2.0 + github.com/imdario/mergo v0.3.6 + github.com/inconshreveable/mousetrap v1.0.0 + github.com/json-iterator/go v1.1.7 + github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 + github.com/konsorten/go-windows-terminal-sequences v1.0.1 + github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 + github.com/mattn/go-runewidth v0.0.4 + github.com/mattn/go-shellwords v1.0.5 + github.com/matttproud/golang_protobuf_extensions v1.0.1 + github.com/miekg/dns v1.1.4 + github.com/mitchellh/go-wordwrap v1.0.0 + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd + github.com/modern-go/reflect2 v1.0.1 + github.com/opencontainers/go-digest v1.0.0-rc1 + github.com/opencontainers/image-spec v1.0.1 + github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 + github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c + github.com/peterbourgon/diskv v2.0.1+incompatible + github.com/pkg/errors v0.8.1 + github.com/pmezard/go-difflib v1.0.0 + github.com/prometheus/client_golang v0.9.2 + github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 + github.com/prometheus/common v0.2.0 + github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5 + github.com/russross/blackfriday v1.5.2 + github.com/sirupsen/logrus v1.4.2 + github.com/spf13/cobra v0.0.5 + github.com/spf13/pflag v1.0.3 + github.com/square/go-jose v2.3.0+incompatible + github.com/stretchr/testify v1.3.0 + github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 + github.com/xeipuuv/gojsonschema v1.1.0 + github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656 + github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 + github.com/yvasiyarov/gorelic v0.0.6 + github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f + go.opencensus.io v0.21.0 + golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 + golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc + golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 + golang.org/x/sync v0.0.0-20190423024810-112230192c58 + golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f + golang.org/x/text v0.3.2 + golang.org/x/time v0.0.0-20181108054448-85acf8d2951c + google.golang.org/api v0.6.1-0.20190607001116-5213b8090861 + google.golang.org/appengine v1.5.0 + google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 + google.golang.org/grpc v1.23.0 + gopkg.in/yaml.v2 v2.2.2 + k8s.io/api v0.0.0 + k8s.io/apiextensions-apiserver v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/apiserver v0.0.0 + k8s.io/cli-runtime v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/component-base v0.0.0 + k8s.io/klog v0.4.0 + k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf + k8s.io/kubectl v0.0.0 + k8s.io/kubernetes v1.16.0 + k8s.io/utils v0.0.0-20190801114015-581e00157fb1 + sigs.k8s.io/kustomize v2.0.3+incompatible + sigs.k8s.io/yaml v1.1.0 +) + +replace ( + // github.com/Azure/go-autorest/autorest has different versions for the Go + // modules than it does for releases on the repository. Note the correct + // version when updating. + github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.9.0 + github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 + + // Kubernetes imports github.com/miekg/dns at a newer version but it is used + // by a package Helm does not need. Go modules resolves all packages rather + // than just those in use (like Glide and dep do). This sets the version + // to the one oras needs. If oras is updated the version should be updated + // as well. + github.com/miekg/dns => github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f + gopkg.in/inf.v0 v0.9.1 => github.com/go-inf/inf v0.9.1 + gopkg.in/square/go-jose.v2 v2.3.0 => github.com/square/go-jose v2.3.0+incompatible + + // k8s.io/kubernetes has a go.mod file that sets the version of the following + // modules to v0.0.0. This causes go to throw an error. These need to be set + // to a version for Go to process them. Here they are set to the same + // revision as the marked version of Kubernetes. When Kubernetes is updated + // these need to be updated as well. + k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190913145653-2bd9643cee5b + k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190913145653-2bd9643cee5b + k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190913145653-2bd9643cee5b + k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20190913145653-2bd9643cee5b + k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20190913145653-2bd9643cee5b + k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20190913145653-2bd9643cee5b + k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20190913145653-2bd9643cee5b + k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20190913145653-2bd9643cee5b + k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20190913145653-2bd9643cee5b + k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20190913145653-2bd9643cee5b + k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20190913145653-2bd9643cee5b + k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20190913145653-2bd9643cee5b + k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20190913145653-2bd9643cee5b + k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20190913145653-2bd9643cee5b + k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20190913145653-2bd9643cee5b + k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20190913145653-2bd9643cee5b + k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20190913145653-2bd9643cee5b + k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20190913145653-2bd9643cee5b + k8s.io/kubernetes => k8s.io/kubernetes v1.16.0 + k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20190913145653-2bd9643cee5b + k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20190913145653-2bd9643cee5b + k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20190913145653-2bd9643cee5b + rsc.io/letsencrypt => github.com/dmcgowan/letsencrypt v0.0.0-20160928181947-1847a81d2087 +) diff --git a/go.sum b/go.sum new file mode 100644 index 000000000..14ef2ea33 --- /dev/null +++ b/go.sum @@ -0,0 +1,730 @@ +bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690/go.mod h1:Ulb78X89vxKYgdL24HMTiXYHlyHEvruOj1ZPlqeNEZM= +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +contrib.go.opencensus.io/exporter/ocagent v0.2.0/go.mod h1:0fnkYHF+ORKj7HWzOExKkUHeFX79gXSKUQbpnAM+wzo= +git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= +github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-autorest v11.2.8+incompatible h1:Q2feRPMlcfVcqz3pF87PJzkm5lZrL+x6BDtzhODzNJM= +github.com/Azure/go-autorest v11.2.8+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs= +github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest/adal v0.5.0 h1:q2gDruN08/guU9vAjuPWff0+QIrpH6ediguzdAzXAUU= +github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/date v0.1.0 h1:YGrhWfrgtFs84+h0o46rJrlmsZtyZRg470CqAXTZaGM= +github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc= +github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8= +github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY= +github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k= +github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/BurntSushi/toml v0.3.0/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534/go.mod h1:iroGtC8B3tQiqtds1l+mgk/BBOrxbqjH+eUfFQYRc14= +github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA= +github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= +github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e h1:eb0Pzkt15Bm7f2FFYv7sjY7NPFi3cPkS3tv1CcrFBWA= +github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= +github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= +github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= +github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= +github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/sprig v2.20.0+incompatible h1:dJTKKuUkYW3RMFdQFXPU/s6hg10RgctmTjRcbZ98Ap8= +github.com/Masterminds/sprig v2.20.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/Masterminds/vcs v1.13.0 h1:USF5TvZGYgIpcbNAEMLfFhHqP08tFZVlUVrmTSpqnyA= +github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA= +github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= +github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiUOryc= +github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= +github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= +github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/Rican7/retry v0.1.0/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg= +github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= +github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/asaskevich/govalidator v0.0.0-20180315120708-ccb8e960c48f/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:LWMyo4iOLWXHGdBki7NIht1kHru/0wM179h+d3g8ATM= +github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e/go.mod h1:uHBSeeATKpVazAACZBDPL/Nk/UhQDDsJWDlqYJo8/Us= +github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/bifurcation/mint v0.0.0-20180715133206-93c51c6ce115/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU= +github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= +github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= +github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= +github.com/bshuster-repo/logrus-logstash-hook v0.4.1 h1:pgAtgj+A31JBVtEHu2uHuEx0n+2ukqUJnS2vVe5pQNA= +github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= +github.com/bugsnag/bugsnag-go v1.3.2/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= +github.com/bugsnag/bugsnag-go v1.5.0 h1:tP8hiPv1pGGW3LA6LKy5lW6WG+y9J2xWUdPd3WC452k= +github.com/bugsnag/bugsnag-go v1.5.0/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= +github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA= +github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= +github.com/caddyserver/caddy v1.0.3/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ4uw0RzP1E= +github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/census-instrumentation/opencensus-proto v0.0.2-0.20180913191712-f303ae3f8d6a/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.1.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY= +github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= +github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod h1:TrMrLQfeENAPYPRsJuq3jsqdlRh3lvi6trTZJG8+tho= +github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA= +github.com/clusterhq/flocker-go v0.0.0-20160920122132-2b8b7259d313/go.mod h1:P1wt9Z3DP8O6W3rvwCt0REIlshg1InHImaLW0t3ObY0= +github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0= +github.com/container-storage-interface/spec v1.1.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4= +github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= +github.com/containerd/containerd v1.0.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.0-beta.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4 h1:aMyA5J7j6D07U7pf8BFEY67BKoDcz0zWleAbQj3zVng= +github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M= +github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= +github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= +github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= +github.com/coredns/corefile-migration v1.0.2/go.mod h1:OFwBp/Wc9dJt5cAZzHWMNhK1r5L0p0jDwIBc6j8NC8E= +github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.15+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/rkt v1.30.0/go.mod h1:O634mlH6U7qk87poQifK6M2rsFNt+FyUTWNMnP1hF1U= +github.com/cpuguy83/go-md2man v1.0.8/go.mod h1:N6JayAiVKtlHSnuTCeuLSQVs75hb8q+dYQLjr7cDsKY= +github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= +github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= +github.com/deislabs/oras v0.7.0 h1:RnDoFd3tQYODMiUqxgQ8JxlrlWL0/VMKIKRD01MmNYk= +github.com/deislabs/oras v0.7.0/go.mod h1:sqMKPG3tMyIX9xwXUBRLhZ24o+uT4y6jgBD2RzUTKDM= +github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dmcgowan/letsencrypt v0.0.0-20160928181947-1847a81d2087 h1:8AJxBXuUPcBVAvoz6fi3fpSyozBxvF2DgQ0f/yn9nkE= +github.com/dmcgowan/letsencrypt v0.0.0-20160928181947-1847a81d2087/go.mod h1:pRqVcLnLZeet910LRIAzx73MR48LxCRA84OcsivAkSs= +github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= +github.com/docker/cli v0.0.0-20190424194312-f28d9cc92972/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d h1:qdD+BtyCE1XXpDyhvn0yZVcZOLILdj9Cw4pKu0kQbPQ= +github.com/docker/cli v0.0.0-20190506213505-d88565df0c2d/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= +github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjsi4OER3Z8voPu/I52g= +github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= +github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 h1:X0fj836zx99zFu83v/M79DuBn84IL/Syx1SY6Y5ZEMA= +github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= +github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk= +github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/libnetwork v0.0.0-20180830151422-a9cd636e3789/go.mod h1:93m0aTqz6z+g32wla4l4WxTrdtvBRmVzYRkYvasA5Z8= +github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU5CAUmr9zpesgbU6SWc8/B4mflAE4= +github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= +github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= +github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s= +github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.8.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= +github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= +github.com/evanphx/json-patch v3.0.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I= +github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= +github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= +github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= +github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc= +github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= +github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M= +github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= +github.com/go-inf/inf v0.9.1/go.mod h1:ZWwB6rTV+0pO94RdIMKue59tExzQp6/pj/BMuPQkXaA= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= +github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= +github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= +github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= +github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= +github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= +github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= +github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= +github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= +github.com/go-openapi/jsonpointer v0.17.2/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= +github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= +github.com/go-openapi/jsonpointer v0.19.2 h1:A9+F4Dc/MCNB5jibxf6rRvOvR/iFgQdyNx9eIhnGqq0= +github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= +github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= +github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= +github.com/go-openapi/jsonreference v0.17.2/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= +github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= +github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w= +github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= +github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= +github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= +github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= +github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= +github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= +github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= +github.com/go-openapi/spec v0.17.2/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= +github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= +github.com/go-openapi/spec v0.19.2 h1:SStNd1jRcYtfKCN7R0laGNs80WYYvn5CbBjM2sOmCrE= +github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= +github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= +github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= +github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= +github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= +github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/swag v0.17.2/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= +github.com/go-openapi/swag v0.19.2 h1:jvO6bCMBEilGwMfHhrd61zIID4oIFdwb76V17SM88dE= +github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= +github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= +github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= +github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= +github.com/gofrs/flock v0.7.1 h1:DP+LD/t0njgoPBvT5MJLeliUIVQR03hiKR6vezdwHlc= +github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= +github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I= +github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff h1:kOkM9whyQYodu09SJ6W3NCsHG7crFaJILQ22Gozp3lg= +github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= +github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= +github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/cadvisor v0.34.0/go.mod h1:1nql6U13uTHaLYB8rLS5x9IJc2qT6Xd/Tr1sTX6NE48= +github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g= +github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/gophercloud/gophercloud v0.0.0-20181221023737-94924357ebf6/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= +github.com/gophercloud/gophercloud v0.1.0 h1:P/nh25+rzXouhytV2pUHBb65fnds26Ghl8/391+sT5o= +github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA= +github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= +github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U= +github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gosuri/uitable v0.0.1 h1:M9sMNgSZPyAu1FJZJLpJ16ofL8q5ko2EDUkICsynvlY= +github.com/gosuri/uitable v0.0.1/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo= +github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f h1:ShTPMJQes6tubcjzGMODIVG5hlrCeImaBnZzKF2N8SM= +github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/heketi/heketi v9.0.0+incompatible/go.mod h1:bB9ly3RchcQqsQ9CpyaQwvva7RS5ytVoSoholZQON6o= +github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413/go.mod h1:BeS3M108VzVlmAue3lv2WcGuPAX94/KN63MUURzbYSI= +github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7UkZt1i4FQeQy0R2T8GLUwQhOP5M1gBhy4= +github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64/go.mod h1:RYlF4ghFZPPmk2TC5REt5OFwvfb6lzxFWrTWB+qs28s= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0= +github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= +github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= +github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro= +github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= +github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= +github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= +github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= +github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA= +github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod h1:JpH9J1c9oX6otFSgdUHwUBUizmKlrMjxWnIAjff4m04= +github.com/lucas-clemente/quic-clients v0.1.0/go.mod h1:y5xVIEoObKqULIKivu+gD/LU90pL73bTdtQjPBvtCBk= +github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H70QZ/CXoxqw9bzao= +github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= +github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= +github.com/mattn/go-shellwords v1.0.5 h1:JhhFTIOslh5ZsPrpa3Wdg8bF0WI3b44EMblmU9wIsXc= +github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4= +github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY= +github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f h1:wVzAD6PG9MIDNQMZ6zc2YpzE/9hhJ3EN+b+a4B1thVs= +github.com/miekg/dns v0.0.0-20181005163659-0d29b283ac0f/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.0.13-0.20181005163659-0d29b283ac0f/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0= +github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY= +github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= +github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 h1:cvy4lBOYN3gKfKj8Lzz5Q9TfviP+L7koMHY7SvkyTKs= +github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE= +github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mrunalp/fileutils v0.0.0-20160930181131-4ee1cc9a8058/go.mod h1:x8F1gnqOkIEiO4rqoeEEEqQbo7HjGMTvyoq3gej4iT0= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mvdan/xurls v1.1.0/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= +github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= +github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= +github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= +github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI= +github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830 h1:yvQ/2Pupw60ON8TYEIGGTAI77yZsWYkiOeHFZWkwlCk= +github.com/opencontainers/runc v1.0.0-rc2.0.20190611121236-6cc515888830/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runtime-spec v1.0.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/selinux v1.2.2/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs= +github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= +github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= +github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c/go.mod h1:HUpKUBZnpzkdx0kD/+Yfuft+uD3zHGtXF/XJB14TUr4= +github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= +github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= +github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740= +github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.2.0 h1:kUZDBDTdBVBYBj5Tmh2NZLlF60mfjA27rM34b+cVwNU= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5 h1:Etei0Wx6pooT/DeOKcGTr1M/01ggz95Ajq8BBwCOKBU= +github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI= +github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= +github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= +github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= +github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/cobra v0.0.4/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/square/go-jose v2.3.0+incompatible/go.mod h1:7MxpAF/1WTVUu8Am+T5kNy+t0902CaLWM4Z745MkOa8= +github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= +github.com/thecodeteam/goscaleio v0.1.0/go.mod h1:68sdkZAsK8bvEwBlbQnlLS+xU+hvLYM/iQ8KXej1AwM= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= +github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= +github.com/vmware/govmomi v0.20.1/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.1.0 h1:ngVtJC9TY/lg0AA/1k48FYhBrhRoFlEmWzsehpNAaZg= +github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= +github.com/xenolf/lego v0.0.0-20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY= +github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656 h1:BTvU+npm3/yjuBd53EvgiFLl5+YLikf2WvHsjRQ4KrY= +github.com/xenolf/lego v0.3.2-0.20160613233155-a9d8cec0e656/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY= +github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 h1:p7OofyZ509h8DmPLh8Hn+EIIZm/xYhdZHJ9GnXHdr6U= +github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= +github.com/yvasiyarov/gorelic v0.0.6 h1:qMJQYPNdtJ7UNYHjX38KXZtltKTqimMuoQjNnSVIuJg= +github.com/yvasiyarov/gorelic v0.0.6/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= +github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY= +github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= +go.opencensus.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI= +go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180426230345-b49d69b5da94/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU= +golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68= +golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181004145325-8469e314837c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190124100055-b90733256f2e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4= +golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20170824195420-5d2fd3ccab98/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= +gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= +gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= +google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.0.0-20181221000618-65a46cafb132/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.6.1-0.20190607001116-5213b8090861/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20181221175505-bd9b4fb69e2f/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg= +google.golang.org/genproto v0.0.0-20190128161407-8ac453e89fca/go.mod h1:L3J43x8/uS+qIUoksaLKe6OS3nUKxOKuIFz1sl2/jx4= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.15.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= +google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= +gopkg.in/inf.v0 v0.9.0 h1:3zYtXIO92bvsdS3ggAdA8Gb4Azj0YU+TVY1uGYNFA8o= +gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/square/go-jose.v1 v1.1.2 h1:/5jmADZB+RiKtZGr4HxsEFOEfbfsjTKsVnqpThUpE30= +gopkg.in/square/go-jose.v1 v1.1.2/go.mod h1:QpYS+a4WhS+DTlyQIi6Ka7MS3SuR9a055rgXNEe6EiA= +gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA= +gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpAriY= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM= +k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= +k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ= +k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= +k8s.io/kube-openapi v0.0.0-20181114233023-0317810137be/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= +k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJDVK9qPLhM+sRHYanNKw0EQ= +k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= +k8s.io/kubernetes v1.16.0 h1:WPaqle2JWogVzLxhN6IK67u62IHKKrtYF7MS4FVR4/E= +k8s.io/kubernetes v1.16.0/go.mod h1:nlP2zevWKRGKuaaVbKIwozU0Rjg9leVDXkL4YTtjmVs= +k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190913145653-2bd9643cee5b h1:iyXUB3+jFbg0uUa9rShi8hQlhpK4SYHe5517cWkJymI= +k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:cHpnPcbNeE90PrTRnTu13OM+FN+ROt82odVbEh++81o= +k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190913145653-2bd9643cee5b h1:2HOFbBB5umGTMAN63U/o1ETnTpgOH07uK5UpRTM2sCs= +k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:f1tFT2pOqPzfckbG1GjHIzy3G+T2LW7rchcruNoLaiM= +k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190913145653-2bd9643cee5b h1:gVqeygqWACoaN7CVPCKOQZIPSq6dfaee3um8uDEIBrc= +k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:PNw+FbGH4/s3zK9V3rAeMiHTbQz2CU/yqAkfQ2UgLVs= +k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20190913145653-2bd9643cee5b h1:ye7HRlpBkjAM7jPb0Qpy1CG5BzIIvSZmSAR2K0YIQbI= +k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:WmFoxjELD2xtWb77Yj9RPibT5ACkQYEW9lPQtNkGtbE= +k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20190913145653-2bd9643cee5b h1:SXdINo9PHpUocOfBcATNFLHnzJF72/P9zocO+FJkb2Q= +k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:nBogvbgjMgo7AeVA6CuqVO13LVIfmlQ11t6xzAJdBN8= +k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20190913145653-2bd9643cee5b h1:H13vygACN7rNclc0jmNBm3HhtHamEGL0XbiYpCQDBn0= +k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:GiGfbsjtP4tOW6zgpL8/vCUoyXAV5+9X2onLursPi08= +k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:77Vtl0d5SOrs6vqwqhZZQakDEovGSm2rRqtpTeteqcQ= +k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:Gwev4EWWC1Yfr0gBTJR0n8FYLsIdRu4ARubU6hXRadU= +k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:L8deZCu6NpzgKzY91TOGKJ1JtAoHd8WyJ/HdoxqZCGo= +k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20190913145653-2bd9643cee5b h1:AUsA4C6B5wjIxLoPkf8CUwv4HC/wS5X2iV77yr8/g+s= +k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:spPP+vRNS8EsnNNIhFCZTTuRO3XhV1WoF18HJySoZn8= +k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:FuWtYjatYStosiEepg0w/7/QrG0T/HMh/FA5T/8AIP8= +k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:w51XnEBJkmGEjUGylUXL1TezQIc0JYndQCsVkQMHjKA= +k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:ttKFRQ6/4l0mjLwPJ/Ccn9k/vc/6y5dJ98r88NLLiGw= +k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:Wm4X9LSXr3uszFEajh8M75iyxHdjOKSp0LCL4TIp7UQ= +k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:8btekvQmHgyy4XTchusVAW/mQIPE+hVLn61sZ/epsAA= +k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:sBq5nR6KVpfnkBsj4RjOQhw0j5yOtLHXIX2Dz5uZQmw= +k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20190913145653-2bd9643cee5b h1:wasJVG+T0QHH/nGXj0ATWKgB/HhwompT3ZGrZueSGEw= +k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:ellVfoCz8MlDjTnkqsTkU5svJOIjcK3XNx/onmixgDk= +k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:4Sbo2Vn3tAIZpwx4YIp+SushTtzzzabVrg9Tq4rrImM= +k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:OpqDei2/Qdg+5YGQYPiEuQ4vlFoiAJy0Ysn8aLKP7Cs= +k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:vQHTmz0IaEb7/OXPSor1uga8Er0V+2M5aSdXG832NbU= +k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:E3i4wscD52Qj6PEcgUjvCd81Tl6Mghk1GHtEzoaaqwU= +k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3/go.mod h1:+G1xBfZDfVFsm1Tj/HNCvg4QqWx8rJ2Fxpqr1rqp/gQ= +k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= +k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE= +k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= +modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= +modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= +modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= +modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= +sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= +sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= +sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= +sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= +sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/pkg/kube/client.go b/pkg/kube/client.go index 62112060b..9602529be 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -41,7 +41,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/kubernetes/scheme" watchtools "k8s.io/client-go/tools/watch" - cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + cmdutil "k8s.io/kubectl/pkg/cmd/util" ) // ErrNoObjectsVisited indicates that during a visit operation, no matching objects were found. diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go index b097c4782..a425a8e12 100644 --- a/pkg/kube/client_test.go +++ b/pkg/kube/client_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest/fake" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) var unstructuredSerializer = resource.UnstructuredPlusDefaultContentConfig().NegotiatedSerializer diff --git a/pkg/kube/factory.go b/pkg/kube/factory.go index 6b09ecd1d..0ea544943 100644 --- a/pkg/kube/factory.go +++ b/pkg/kube/factory.go @@ -20,7 +20,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" - "k8s.io/kubernetes/pkg/kubectl/validation" + "k8s.io/kubectl/pkg/validation" ) // Factory provides abstractions that allow the Kubectl command to be extended across multiple types From f18c078618252af9d5192ede7646d6597e3ac065 Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Thu, 3 Oct 2019 12:15:03 -0400 Subject: [PATCH 2/4] Reducing the circleci footprint * Removed the parallelism as it was running the same tests 3 times * Removed caching as the time to cache/restore is about the same as without caching Signed-off-by: Matt Farina --- .circleci/config.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3db11f614..db7182adb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,6 @@ version: 2 jobs: build: working_directory: ~/helm.sh/helm - parallelism: 3 docker: - image: circleci/golang:1.13 @@ -13,27 +12,12 @@ jobs: steps: - checkout - - restore_cache: - keys: - - gomod-{{ checksum "go.mod" }} - - gomod- - - restore_cache: - keys: - - build-cache-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }} - run: name: test style command: make test-style - run: name: test command: make test-coverage - - save_cache: - key: gomod-{{ checksum "go.mod" }} - paths: - - /go/pkg/mod - - save_cache: - key: build-cache-{{ .Environment.CIRCLE_BUILD_NUM }} - paths: - - /tmp/go/cache - deploy: name: deploy command: .circleci/deploy.sh From 967f4fed42d0347405aa71fb441b054f761ee8e2 Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Thu, 3 Oct 2019 13:42:59 -0400 Subject: [PATCH 3/4] Update dependencies * Kubernetes updated to 1.16.1 * SemVer and Sprig updated to latest releases that leverage go modules * Tests and checks updated. These already landed in v2 via PR 6457 Signed-off-by: Matt Farina --- cmd/helm/search/search.go | 2 +- cmd/helm/search_repo.go | 2 +- go.mod | 55 +++++++++---------- go.sum | 53 ++++++++++++++++++ internal/resolver/resolver.go | 2 +- pkg/action/dependency.go | 2 +- pkg/action/install.go | 2 +- pkg/action/package.go | 2 +- pkg/chartutil/compatible.go | 2 +- pkg/downloader/manager.go | 2 +- pkg/engine/funcs.go | 2 +- pkg/lint/lint_test.go | 2 +- pkg/lint/rules/chartfile.go | 4 +- pkg/lint/rules/chartfile_test.go | 4 +- .../rules/testdata/badchartfile/Chart.yaml | 2 +- pkg/plugin/installer/vcs_installer.go | 2 +- pkg/repo/index.go | 2 +- 17 files changed, 97 insertions(+), 45 deletions(-) diff --git a/cmd/helm/search/search.go b/cmd/helm/search/search.go index b3892f067..43d62949a 100644 --- a/cmd/helm/search/search.go +++ b/cmd/helm/search/search.go @@ -28,7 +28,7 @@ import ( "sort" "strings" - "github.com/Masterminds/semver" + "github.com/Masterminds/semver/v3" "helm.sh/helm/pkg/repo" ) diff --git a/cmd/helm/search_repo.go b/cmd/helm/search_repo.go index b7c34ccc9..8f926bcd5 100644 --- a/cmd/helm/search_repo.go +++ b/cmd/helm/search_repo.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "github.com/Masterminds/semver" + "github.com/Masterminds/semver/v3" "github.com/gosuri/uitable" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/go.mod b/go.mod index c7592ce40..82b4e0626 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,8 @@ require ( github.com/BurntSushi/toml v0.3.1 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e github.com/Masterminds/goutils v1.1.0 - github.com/Masterminds/semver v1.4.2 - github.com/Masterminds/sprig v2.20.0+incompatible + github.com/Masterminds/semver/v3 v3.0.1 + github.com/Masterminds/sprig/v3 v3.0.0 github.com/Masterminds/vcs v1.13.0 github.com/Microsoft/go-winio v0.4.12 github.com/Microsoft/hcsshim v0.8.6 @@ -69,7 +69,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway v1.5.0 // indirect github.com/hashicorp/golang-lru v0.5.1 github.com/huandu/xstrings v1.2.0 - github.com/imdario/mergo v0.3.6 + github.com/imdario/mergo v0.3.7 github.com/inconshreveable/mousetrap v1.0.0 github.com/json-iterator/go v1.1.7 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 @@ -98,7 +98,7 @@ require ( github.com/spf13/cobra v0.0.5 github.com/spf13/pflag v1.0.3 github.com/square/go-jose v2.3.0+incompatible - github.com/stretchr/testify v1.3.0 + github.com/stretchr/testify v1.4.0 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 github.com/xeipuuv/gojsonschema v1.1.0 @@ -107,7 +107,7 @@ require ( github.com/yvasiyarov/gorelic v0.0.6 github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f go.opencensus.io v0.21.0 - golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 + golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 golang.org/x/sync v0.0.0-20190423024810-112230192c58 @@ -129,7 +129,7 @@ require ( k8s.io/klog v0.4.0 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf k8s.io/kubectl v0.0.0 - k8s.io/kubernetes v1.16.0 + k8s.io/kubernetes v1.16.1 k8s.io/utils v0.0.0-20190801114015-581e00157fb1 sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.1.0 @@ -156,27 +156,26 @@ replace ( // to a version for Go to process them. Here they are set to the same // revision as the marked version of Kubernetes. When Kubernetes is updated // these need to be updated as well. - k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190913145653-2bd9643cee5b - k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190913145653-2bd9643cee5b - k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190913145653-2bd9643cee5b - k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20190913145653-2bd9643cee5b - k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20190913145653-2bd9643cee5b - k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20190913145653-2bd9643cee5b - k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20190913145653-2bd9643cee5b - k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20190913145653-2bd9643cee5b - k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20190913145653-2bd9643cee5b - k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20190913145653-2bd9643cee5b - k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20190913145653-2bd9643cee5b - k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20190913145653-2bd9643cee5b - k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20190913145653-2bd9643cee5b - k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20190913145653-2bd9643cee5b - k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20190913145653-2bd9643cee5b - k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20190913145653-2bd9643cee5b - k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20190913145653-2bd9643cee5b - k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20190913145653-2bd9643cee5b - k8s.io/kubernetes => k8s.io/kubernetes v1.16.0 - k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20190913145653-2bd9643cee5b - k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20190913145653-2bd9643cee5b - k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20190913145653-2bd9643cee5b + k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191001043732-d647ddbd755f + k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f + k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f + k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191001043732-d647ddbd755f + k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f + k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f + k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20191001043732-d647ddbd755f + k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20191001043732-d647ddbd755f + k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20191001043732-d647ddbd755f + k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f + k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20191001043732-d647ddbd755f + k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20191001043732-d647ddbd755f + k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20191001043732-d647ddbd755f + k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20191001043732-d647ddbd755f + k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20191001043732-d647ddbd755f + k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20191001043732-d647ddbd755f + k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f + k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20191001043732-d647ddbd755f + k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20191001043732-d647ddbd755f + k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20191001043732-d647ddbd755f + k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20191001043732-d647ddbd755f rsc.io/letsencrypt => github.com/dmcgowan/letsencrypt v0.0.0-20160928181947-1847a81d2087 ) diff --git a/go.sum b/go.sum index 14ef2ea33..04aa1cf10 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,16 @@ github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RP github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/semver/v3 v3.0.1 h1:2kKm5lb7dKVrt5TYUiAavE6oFc1cFT0057UVGT+JqLk= +github.com/Masterminds/semver/v3 v3.0.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/sprig v2.20.0+incompatible h1:dJTKKuUkYW3RMFdQFXPU/s6hg10RgctmTjRcbZ98Ap8= github.com/Masterminds/sprig v2.20.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= +github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/Masterminds/sprig/v3 v3.0.0 h1:KSQz7Nb08/3VU9E4ns29dDxcczhOD1q7O1UfM4G3t3g= +github.com/Masterminds/sprig/v3 v3.0.0/go.mod h1:NEUY/Qq8Gdm2xgYA+NwJM6wmfdRV9xkh8h/Rld20R0U= github.com/Masterminds/vcs v1.13.0 h1:USF5TvZGYgIpcbNAEMLfFhHqP08tFZVlUVrmTSpqnyA= github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= @@ -312,6 +320,8 @@ github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI= +github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8= @@ -335,9 +345,11 @@ github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgo github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc= @@ -375,10 +387,14 @@ github.com/miekg/dns v1.1.4 h1:rCMZsU2ScVSYcAsOXgmC6+AKOK+6pmQTOcw03nfwYV0= github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY= github.com/mistifyio/go-zfs v2.1.1+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= +github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 h1:cvy4lBOYN3gKfKj8Lzz5Q9TfviP+L7koMHY7SvkyTKs= github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -464,6 +480,7 @@ github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:s github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.4/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= @@ -485,6 +502,8 @@ github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRci github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/thecodeteam/goscaleio v0.1.0/go.mod h1:68sdkZAsK8bvEwBlbQnlLS+xU+hvLYM/iQ8KXej1AwM= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -528,6 +547,8 @@ golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 h1:0hQKqeLdqlt5iIwVOBErRisrHJAN57yOiPRQItI20fU= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -644,6 +665,7 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= @@ -683,35 +705,66 @@ k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf h1:EYm5AW/UUDbnmnI+gK0TJD k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/kubernetes v1.16.0 h1:WPaqle2JWogVzLxhN6IK67u62IHKKrtYF7MS4FVR4/E= k8s.io/kubernetes v1.16.0/go.mod h1:nlP2zevWKRGKuaaVbKIwozU0Rjg9leVDXkL4YTtjmVs= +k8s.io/kubernetes v1.16.1 h1:5Ys1P0p+OkGMq+/RQWa3/gs2hlGfaNkVPsVY+vyZWqQ= +k8s.io/kubernetes v1.16.1/go.mod h1:nlP2zevWKRGKuaaVbKIwozU0Rjg9leVDXkL4YTtjmVs= k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190913145653-2bd9643cee5b h1:iyXUB3+jFbg0uUa9rShi8hQlhpK4SYHe5517cWkJymI= k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:cHpnPcbNeE90PrTRnTu13OM+FN+ROt82odVbEh++81o= +k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191001043732-d647ddbd755f h1:qnPdWj5mRMsfvP85N8J2ogqiu8Aq1T6MPsJdxL3g6Ds= +k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191001043732-d647ddbd755f/go.mod h1:cHpnPcbNeE90PrTRnTu13OM+FN+ROt82odVbEh++81o= k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190913145653-2bd9643cee5b h1:2HOFbBB5umGTMAN63U/o1ETnTpgOH07uK5UpRTM2sCs= k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:f1tFT2pOqPzfckbG1GjHIzy3G+T2LW7rchcruNoLaiM= +k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f h1:bpyOu4+qNIFZRKRtSXGv/iJ7YzqwXrAOoaKxUaYKrV4= +k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:f1tFT2pOqPzfckbG1GjHIzy3G+T2LW7rchcruNoLaiM= k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190913145653-2bd9643cee5b h1:gVqeygqWACoaN7CVPCKOQZIPSq6dfaee3um8uDEIBrc= k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:PNw+FbGH4/s3zK9V3rAeMiHTbQz2CU/yqAkfQ2UgLVs= +k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f h1:X3br+JCtf40mnzQsKAnHnezd1CvCENgG5uLJTbAspZ4= +k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191001043732-d647ddbd755f/go.mod h1:PNw+FbGH4/s3zK9V3rAeMiHTbQz2CU/yqAkfQ2UgLVs= k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20190913145653-2bd9643cee5b h1:ye7HRlpBkjAM7jPb0Qpy1CG5BzIIvSZmSAR2K0YIQbI= k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:WmFoxjELD2xtWb77Yj9RPibT5ACkQYEW9lPQtNkGtbE= +k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191001043732-d647ddbd755f h1:QIhu1g7jmiv/90qGiPiCOTHFYEcrL0HA5P/6G/pt7zM= +k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:WmFoxjELD2xtWb77Yj9RPibT5ACkQYEW9lPQtNkGtbE= k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20190913145653-2bd9643cee5b h1:SXdINo9PHpUocOfBcATNFLHnzJF72/P9zocO+FJkb2Q= k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:nBogvbgjMgo7AeVA6CuqVO13LVIfmlQ11t6xzAJdBN8= +k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f h1:6CkT409OUoX4ZiP++1N3id3PCcOoktBvclNsDKPKrfc= +k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191001043732-d647ddbd755f/go.mod h1:nBogvbgjMgo7AeVA6CuqVO13LVIfmlQ11t6xzAJdBN8= k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20190913145653-2bd9643cee5b h1:H13vygACN7rNclc0jmNBm3HhtHamEGL0XbiYpCQDBn0= k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:GiGfbsjtP4tOW6zgpL8/vCUoyXAV5+9X2onLursPi08= +k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f h1:ksJC2cpBqkCP8bzmfDYXr65JRpt9JmANvaKIR3qggt4= +k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191001043732-d647ddbd755f/go.mod h1:GiGfbsjtP4tOW6zgpL8/vCUoyXAV5+9X2onLursPi08= k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:77Vtl0d5SOrs6vqwqhZZQakDEovGSm2rRqtpTeteqcQ= +k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20191001043732-d647ddbd755f/go.mod h1:77Vtl0d5SOrs6vqwqhZZQakDEovGSm2rRqtpTeteqcQ= k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:Gwev4EWWC1Yfr0gBTJR0n8FYLsIdRu4ARubU6hXRadU= +k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20191001043732-d647ddbd755f/go.mod h1:Gwev4EWWC1Yfr0gBTJR0n8FYLsIdRu4ARubU6hXRadU= k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:L8deZCu6NpzgKzY91TOGKJ1JtAoHd8WyJ/HdoxqZCGo= +k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20191001043732-d647ddbd755f/go.mod h1:L8deZCu6NpzgKzY91TOGKJ1JtAoHd8WyJ/HdoxqZCGo= k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20190913145653-2bd9643cee5b h1:AUsA4C6B5wjIxLoPkf8CUwv4HC/wS5X2iV77yr8/g+s= k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:spPP+vRNS8EsnNNIhFCZTTuRO3XhV1WoF18HJySoZn8= +k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f h1:fwZSUxpQ99UBEkIhHbzY2pE3SPU9Zn4yZkMSolEt6Jw= +k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191001043732-d647ddbd755f/go.mod h1:spPP+vRNS8EsnNNIhFCZTTuRO3XhV1WoF18HJySoZn8= k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:FuWtYjatYStosiEepg0w/7/QrG0T/HMh/FA5T/8AIP8= +k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20191001043732-d647ddbd755f/go.mod h1:FuWtYjatYStosiEepg0w/7/QrG0T/HMh/FA5T/8AIP8= k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:w51XnEBJkmGEjUGylUXL1TezQIc0JYndQCsVkQMHjKA= +k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20191001043732-d647ddbd755f/go.mod h1:w51XnEBJkmGEjUGylUXL1TezQIc0JYndQCsVkQMHjKA= k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:ttKFRQ6/4l0mjLwPJ/Ccn9k/vc/6y5dJ98r88NLLiGw= +k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20191001043732-d647ddbd755f/go.mod h1:ttKFRQ6/4l0mjLwPJ/Ccn9k/vc/6y5dJ98r88NLLiGw= k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:Wm4X9LSXr3uszFEajh8M75iyxHdjOKSp0LCL4TIp7UQ= +k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20191001043732-d647ddbd755f/go.mod h1:Wm4X9LSXr3uszFEajh8M75iyxHdjOKSp0LCL4TIp7UQ= k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:8btekvQmHgyy4XTchusVAW/mQIPE+hVLn61sZ/epsAA= +k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20191001043732-d647ddbd755f/go.mod h1:8btekvQmHgyy4XTchusVAW/mQIPE+hVLn61sZ/epsAA= k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:sBq5nR6KVpfnkBsj4RjOQhw0j5yOtLHXIX2Dz5uZQmw= +k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20191001043732-d647ddbd755f/go.mod h1:sBq5nR6KVpfnkBsj4RjOQhw0j5yOtLHXIX2Dz5uZQmw= k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20190913145653-2bd9643cee5b h1:wasJVG+T0QHH/nGXj0ATWKgB/HhwompT3ZGrZueSGEw= k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:ellVfoCz8MlDjTnkqsTkU5svJOIjcK3XNx/onmixgDk= +k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f h1:vH4+rTRLDI8z9dQCZ6cJcIi3RMGZ6JwJWyLbrSNHBCE= +k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191001043732-d647ddbd755f/go.mod h1:ellVfoCz8MlDjTnkqsTkU5svJOIjcK3XNx/onmixgDk= k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:4Sbo2Vn3tAIZpwx4YIp+SushTtzzzabVrg9Tq4rrImM= +k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20191001043732-d647ddbd755f/go.mod h1:4Sbo2Vn3tAIZpwx4YIp+SushTtzzzabVrg9Tq4rrImM= k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:OpqDei2/Qdg+5YGQYPiEuQ4vlFoiAJy0Ysn8aLKP7Cs= +k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20191001043732-d647ddbd755f/go.mod h1:OpqDei2/Qdg+5YGQYPiEuQ4vlFoiAJy0Ysn8aLKP7Cs= k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:vQHTmz0IaEb7/OXPSor1uga8Er0V+2M5aSdXG832NbU= +k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20191001043732-d647ddbd755f/go.mod h1:vQHTmz0IaEb7/OXPSor1uga8Er0V+2M5aSdXG832NbU= k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20190913145653-2bd9643cee5b/go.mod h1:E3i4wscD52Qj6PEcgUjvCd81Tl6Mghk1GHtEzoaaqwU= +k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20191001043732-d647ddbd755f/go.mod h1:E3i4wscD52Qj6PEcgUjvCd81Tl6Mghk1GHtEzoaaqwU= k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3/go.mod h1:+G1xBfZDfVFsm1Tj/HNCvg4QqWx8rJ2Fxpqr1rqp/gQ= k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= k8s.io/utils v0.0.0-20190801114015-581e00157fb1 h1:+ySTxfHnfzZb9ys375PXNlLhkJPLKgHajBU0N62BDvE= diff --git a/internal/resolver/resolver.go b/internal/resolver/resolver.go index 622af4bfb..7f9beeaf3 100644 --- a/internal/resolver/resolver.go +++ b/internal/resolver/resolver.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/Masterminds/semver" + "github.com/Masterminds/semver/v3" "github.com/pkg/errors" "helm.sh/helm/pkg/chart" diff --git a/pkg/action/dependency.go b/pkg/action/dependency.go index 849904884..84c6d9590 100644 --- a/pkg/action/dependency.go +++ b/pkg/action/dependency.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/Masterminds/semver" + "github.com/Masterminds/semver/v3" "github.com/gosuri/uitable" "helm.sh/helm/pkg/chart" diff --git a/pkg/action/install.go b/pkg/action/install.go index 859f4dfee..34ed4e322 100644 --- a/pkg/action/install.go +++ b/pkg/action/install.go @@ -27,7 +27,7 @@ import ( "text/template" "time" - "github.com/Masterminds/sprig" + "github.com/Masterminds/sprig/v3" "github.com/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/cli-runtime/pkg/resource" diff --git a/pkg/action/package.go b/pkg/action/package.go index 63971ba8c..a80239f46 100644 --- a/pkg/action/package.go +++ b/pkg/action/package.go @@ -22,7 +22,7 @@ import ( "os" "syscall" - "github.com/Masterminds/semver" + "github.com/Masterminds/semver/v3" "github.com/pkg/errors" "golang.org/x/crypto/ssh/terminal" diff --git a/pkg/chartutil/compatible.go b/pkg/chartutil/compatible.go index 4bcc6719e..f4656c913 100644 --- a/pkg/chartutil/compatible.go +++ b/pkg/chartutil/compatible.go @@ -16,7 +16,7 @@ limitations under the License. package chartutil -import "github.com/Masterminds/semver" +import "github.com/Masterminds/semver/v3" // IsCompatibleRange compares a version to a constraint. // It returns true if the version matches the constraint, and false in all other cases. diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go index e04b7fe1b..ef334f130 100644 --- a/pkg/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/Masterminds/semver" + "github.com/Masterminds/semver/v3" "github.com/pkg/errors" "sigs.k8s.io/yaml" diff --git a/pkg/engine/funcs.go b/pkg/engine/funcs.go index eb5032c6c..b80a80412 100644 --- a/pkg/engine/funcs.go +++ b/pkg/engine/funcs.go @@ -23,7 +23,7 @@ import ( "text/template" "github.com/BurntSushi/toml" - "github.com/Masterminds/sprig" + "github.com/Masterminds/sprig/v3" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go index 0f2c7ca0d..770bc2365 100644 --- a/pkg/lint/lint_test.go +++ b/pkg/lint/lint_test.go @@ -53,7 +53,7 @@ func TestBadChart(t *testing.T) { } } if msg.Severity == support.ErrorSev { - if strings.Contains(msg.Err.Error(), "version 0.0.0 is less than or equal to 0") { + if strings.Contains(msg.Err.Error(), "version '0.0.0.0' is not a valid SemVer") { e = true } if strings.Contains(msg.Err.Error(), "name is required") { diff --git a/pkg/lint/rules/chartfile.go b/pkg/lint/rules/chartfile.go index 91ad7543f..f6b4827df 100644 --- a/pkg/lint/rules/chartfile.go +++ b/pkg/lint/rules/chartfile.go @@ -21,7 +21,7 @@ import ( "os" "path/filepath" - "github.com/Masterminds/semver" + "github.com/Masterminds/semver/v3" "github.com/asaskevich/govalidator" "github.com/pkg/errors" @@ -112,7 +112,7 @@ func validateChartVersion(cf *chart.Metadata) error { return errors.Errorf("version '%s' is not a valid SemVer", cf.Version) } - c, err := semver.NewConstraint("> 0") + c, err := semver.NewConstraint(">0.0.0-0") if err != nil { return err } diff --git a/pkg/lint/rules/chartfile_test.go b/pkg/lint/rules/chartfile_test.go index 6bf33bde1..4f1694606 100644 --- a/pkg/lint/rules/chartfile_test.go +++ b/pkg/lint/rules/chartfile_test.go @@ -97,7 +97,7 @@ func TestValidateChartVersion(t *testing.T) { ErrorMsg string }{ {"", "version is required"}, - {"0", "0 is less than or equal to 0"}, + {"1.2.3.4", "version '1.2.3.4' is not a valid SemVer"}, {"waps", "'waps' is not a valid SemVer"}, {"-3", "'-3' is not a valid SemVer"}, } @@ -225,7 +225,7 @@ func TestChartfile(t *testing.T) { t.Errorf("Unexpected message 2: %s", msgs[2].Err) } - if !strings.Contains(msgs[3].Err.Error(), "version 0.0.0 is less than or equal to 0") { + if !strings.Contains(msgs[3].Err.Error(), "version '0.0.0.0' is not a valid SemVer") { t.Errorf("Unexpected message 3: %s", msgs[3].Err) } diff --git a/pkg/lint/rules/testdata/badchartfile/Chart.yaml b/pkg/lint/rules/testdata/badchartfile/Chart.yaml index 704b745ed..b80cf5f7e 100644 --- a/pkg/lint/rules/testdata/badchartfile/Chart.yaml +++ b/pkg/lint/rules/testdata/badchartfile/Chart.yaml @@ -1,5 +1,5 @@ description: A Helm chart for Kubernetes -version: 0.0.0 +version: 0.0.0.0 home: "" type: application dependencies: diff --git a/pkg/plugin/installer/vcs_installer.go b/pkg/plugin/installer/vcs_installer.go index e4ee27261..77846af9c 100644 --- a/pkg/plugin/installer/vcs_installer.go +++ b/pkg/plugin/installer/vcs_installer.go @@ -19,7 +19,7 @@ import ( "os" "sort" - "github.com/Masterminds/semver" + "github.com/Masterminds/semver/v3" "github.com/Masterminds/vcs" "github.com/pkg/errors" diff --git a/pkg/repo/index.go b/pkg/repo/index.go index 92d898fd5..8a62a8686 100644 --- a/pkg/repo/index.go +++ b/pkg/repo/index.go @@ -27,7 +27,7 @@ import ( "strings" "time" - "github.com/Masterminds/semver" + "github.com/Masterminds/semver/v3" "github.com/pkg/errors" "sigs.k8s.io/yaml" From 9bc7934f350233fa72a11d2d29065aa78ab62792 Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Thu, 3 Oct 2019 14:27:05 -0400 Subject: [PATCH 4/4] Updating the module for v3 as the major version Signed-off-by: Matt Farina --- cmd/helm/chart.go | 2 +- cmd/helm/chart_export.go | 4 ++-- cmd/helm/chart_list.go | 2 +- cmd/helm/chart_pull.go | 4 ++-- cmd/helm/chart_push.go | 4 ++-- cmd/helm/chart_remove.go | 4 ++-- cmd/helm/chart_save.go | 6 ++--- cmd/helm/create.go | 8 +++---- cmd/helm/create_test.go | 10 ++++---- cmd/helm/dependency.go | 4 ++-- cmd/helm/dependency_build.go | 8 +++---- cmd/helm/dependency_build_test.go | 6 ++--- cmd/helm/dependency_update.go | 8 +++---- cmd/helm/dependency_update_test.go | 14 +++++------ cmd/helm/docs.go | 2 +- cmd/helm/env.go | 4 ++-- cmd/helm/flags.go | 4 ++-- cmd/helm/get.go | 4 ++-- cmd/helm/get_hooks.go | 4 ++-- cmd/helm/get_hooks_test.go | 2 +- cmd/helm/get_manifest.go | 4 ++-- cmd/helm/get_manifest_test.go | 2 +- cmd/helm/get_test.go | 2 +- cmd/helm/get_values.go | 4 ++-- cmd/helm/get_values_test.go | 2 +- cmd/helm/helm.go | 14 +++++------ cmd/helm/helm_test.go | 14 +++++------ cmd/helm/history.go | 10 ++++---- cmd/helm/history_test.go | 2 +- cmd/helm/install.go | 16 ++++++------- cmd/helm/lint.go | 6 ++--- cmd/helm/list.go | 6 ++--- cmd/helm/list_test.go | 4 ++-- cmd/helm/load_plugins.go | 2 +- cmd/helm/package.go | 8 +++---- cmd/helm/package_test.go | 8 +++---- cmd/helm/plugin.go | 2 +- cmd/helm/plugin_install.go | 6 ++--- cmd/helm/plugin_remove.go | 2 +- cmd/helm/plugin_update.go | 4 ++-- cmd/helm/printer.go | 4 ++-- cmd/helm/pull.go | 4 ++-- cmd/helm/pull_test.go | 2 +- cmd/helm/registry.go | 2 +- cmd/helm/registry_login.go | 4 ++-- cmd/helm/registry_logout.go | 4 ++-- cmd/helm/release_testing.go | 2 +- cmd/helm/release_testing_run.go | 4 ++-- cmd/helm/repo.go | 2 +- cmd/helm/repo_add.go | 6 ++--- cmd/helm/repo_add_test.go | 6 ++--- cmd/helm/repo_index.go | 4 ++-- cmd/helm/repo_index_test.go | 4 ++-- cmd/helm/repo_list.go | 6 ++--- cmd/helm/repo_remove.go | 6 ++--- cmd/helm/repo_remove_test.go | 8 +++---- cmd/helm/repo_update.go | 6 ++--- cmd/helm/repo_update_test.go | 8 +++---- cmd/helm/rollback.go | 4 ++-- cmd/helm/rollback_test.go | 4 ++-- cmd/helm/root.go | 8 +++---- cmd/helm/root_test.go | 6 ++--- cmd/helm/search/search.go | 2 +- cmd/helm/search/search_test.go | 4 ++-- cmd/helm/search_hub.go | 4 ++-- cmd/helm/search_repo.go | 8 +++---- cmd/helm/show.go | 4 ++-- cmd/helm/status.go | 6 ++--- cmd/helm/status_test.go | 4 ++-- cmd/helm/template.go | 6 ++--- cmd/helm/uninstall.go | 4 ++-- cmd/helm/uninstall_test.go | 2 +- cmd/helm/upgrade.go | 12 +++++----- cmd/helm/upgrade_test.go | 10 ++++---- cmd/helm/verify.go | 4 ++-- cmd/helm/version.go | 4 ++-- go.mod | 8 ++++++- go.sum | 19 +++++++++++++++ internal/experimental/registry/authorizer.go | 2 +- internal/experimental/registry/cache.go | 8 +++---- internal/experimental/registry/cache_opts.go | 2 +- internal/experimental/registry/client.go | 6 ++--- internal/experimental/registry/client_opts.go | 2 +- internal/experimental/registry/client_test.go | 2 +- internal/experimental/registry/constants.go | 2 +- internal/experimental/registry/reference.go | 2 +- internal/experimental/registry/resolver.go | 2 +- internal/experimental/registry/util.go | 2 +- internal/ignore/doc.go | 2 +- internal/monocular/search.go | 4 ++-- internal/resolver/resolver.go | 8 +++---- internal/resolver/resolver_test.go | 2 +- internal/test/ensure/ensure.go | 2 +- internal/version/version.go | 2 +- pkg/action/action.go | 10 ++++---- pkg/action/action_test.go | 14 +++++------ pkg/action/chart_export.go | 4 ++-- pkg/action/chart_pull.go | 2 +- pkg/action/chart_push.go | 2 +- pkg/action/chart_remove.go | 2 +- pkg/action/chart_save.go | 4 ++-- pkg/action/chart_save_test.go | 2 +- pkg/action/dependency.go | 4 ++-- pkg/action/get.go | 2 +- pkg/action/get_values.go | 2 +- pkg/action/history.go | 2 +- pkg/action/hooks.go | 2 +- pkg/action/install.go | 24 +++++++++---------- pkg/action/install_test.go | 10 ++++---- pkg/action/lint.go | 6 ++--- pkg/action/list.go | 4 ++-- pkg/action/list_test.go | 4 ++-- pkg/action/package.go | 8 +++---- pkg/action/package_test.go | 2 +- pkg/action/printer.go | 2 +- pkg/action/pull.go | 10 ++++---- pkg/action/release_testing.go | 2 +- pkg/action/resource_policy.go | 2 +- pkg/action/rollback.go | 2 +- pkg/action/show.go | 4 ++-- pkg/action/status.go | 2 +- pkg/action/uninstall.go | 4 ++-- pkg/action/upgrade.go | 10 ++++---- pkg/action/upgrade_test.go | 4 ++-- pkg/action/validate.go | 2 +- pkg/action/verify.go | 2 +- pkg/chart/loader/archive.go | 2 +- pkg/chart/loader/directory.go | 6 ++--- pkg/chart/loader/load.go | 2 +- pkg/chart/loader/load_test.go | 2 +- pkg/chartutil/chartfile.go | 2 +- pkg/chartutil/chartfile_test.go | 2 +- pkg/chartutil/coalesce.go | 2 +- pkg/chartutil/create.go | 4 ++-- pkg/chartutil/create_test.go | 4 ++-- pkg/chartutil/dependencies.go | 2 +- pkg/chartutil/dependencies_test.go | 4 ++-- pkg/chartutil/doc.go | 2 +- pkg/chartutil/jsonschema.go | 2 +- pkg/chartutil/jsonschema_test.go | 2 +- pkg/chartutil/save.go | 2 +- pkg/chartutil/save_test.go | 4 ++-- pkg/chartutil/values.go | 2 +- pkg/chartutil/values_test.go | 2 +- pkg/cli/environment.go | 2 +- pkg/cli/values/options.go | 4 ++-- pkg/downloader/chart_downloader.go | 10 ++++---- pkg/downloader/chart_downloader_test.go | 10 ++++---- pkg/downloader/manager.go | 16 ++++++------- pkg/downloader/manager_test.go | 2 +- pkg/engine/doc.go | 2 +- pkg/engine/engine.go | 4 ++-- pkg/engine/engine_test.go | 4 ++-- pkg/engine/files.go | 2 +- pkg/getter/getter.go | 2 +- pkg/getter/getter_test.go | 2 +- pkg/getter/httpgetter.go | 6 ++--- pkg/getter/httpgetter_test.go | 6 ++--- pkg/getter/plugingetter.go | 4 ++-- pkg/getter/plugingetter_test.go | 2 +- pkg/helmpath/home_unix_test.go | 2 +- pkg/helmpath/home_windows_test.go | 2 +- pkg/helmpath/lazypath.go | 2 +- pkg/helmpath/lazypath_darwin_test.go | 2 +- pkg/helmpath/lazypath_unix_test.go | 2 +- pkg/helmpath/lazypath_windows_test.go | 2 +- pkg/kube/client.go | 2 +- pkg/kube/config.go | 2 +- pkg/kube/converter.go | 2 +- pkg/kube/factory.go | 2 +- pkg/kube/fake/fake.go | 2 +- pkg/kube/fake/printer.go | 2 +- pkg/kube/resource.go | 2 +- pkg/kube/resource_test.go | 2 +- pkg/kube/wait.go | 2 +- pkg/lint/lint.go | 6 ++--- pkg/lint/lint_test.go | 2 +- pkg/lint/rules/chartfile.go | 8 +++---- pkg/lint/rules/chartfile_test.go | 6 ++--- pkg/lint/rules/template.go | 8 +++---- pkg/lint/rules/template_test.go | 2 +- pkg/lint/rules/values.go | 4 ++-- pkg/lint/support/doc.go | 2 +- pkg/plugin/cache/cache.go | 2 +- pkg/plugin/hooks.go | 2 +- pkg/plugin/installer/base.go | 4 ++-- pkg/plugin/installer/doc.go | 2 +- pkg/plugin/installer/http_installer.go | 10 ++++---- pkg/plugin/installer/http_installer_test.go | 8 +++---- pkg/plugin/installer/local_installer.go | 2 +- pkg/plugin/installer/local_installer_test.go | 4 ++-- pkg/plugin/installer/vcs_installer.go | 6 ++--- pkg/plugin/installer/vcs_installer_test.go | 6 ++--- pkg/plugin/plugin.go | 4 ++-- pkg/plugin/plugin_test.go | 4 ++-- pkg/provenance/doc.go | 2 +- pkg/provenance/sign.go | 4 ++-- pkg/release/mock.go | 2 +- pkg/release/release.go | 2 +- pkg/releaseutil/filter.go | 4 ++-- pkg/releaseutil/filter_test.go | 4 ++-- pkg/releaseutil/manifest_sorter.go | 4 ++-- pkg/releaseutil/manifest_sorter_test.go | 4 ++-- pkg/releaseutil/manifest_test.go | 2 +- pkg/releaseutil/sorter.go | 4 ++-- pkg/releaseutil/sorter_test.go | 4 ++-- pkg/repo/chartrepo.go | 10 ++++---- pkg/repo/chartrepo_test.go | 8 +++---- pkg/repo/index.go | 8 +++---- pkg/repo/index_test.go | 6 ++--- pkg/repo/repo.go | 2 +- pkg/repo/repotest/server.go | 2 +- pkg/repo/repotest/server_test.go | 4 ++-- pkg/storage/driver/cfgmaps.go | 4 ++-- pkg/storage/driver/cfgmaps_test.go | 2 +- pkg/storage/driver/driver.go | 4 ++-- pkg/storage/driver/labels_test.go | 2 +- pkg/storage/driver/memory.go | 2 +- pkg/storage/driver/memory_test.go | 2 +- pkg/storage/driver/mock_test.go | 4 ++-- pkg/storage/driver/records.go | 4 ++-- pkg/storage/driver/records_test.go | 4 ++-- pkg/storage/driver/secrets.go | 4 ++-- pkg/storage/driver/secrets_test.go | 2 +- pkg/storage/driver/util.go | 4 ++-- pkg/storage/storage.go | 8 +++---- pkg/storage/storage_test.go | 6 ++--- 227 files changed, 517 insertions(+), 492 deletions(-) diff --git a/cmd/helm/chart.go b/cmd/helm/chart.go index e66e6be3c..96082ab3e 100644 --- a/cmd/helm/chart.go +++ b/cmd/helm/chart.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/pkg/action" ) const chartHelp = ` diff --git a/cmd/helm/chart_export.go b/cmd/helm/chart_export.go index b1f790205..67caf08d7 100644 --- a/cmd/helm/chart_export.go +++ b/cmd/helm/chart_export.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const chartExportDesc = ` diff --git a/cmd/helm/chart_list.go b/cmd/helm/chart_list.go index 78931603a..a9d01c9bd 100644 --- a/cmd/helm/chart_list.go +++ b/cmd/helm/chart_list.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/pkg/action" ) const chartListDesc = ` diff --git a/cmd/helm/chart_pull.go b/cmd/helm/chart_pull.go index bb90366cb..760ff3e2c 100644 --- a/cmd/helm/chart_pull.go +++ b/cmd/helm/chart_pull.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const chartPullDesc = ` diff --git a/cmd/helm/chart_push.go b/cmd/helm/chart_push.go index 21fbe0e1f..ff34632b1 100644 --- a/cmd/helm/chart_push.go +++ b/cmd/helm/chart_push.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const chartPushDesc = ` diff --git a/cmd/helm/chart_remove.go b/cmd/helm/chart_remove.go index 43e463c6a..d952951fb 100644 --- a/cmd/helm/chart_remove.go +++ b/cmd/helm/chart_remove.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const chartRemoveDesc = ` diff --git a/cmd/helm/chart_save.go b/cmd/helm/chart_save.go index 81a9d57ca..35b72cd07 100644 --- a/cmd/helm/chart_save.go +++ b/cmd/helm/chart_save.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/chart/loader" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/chart/loader" ) const chartSaveDesc = ` diff --git a/cmd/helm/create.go b/cmd/helm/create.go index 0034e4f52..65e142097 100644 --- a/cmd/helm/create.go +++ b/cmd/helm/create.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/helmpath" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/helmpath" ) const createDesc = ` diff --git a/cmd/helm/create_test.go b/cmd/helm/create_test.go index 962030aec..d9b312262 100644 --- a/cmd/helm/create_test.go +++ b/cmd/helm/create_test.go @@ -23,11 +23,11 @@ import ( "path/filepath" "testing" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/helmpath" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/helmpath" ) func TestCreateCmd(t *testing.T) { diff --git a/cmd/helm/dependency.go b/cmd/helm/dependency.go index 3942d9b19..2cc4c5045 100644 --- a/cmd/helm/dependency.go +++ b/cmd/helm/dependency.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const dependencyDesc = ` diff --git a/cmd/helm/dependency_build.go b/cmd/helm/dependency_build.go index 6f5e20613..478b49479 100644 --- a/cmd/helm/dependency_build.go +++ b/cmd/helm/dependency_build.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/cobra" "k8s.io/client-go/util/homedir" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/downloader" - "helm.sh/helm/pkg/getter" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/downloader" + "helm.sh/helm/v3/pkg/getter" ) const dependencyBuildDesc = ` diff --git a/cmd/helm/dependency_build_test.go b/cmd/helm/dependency_build_test.go index 0f131bdf3..58ef3d3a1 100644 --- a/cmd/helm/dependency_build_test.go +++ b/cmd/helm/dependency_build_test.go @@ -22,9 +22,9 @@ import ( "strings" "testing" - "helm.sh/helm/pkg/provenance" - "helm.sh/helm/pkg/repo" - "helm.sh/helm/pkg/repo/repotest" + "helm.sh/helm/v3/pkg/provenance" + "helm.sh/helm/v3/pkg/repo" + "helm.sh/helm/v3/pkg/repo/repotest" ) func TestDependencyBuildCmd(t *testing.T) { diff --git a/cmd/helm/dependency_update.go b/cmd/helm/dependency_update.go index c86c2f9e2..9855afb92 100644 --- a/cmd/helm/dependency_update.go +++ b/cmd/helm/dependency_update.go @@ -21,10 +21,10 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/downloader" - "helm.sh/helm/pkg/getter" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/downloader" + "helm.sh/helm/v3/pkg/getter" ) const dependencyUpDesc = ` diff --git a/cmd/helm/dependency_update_test.go b/cmd/helm/dependency_update_test.go index 9cbd4f029..cf9ad7ba4 100644 --- a/cmd/helm/dependency_update_test.go +++ b/cmd/helm/dependency_update_test.go @@ -23,13 +23,13 @@ import ( "strings" "testing" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/helmpath" - "helm.sh/helm/pkg/provenance" - "helm.sh/helm/pkg/repo" - "helm.sh/helm/pkg/repo/repotest" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/helmpath" + "helm.sh/helm/v3/pkg/provenance" + "helm.sh/helm/v3/pkg/repo" + "helm.sh/helm/v3/pkg/repo/repotest" ) func TestDependencyUpdateCmd(t *testing.T) { diff --git a/cmd/helm/docs.go b/cmd/helm/docs.go index e3846eeb3..7eb9c1c88 100644 --- a/cmd/helm/docs.go +++ b/cmd/helm/docs.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/cobra/doc" - "helm.sh/helm/cmd/helm/require" + "helm.sh/helm/v3/cmd/helm/require" ) const docsDesc = ` diff --git a/cmd/helm/env.go b/cmd/helm/env.go index 4078a000b..1881ac91d 100644 --- a/cmd/helm/env.go +++ b/cmd/helm/env.go @@ -20,11 +20,11 @@ import ( "fmt" "io" - "helm.sh/helm/pkg/cli" + "helm.sh/helm/v3/pkg/cli" "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" + "helm.sh/helm/v3/cmd/helm/require" ) var ( diff --git a/cmd/helm/flags.go b/cmd/helm/flags.go index 042484a29..b0552c7fd 100644 --- a/cmd/helm/flags.go +++ b/cmd/helm/flags.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/cli/values" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/cli/values" ) const outputFlag = "output" diff --git a/cmd/helm/get.go b/cmd/helm/get.go index acbe5fe27..fb7fef233 100644 --- a/cmd/helm/get.go +++ b/cmd/helm/get.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) var getHelp = ` diff --git a/cmd/helm/get_hooks.go b/cmd/helm/get_hooks.go index 82a375dab..4ec48bb2c 100644 --- a/cmd/helm/get_hooks.go +++ b/cmd/helm/get_hooks.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const getHooksHelp = ` diff --git a/cmd/helm/get_hooks_test.go b/cmd/helm/get_hooks_test.go index 990ae77be..f843f7d59 100644 --- a/cmd/helm/get_hooks_test.go +++ b/cmd/helm/get_hooks_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/release" ) func TestGetHooks(t *testing.T) { diff --git a/cmd/helm/get_manifest.go b/cmd/helm/get_manifest.go index c9e13ee98..d8fcd2e2c 100644 --- a/cmd/helm/get_manifest.go +++ b/cmd/helm/get_manifest.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) var getManifestHelp = ` diff --git a/cmd/helm/get_manifest_test.go b/cmd/helm/get_manifest_test.go index 93a0bbd6d..be54d4a5b 100644 --- a/cmd/helm/get_manifest_test.go +++ b/cmd/helm/get_manifest_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/release" ) func TestGetManifest(t *testing.T) { diff --git a/cmd/helm/get_test.go b/cmd/helm/get_test.go index 6fc7d6e32..1279c5f7f 100644 --- a/cmd/helm/get_test.go +++ b/cmd/helm/get_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/release" ) func TestGetCmd(t *testing.T) { diff --git a/cmd/helm/get_values.go b/cmd/helm/get_values.go index 1f998dbf0..31e1e3711 100644 --- a/cmd/helm/get_values.go +++ b/cmd/helm/get_values.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) var getValuesHelp = ` diff --git a/cmd/helm/get_values_test.go b/cmd/helm/get_values_test.go index 9673e5312..ee77053e4 100644 --- a/cmd/helm/get_values_test.go +++ b/cmd/helm/get_values_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/release" ) func TestGetValuesCmd(t *testing.T) { diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go index e1ce1ad28..509ab3241 100644 --- a/cmd/helm/helm.go +++ b/cmd/helm/helm.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package main // import "helm.sh/helm/cmd/helm" +package main // import "helm.sh/helm/v3/cmd/helm" import ( "flag" @@ -32,12 +32,12 @@ import ( // Import to initialize client auth plugins. _ "k8s.io/client-go/plugin/pkg/client/auth" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/cli" - "helm.sh/helm/pkg/gates" - "helm.sh/helm/pkg/kube" - "helm.sh/helm/pkg/storage" - "helm.sh/helm/pkg/storage/driver" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/cli" + "helm.sh/helm/v3/pkg/gates" + "helm.sh/helm/v3/pkg/kube" + "helm.sh/helm/v3/pkg/storage" + "helm.sh/helm/v3/pkg/storage/driver" ) // FeatureGateOCI is the feature gate for checking if `helm chart` and `helm registry` commands should work diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go index 0abadacb7..fc4a3a879 100644 --- a/cmd/helm/helm_test.go +++ b/cmd/helm/helm_test.go @@ -27,13 +27,13 @@ import ( shellwords "github.com/mattn/go-shellwords" "github.com/spf13/cobra" - "helm.sh/helm/internal/test" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/chartutil" - kubefake "helm.sh/helm/pkg/kube/fake" - "helm.sh/helm/pkg/release" - "helm.sh/helm/pkg/storage" - "helm.sh/helm/pkg/storage/driver" + "helm.sh/helm/v3/internal/test" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/chartutil" + kubefake "helm.sh/helm/v3/pkg/kube/fake" + "helm.sh/helm/v3/pkg/release" + "helm.sh/helm/v3/pkg/storage" + "helm.sh/helm/v3/pkg/storage/driver" ) func testTimestamper() time.Time { return time.Unix(242085845, 0).UTC() } diff --git a/cmd/helm/history.go b/cmd/helm/history.go index ce7ceda69..f978bd977 100644 --- a/cmd/helm/history.go +++ b/cmd/helm/history.go @@ -23,11 +23,11 @@ import ( "github.com/gosuri/uitable" "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/release" - "helm.sh/helm/pkg/releaseutil" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/release" + "helm.sh/helm/v3/pkg/releaseutil" ) var historyHelp = ` diff --git a/cmd/helm/history_test.go b/cmd/helm/history_test.go index b9d1290d9..3e750cefc 100644 --- a/cmd/helm/history_test.go +++ b/cmd/helm/history_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/release" ) func TestHistoryCmd(t *testing.T) { diff --git a/cmd/helm/install.go b/cmd/helm/install.go index 0962f36c6..a5a77cbc2 100644 --- a/cmd/helm/install.go +++ b/cmd/helm/install.go @@ -24,14 +24,14 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" - "helm.sh/helm/pkg/cli/values" - "helm.sh/helm/pkg/downloader" - "helm.sh/helm/pkg/getter" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" + "helm.sh/helm/v3/pkg/cli/values" + "helm.sh/helm/v3/pkg/downloader" + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/release" ) const installDesc = ` diff --git a/cmd/helm/lint.go b/cmd/helm/lint.go index 8b18d3261..13395c6d6 100644 --- a/cmd/helm/lint.go +++ b/cmd/helm/lint.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/cli/values" - "helm.sh/helm/pkg/getter" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/cli/values" + "helm.sh/helm/v3/pkg/getter" ) var longLintHelp = ` diff --git a/cmd/helm/list.go b/cmd/helm/list.go index e7293ded6..57af01e51 100644 --- a/cmd/helm/list.go +++ b/cmd/helm/list.go @@ -24,9 +24,9 @@ import ( "github.com/gosuri/uitable" "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/release" ) var listHelp = ` diff --git a/cmd/helm/list_test.go b/cmd/helm/list_test.go index 886c58176..2de7c5dd2 100644 --- a/cmd/helm/list_test.go +++ b/cmd/helm/list_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/release" ) func TestListCmd(t *testing.T) { diff --git a/cmd/helm/load_plugins.go b/cmd/helm/load_plugins.go index b74bc22ea..7bb323195 100644 --- a/cmd/helm/load_plugins.go +++ b/cmd/helm/load_plugins.go @@ -27,7 +27,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/pkg/plugin" + "helm.sh/helm/v3/pkg/plugin" ) type pluginError struct { diff --git a/cmd/helm/package.go b/cmd/helm/package.go index 808aabf77..dd4bb2d17 100644 --- a/cmd/helm/package.go +++ b/cmd/helm/package.go @@ -25,10 +25,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/cli/values" - "helm.sh/helm/pkg/downloader" - "helm.sh/helm/pkg/getter" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/cli/values" + "helm.sh/helm/v3/pkg/downloader" + "helm.sh/helm/v3/pkg/getter" ) const packageDesc = ` diff --git a/cmd/helm/package_test.go b/cmd/helm/package_test.go index e21d3defc..739857fa9 100644 --- a/cmd/helm/package_test.go +++ b/cmd/helm/package_test.go @@ -28,10 +28,10 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" - "helm.sh/helm/pkg/chartutil" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" + "helm.sh/helm/v3/pkg/chartutil" ) func TestPackage(t *testing.T) { diff --git a/cmd/helm/plugin.go b/cmd/helm/plugin.go index 7c325a84c..5c7b34f09 100644 --- a/cmd/helm/plugin.go +++ b/cmd/helm/plugin.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/pkg/plugin" + "helm.sh/helm/v3/pkg/plugin" ) const pluginHelp = ` diff --git a/cmd/helm/plugin_install.go b/cmd/helm/plugin_install.go index 94f7396a3..b790943bc 100644 --- a/cmd/helm/plugin_install.go +++ b/cmd/helm/plugin_install.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/plugin" - "helm.sh/helm/pkg/plugin/installer" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/plugin" + "helm.sh/helm/v3/pkg/plugin/installer" ) type pluginInstallOptions struct { diff --git a/cmd/helm/plugin_remove.go b/cmd/helm/plugin_remove.go index a668c7115..b632ab396 100644 --- a/cmd/helm/plugin_remove.go +++ b/cmd/helm/plugin_remove.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/pkg/plugin" + "helm.sh/helm/v3/pkg/plugin" ) type pluginRemoveOptions struct { diff --git a/cmd/helm/plugin_update.go b/cmd/helm/plugin_update.go index 4cf2cbf7b..e2f6ad460 100644 --- a/cmd/helm/plugin_update.go +++ b/cmd/helm/plugin_update.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/pkg/plugin" - "helm.sh/helm/pkg/plugin/installer" + "helm.sh/helm/v3/pkg/plugin" + "helm.sh/helm/v3/pkg/plugin/installer" ) type pluginUpdateOptions struct { diff --git a/cmd/helm/printer.go b/cmd/helm/printer.go index 4d47f1c13..f8d1bd2d5 100644 --- a/cmd/helm/printer.go +++ b/cmd/helm/printer.go @@ -23,8 +23,8 @@ import ( "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/release" ) var printReleaseTemplate = `REVISION: {{.Release.Version}} diff --git a/cmd/helm/pull.go b/cmd/helm/pull.go index 76b4240d4..3b00e9bca 100644 --- a/cmd/helm/pull.go +++ b/cmd/helm/pull.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const pullDesc = ` diff --git a/cmd/helm/pull_test.go b/cmd/helm/pull_test.go index 6fb66cbc6..248195774 100644 --- a/cmd/helm/pull_test.go +++ b/cmd/helm/pull_test.go @@ -23,7 +23,7 @@ import ( "regexp" "testing" - "helm.sh/helm/pkg/repo/repotest" + "helm.sh/helm/v3/pkg/repo/repotest" ) func TestPullCmd(t *testing.T) { diff --git a/cmd/helm/registry.go b/cmd/helm/registry.go index 2a1e3a03d..479f2ed63 100644 --- a/cmd/helm/registry.go +++ b/cmd/helm/registry.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/pkg/action" ) const registryHelp = ` diff --git a/cmd/helm/registry_login.go b/cmd/helm/registry_login.go index c40df0f35..e3435bf9d 100644 --- a/cmd/helm/registry_login.go +++ b/cmd/helm/registry_login.go @@ -28,8 +28,8 @@ import ( "github.com/docker/docker/pkg/term" "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const registryLoginDesc = ` diff --git a/cmd/helm/registry_logout.go b/cmd/helm/registry_logout.go index 3ec6876b3..e7e1a24fe 100644 --- a/cmd/helm/registry_logout.go +++ b/cmd/helm/registry_logout.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const registryLogoutDesc = ` diff --git a/cmd/helm/release_testing.go b/cmd/helm/release_testing.go index ab89c7173..0c5631abd 100644 --- a/cmd/helm/release_testing.go +++ b/cmd/helm/release_testing.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/pkg/action" ) const releaseTestHelp = ` diff --git a/cmd/helm/release_testing_run.go b/cmd/helm/release_testing_run.go index d300a65e6..6dc769e83 100644 --- a/cmd/helm/release_testing_run.go +++ b/cmd/helm/release_testing_run.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const releaseTestRunHelp = ` diff --git a/cmd/helm/repo.go b/cmd/helm/repo.go index f20bde6c3..8071a8264 100644 --- a/cmd/helm/repo.go +++ b/cmd/helm/repo.go @@ -23,7 +23,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" + "helm.sh/helm/v3/cmd/helm/require" ) var repoHelm = ` diff --git a/cmd/helm/repo_add.go b/cmd/helm/repo_add.go index 1bbffe202..96162499f 100644 --- a/cmd/helm/repo_add.go +++ b/cmd/helm/repo_add.go @@ -29,9 +29,9 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/getter" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/repo" ) type repoAddOptions struct { diff --git a/cmd/helm/repo_add_test.go b/cmd/helm/repo_add_test.go index c0268eef6..c53f3bd65 100644 --- a/cmd/helm/repo_add_test.go +++ b/cmd/helm/repo_add_test.go @@ -25,9 +25,9 @@ import ( "gopkg.in/yaml.v2" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/repo" - "helm.sh/helm/pkg/repo/repotest" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/repo" + "helm.sh/helm/v3/pkg/repo/repotest" ) func TestRepoAddCmd(t *testing.T) { diff --git a/cmd/helm/repo_index.go b/cmd/helm/repo_index.go index 03cf002e9..63afaf37b 100644 --- a/cmd/helm/repo_index.go +++ b/cmd/helm/repo_index.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/repo" ) const repoIndexDesc = ` diff --git a/cmd/helm/repo_index_test.go b/cmd/helm/repo_index_test.go index 110b9b892..51c5db80a 100644 --- a/cmd/helm/repo_index_test.go +++ b/cmd/helm/repo_index_test.go @@ -23,8 +23,8 @@ import ( "path/filepath" "testing" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/repo" ) func TestRepoIndexCmd(t *testing.T) { diff --git a/cmd/helm/repo_list.go b/cmd/helm/repo_list.go index 6136bc022..5abc73c09 100644 --- a/cmd/helm/repo_list.go +++ b/cmd/helm/repo_list.go @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/repo" ) func newRepoListCmd(out io.Writer) *cobra.Command { diff --git a/cmd/helm/repo_remove.go b/cmd/helm/repo_remove.go index 708c713dd..c1ecb1829 100644 --- a/cmd/helm/repo_remove.go +++ b/cmd/helm/repo_remove.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/helmpath" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/helmpath" + "helm.sh/helm/v3/pkg/repo" ) type repoRemoveOptions struct { diff --git a/cmd/helm/repo_remove_test.go b/cmd/helm/repo_remove_test.go index 5e8ddd209..3fdcbe9c3 100644 --- a/cmd/helm/repo_remove_test.go +++ b/cmd/helm/repo_remove_test.go @@ -23,10 +23,10 @@ import ( "strings" "testing" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/helmpath" - "helm.sh/helm/pkg/repo" - "helm.sh/helm/pkg/repo/repotest" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/helmpath" + "helm.sh/helm/v3/pkg/repo" + "helm.sh/helm/v3/pkg/repo/repotest" ) func TestRepoRemove(t *testing.T) { diff --git a/cmd/helm/repo_update.go b/cmd/helm/repo_update.go index ba9a3ea09..027f18518 100644 --- a/cmd/helm/repo_update.go +++ b/cmd/helm/repo_update.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/getter" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/repo" ) const updateDesc = ` diff --git a/cmd/helm/repo_update_test.go b/cmd/helm/repo_update_test.go index da147a15c..6ddce0637 100644 --- a/cmd/helm/repo_update_test.go +++ b/cmd/helm/repo_update_test.go @@ -22,10 +22,10 @@ import ( "strings" "testing" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/getter" - "helm.sh/helm/pkg/repo" - "helm.sh/helm/pkg/repo/repotest" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/repo" + "helm.sh/helm/v3/pkg/repo/repotest" ) func TestUpdateCmd(t *testing.T) { diff --git a/cmd/helm/rollback.go b/cmd/helm/rollback.go index 140c5b62f..d44ef14f4 100644 --- a/cmd/helm/rollback.go +++ b/cmd/helm/rollback.go @@ -24,8 +24,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const rollbackDesc = ` diff --git a/cmd/helm/rollback_test.go b/cmd/helm/rollback_test.go index de0f9b0f1..fdc627b5f 100644 --- a/cmd/helm/rollback_test.go +++ b/cmd/helm/rollback_test.go @@ -19,8 +19,8 @@ package main import ( "testing" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/release" ) func TestRollbackCmd(t *testing.T) { diff --git a/cmd/helm/root.go b/cmd/helm/root.go index b7b9cbe3b..eccb49fa0 100644 --- a/cmd/helm/root.go +++ b/cmd/helm/root.go @@ -14,16 +14,16 @@ See the License for the specific language governing permissions and limitations under the License. */ -package main // import "helm.sh/helm/cmd/helm" +package main // import "helm.sh/helm/v3/cmd/helm" import ( "io" "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/internal/experimental/registry" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/internal/experimental/registry" + "helm.sh/helm/v3/pkg/action" ) const ( diff --git a/cmd/helm/root_test.go b/cmd/helm/root_test.go index 95802cf5d..7d606b8a9 100644 --- a/cmd/helm/root_test.go +++ b/cmd/helm/root_test.go @@ -21,9 +21,9 @@ import ( "path/filepath" "testing" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/helmpath" - "helm.sh/helm/pkg/helmpath/xdg" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/helmpath" + "helm.sh/helm/v3/pkg/helmpath/xdg" ) func TestRootCmd(t *testing.T) { diff --git a/cmd/helm/search/search.go b/cmd/helm/search/search.go index 43d62949a..855da4a3d 100644 --- a/cmd/helm/search/search.go +++ b/cmd/helm/search/search.go @@ -30,7 +30,7 @@ import ( "github.com/Masterminds/semver/v3" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/pkg/repo" ) // Result is a search result. diff --git a/cmd/helm/search/search_test.go b/cmd/helm/search/search_test.go index 47c0a0e9f..9c1859d77 100644 --- a/cmd/helm/search/search_test.go +++ b/cmd/helm/search/search_test.go @@ -20,8 +20,8 @@ import ( "strings" "testing" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/repo" ) func TestSortScore(t *testing.T) { diff --git a/cmd/helm/search_hub.go b/cmd/helm/search_hub.go index 3775c79bd..bf2a3aeab 100644 --- a/cmd/helm/search_hub.go +++ b/cmd/helm/search_hub.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/internal/monocular" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/internal/monocular" + "helm.sh/helm/v3/pkg/action" ) const searchHubDesc = ` diff --git a/cmd/helm/search_repo.go b/cmd/helm/search_repo.go index 8f926bcd5..a30629420 100644 --- a/cmd/helm/search_repo.go +++ b/cmd/helm/search_repo.go @@ -27,10 +27,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/search" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/helmpath" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/cmd/helm/search" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/helmpath" + "helm.sh/helm/v3/pkg/repo" ) const searchRepoDesc = ` diff --git a/cmd/helm/show.go b/cmd/helm/show.go index 68260eddd..4c2d42815 100644 --- a/cmd/helm/show.go +++ b/cmd/helm/show.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const showDesc = ` diff --git a/cmd/helm/status.go b/cmd/helm/status.go index f97e0d475..af08d92ab 100644 --- a/cmd/helm/status.go +++ b/cmd/helm/status.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/release" ) var statusHelp = ` diff --git a/cmd/helm/status_test.go b/cmd/helm/status_test.go index f277269dd..198063220 100644 --- a/cmd/helm/status_test.go +++ b/cmd/helm/status_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/release" ) func TestStatusCmd(t *testing.T) { diff --git a/cmd/helm/template.go b/cmd/helm/template.go index c1af7ff23..4556112a1 100644 --- a/cmd/helm/template.go +++ b/cmd/helm/template.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/cli/values" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/cli/values" ) const templateDesc = ` diff --git a/cmd/helm/uninstall.go b/cmd/helm/uninstall.go index 0710a3c45..27b5a8426 100644 --- a/cmd/helm/uninstall.go +++ b/cmd/helm/uninstall.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const uninstallDesc = ` diff --git a/cmd/helm/uninstall_test.go b/cmd/helm/uninstall_test.go index 2681dc447..a34934077 100644 --- a/cmd/helm/uninstall_test.go +++ b/cmd/helm/uninstall_test.go @@ -19,7 +19,7 @@ package main import ( "testing" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/release" ) func TestUninstall(t *testing.T) { diff --git a/cmd/helm/upgrade.go b/cmd/helm/upgrade.go index 29b463c5b..5c107d2df 100644 --- a/cmd/helm/upgrade.go +++ b/cmd/helm/upgrade.go @@ -24,12 +24,12 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" - "helm.sh/helm/pkg/chart/loader" - "helm.sh/helm/pkg/cli/values" - "helm.sh/helm/pkg/getter" - "helm.sh/helm/pkg/storage/driver" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" + "helm.sh/helm/v3/pkg/chart/loader" + "helm.sh/helm/v3/pkg/cli/values" + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/storage/driver" ) const upgradeDesc = ` diff --git a/cmd/helm/upgrade_test.go b/cmd/helm/upgrade_test.go index 0d544011e..bd1ccec35 100644 --- a/cmd/helm/upgrade_test.go +++ b/cmd/helm/upgrade_test.go @@ -23,11 +23,11 @@ import ( "strings" "testing" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/release" ) func TestUpgradeCmd(t *testing.T) { diff --git a/cmd/helm/verify.go b/cmd/helm/verify.go index a44f46238..1cdd26290 100644 --- a/cmd/helm/verify.go +++ b/cmd/helm/verify.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/pkg/action" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/pkg/action" ) const verifyDesc = ` diff --git a/cmd/helm/version.go b/cmd/helm/version.go index 888dc6094..8c0c11484 100644 --- a/cmd/helm/version.go +++ b/cmd/helm/version.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "helm.sh/helm/cmd/helm/require" - "helm.sh/helm/internal/version" + "helm.sh/helm/v3/cmd/helm/require" + "helm.sh/helm/v3/internal/version" ) const versionDesc = ` diff --git a/go.mod b/go.mod index 82b4e0626..42c0fa088 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module helm.sh/helm +module helm.sh/helm/v3 go 1.13 @@ -10,7 +10,9 @@ require ( github.com/BurntSushi/toml v0.3.1 github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e github.com/Masterminds/goutils v1.1.0 + github.com/Masterminds/semver v1.5.0 // indirect github.com/Masterminds/semver/v3 v3.0.1 + github.com/Masterminds/sprig v2.22.0+incompatible // indirect github.com/Masterminds/sprig/v3 v3.0.0 github.com/Masterminds/vcs v1.13.0 github.com/Microsoft/go-winio v0.4.12 @@ -71,9 +73,11 @@ require ( github.com/huandu/xstrings v1.2.0 github.com/imdario/mergo v0.3.7 github.com/inconshreveable/mousetrap v1.0.0 + github.com/jmoiron/sqlx v1.2.0 // indirect github.com/json-iterator/go v1.1.7 github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 github.com/konsorten/go-windows-terminal-sequences v1.0.1 + github.com/lib/pq v1.2.0 // indirect github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 github.com/mattn/go-runewidth v0.0.4 github.com/mattn/go-shellwords v1.0.5 @@ -93,6 +97,7 @@ require ( github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 github.com/prometheus/common v0.2.0 github.com/prometheus/procfs v0.0.0-20190129233650-316cf8ccfec5 + github.com/rubenv/sql-migrate v0.0.0-20190902133344-8926f37f0bc1 // indirect github.com/russross/blackfriday v1.5.2 github.com/sirupsen/logrus v1.4.2 github.com/spf13/cobra v0.0.5 @@ -118,6 +123,7 @@ require ( google.golang.org/appengine v1.5.0 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 google.golang.org/grpc v1.23.0 + gopkg.in/gorp.v1 v1.7.2 // indirect gopkg.in/yaml.v2 v2.2.2 k8s.io/api v0.0.0 k8s.io/apiextensions-apiserver v0.0.0 diff --git a/go.sum b/go.sum index 04aa1cf10..222f641f9 100644 --- a/go.sum +++ b/go.sum @@ -96,6 +96,7 @@ github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH github.com/census-instrumentation/opencensus-proto v0.0.2-0.20180913191712-f303ae3f8d6a/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.1.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c/go.mod h1:Xe6ZsFhtM8HrDku0pxJ3/Lr51rwykrzgFwpmTzleatY= +github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b/go.mod h1:TrMrLQfeENAPYPRsJuq3jsqdlRh3lvi6trTZJG8+tho= github.com/cheekybits/genny v0.0.0-20170328200008-9127e812e1e9/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= @@ -127,6 +128,7 @@ github.com/coreos/rkt v1.30.0/go.mod h1:O634mlH6U7qk87poQifK6M2rsFNt+FyUTWNMnP1h github.com/cpuguy83/go-md2man v1.0.8/go.mod h1:N6JayAiVKtlHSnuTCeuLSQVs75hb8q+dYQLjr7cDsKY= github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -235,6 +237,7 @@ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= @@ -326,6 +329,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA= +github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -352,7 +357,11 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA= @@ -375,6 +384,7 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.5 h1:JhhFTIOslh5ZsPrpa3Wdg8bF0WI3b44EMblmU9wIsXc= github.com/mattn/go-shellwords v1.0.5/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= +github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4= @@ -465,6 +475,8 @@ github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rubenv/sql-migrate v0.0.0-20190902133344-8926f37f0bc1 h1:G7j/gxkXAL80NMLOWi6EEctDET1Iuxl3sBMJXDnu2z0= +github.com/rubenv/sql-migrate v0.0.0-20190902133344-8926f37f0bc1/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY= github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= @@ -671,6 +683,8 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= +gopkg.in/gorp.v1 v1.7.2 h1:j3DWlAyGVv8whO7AcIWznQ2Yj7yJkn34B8s63GViAAw= +gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw= gopkg.in/inf.v0 v0.9.0 h1:3zYtXIO92bvsdS3ggAdA8Gb4Azj0YU+TVY1uGYNFA8o= gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/mcuadros/go-syslog.v2 v2.2.1/go.mod h1:l5LPIyOOyIdQquNg+oU6Z3524YwrcqEm0aKH+5zpt2U= @@ -687,6 +701,8 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpAriY= +helm.sh/helm v2.14.3+incompatible h1:M3xvix8x41Xjc/ZGARGpUOTjxTBrb86yZG5FmCjgIew= +helm.sh/helm v2.14.3+incompatible/go.mod h1:0Xbc6ErzwWH9qC55X1+hE3ZwhM3atbhCm/NbFZw5i+4= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -696,6 +712,8 @@ honnef.co/go/tools v0.0.1-2019.2.2/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM= +k8s.io/helm v2.14.3+incompatible h1:uzotTcZXa/b2SWVoUzM1xiCXVjI38TuxMujS/1s+3Gw= +k8s.io/helm v2.14.3+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ= @@ -780,4 +798,5 @@ sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:w sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc h1:MksmcCZQWAQJCTA5T0jgI/0sJ51AVm4Z41MrmfczEoc= vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/internal/experimental/registry/authorizer.go b/internal/experimental/registry/authorizer.go index 783404f6f..918a999ba 100644 --- a/internal/experimental/registry/authorizer.go +++ b/internal/experimental/registry/authorizer.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package registry // import "helm.sh/helm/internal/experimental/registry" +package registry // import "helm.sh/helm/v3/internal/experimental/registry" import ( "github.com/deislabs/oras/pkg/auth" diff --git a/internal/experimental/registry/cache.go b/internal/experimental/registry/cache.go index 107affcce..19ceb86ea 100644 --- a/internal/experimental/registry/cache.go +++ b/internal/experimental/registry/cache.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package registry // import "helm.sh/helm/internal/experimental/registry" +package registry // import "helm.sh/helm/v3/internal/experimental/registry" import ( "bytes" @@ -34,9 +34,9 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" - "helm.sh/helm/pkg/chartutil" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" + "helm.sh/helm/v3/pkg/chartutil" ) const ( diff --git a/internal/experimental/registry/cache_opts.go b/internal/experimental/registry/cache_opts.go index 51225e7db..6851ae807 100644 --- a/internal/experimental/registry/cache_opts.go +++ b/internal/experimental/registry/cache_opts.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package registry // import "helm.sh/helm/internal/experimental/registry" +package registry // import "helm.sh/helm/v3/internal/experimental/registry" import ( "io" diff --git a/internal/experimental/registry/client.go b/internal/experimental/registry/client.go index 8ec5ccd7b..d52d9f3e0 100644 --- a/internal/experimental/registry/client.go +++ b/internal/experimental/registry/client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package registry // import "helm.sh/helm/internal/experimental/registry" +package registry // import "helm.sh/helm/v3/internal/experimental/registry" import ( "context" @@ -29,8 +29,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/helmpath" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/helmpath" ) const ( diff --git a/internal/experimental/registry/client_opts.go b/internal/experimental/registry/client_opts.go index 0eaa84346..cd295813a 100644 --- a/internal/experimental/registry/client_opts.go +++ b/internal/experimental/registry/client_opts.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package registry // import "helm.sh/helm/internal/experimental/registry" +package registry // import "helm.sh/helm/v3/internal/experimental/registry" import ( "io" diff --git a/internal/experimental/registry/client_test.go b/internal/experimental/registry/client_test.go index d2cc1abaa..0861c8984 100644 --- a/internal/experimental/registry/client_test.go +++ b/internal/experimental/registry/client_test.go @@ -36,7 +36,7 @@ import ( "github.com/stretchr/testify/suite" "golang.org/x/crypto/bcrypt" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) var ( diff --git a/internal/experimental/registry/constants.go b/internal/experimental/registry/constants.go index 2f1025efe..e0f17fe61 100644 --- a/internal/experimental/registry/constants.go +++ b/internal/experimental/registry/constants.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package registry // import "helm.sh/helm/internal/experimental/registry" +package registry // import "helm.sh/helm/v3/internal/experimental/registry" const ( // HelmChartConfigMediaType is the reserved media type for the Helm chart manifest config diff --git a/internal/experimental/registry/reference.go b/internal/experimental/registry/reference.go index 4b394d7a5..ced6cf33a 100644 --- a/internal/experimental/registry/reference.go +++ b/internal/experimental/registry/reference.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package registry // import "helm.sh/helm/internal/experimental/registry" +package registry // import "helm.sh/helm/v3/internal/experimental/registry" import ( "errors" diff --git a/internal/experimental/registry/resolver.go b/internal/experimental/registry/resolver.go index 716c01f89..ff8a82633 100644 --- a/internal/experimental/registry/resolver.go +++ b/internal/experimental/registry/resolver.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package registry // import "helm.sh/helm/internal/experimental/registry" +package registry // import "helm.sh/helm/v3/internal/experimental/registry" import ( "github.com/containerd/containerd/remotes" diff --git a/internal/experimental/registry/util.go b/internal/experimental/registry/util.go index 3af6318e0..3a4589d01 100644 --- a/internal/experimental/registry/util.go +++ b/internal/experimental/registry/util.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package registry // import "helm.sh/helm/internal/experimental/registry" +package registry // import "helm.sh/helm/v3/internal/experimental/registry" import ( "context" diff --git a/internal/ignore/doc.go b/internal/ignore/doc.go index 112f77e7b..e6a6a6c7b 100644 --- a/internal/ignore/doc.go +++ b/internal/ignore/doc.go @@ -64,4 +64,4 @@ Notable differences from .gitignore: - The evaluation of escape sequences has not been tested for compatibility - There is no support for '\!' as a special leading sequence. */ -package ignore // import "helm.sh/helm/internal/ignore" +package ignore // import "helm.sh/helm/v3/internal/ignore" diff --git a/internal/monocular/search.go b/internal/monocular/search.go index feadf93df..61695f554 100644 --- a/internal/monocular/search.go +++ b/internal/monocular/search.go @@ -24,8 +24,8 @@ import ( "path" "time" - "helm.sh/helm/internal/version" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/internal/version" + "helm.sh/helm/v3/pkg/chart" ) // SearchPath is the url path to the search API in monocular. diff --git a/internal/resolver/resolver.go b/internal/resolver/resolver.go index 7f9beeaf3..c902b0134 100644 --- a/internal/resolver/resolver.go +++ b/internal/resolver/resolver.go @@ -26,10 +26,10 @@ import ( "github.com/Masterminds/semver/v3" "github.com/pkg/errors" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/helmpath" - "helm.sh/helm/pkg/provenance" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/helmpath" + "helm.sh/helm/v3/pkg/provenance" + "helm.sh/helm/v3/pkg/repo" ) // Resolver resolves dependencies from semantic version ranges to a particular version. diff --git a/internal/resolver/resolver_test.go b/internal/resolver/resolver_test.go index 38fa2a099..3c402aaea 100644 --- a/internal/resolver/resolver_test.go +++ b/internal/resolver/resolver_test.go @@ -18,7 +18,7 @@ package resolver import ( "testing" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) func TestResolve(t *testing.T) { diff --git a/internal/test/ensure/ensure.go b/internal/test/ensure/ensure.go index ded2f1cca..b4775df80 100644 --- a/internal/test/ensure/ensure.go +++ b/internal/test/ensure/ensure.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "helm.sh/helm/pkg/helmpath/xdg" + "helm.sh/helm/v3/pkg/helmpath/xdg" ) // HelmHome sets up a Helm Home in a temp dir. diff --git a/internal/version/version.go b/internal/version/version.go index 394476039..131a2b130 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package version // import "helm.sh/helm/internal/version" +package version // import "helm.sh/helm/v3/internal/version" import ( "flag" diff --git a/pkg/action/action.go b/pkg/action/action.go index f5ba24ba7..f784b3651 100644 --- a/pkg/action/action.go +++ b/pkg/action/action.go @@ -27,11 +27,11 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - "helm.sh/helm/internal/experimental/registry" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/kube" - "helm.sh/helm/pkg/release" - "helm.sh/helm/pkg/storage" + "helm.sh/helm/v3/internal/experimental/registry" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/kube" + "helm.sh/helm/v3/pkg/release" + "helm.sh/helm/v3/pkg/storage" ) // Timestamper is a function capable of producing a timestamp.Timestamper. diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go index 716132853..ab6358e94 100644 --- a/pkg/action/action_test.go +++ b/pkg/action/action_test.go @@ -26,13 +26,13 @@ import ( dockerauth "github.com/deislabs/oras/pkg/auth/docker" fakeclientset "k8s.io/client-go/kubernetes/fake" - "helm.sh/helm/internal/experimental/registry" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chartutil" - kubefake "helm.sh/helm/pkg/kube/fake" - "helm.sh/helm/pkg/release" - "helm.sh/helm/pkg/storage" - "helm.sh/helm/pkg/storage/driver" + "helm.sh/helm/v3/internal/experimental/registry" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chartutil" + kubefake "helm.sh/helm/v3/pkg/kube/fake" + "helm.sh/helm/v3/pkg/release" + "helm.sh/helm/v3/pkg/storage" + "helm.sh/helm/v3/pkg/storage/driver" ) var verbose = flag.Bool("test.log", false, "enable test logging") diff --git a/pkg/action/chart_export.go b/pkg/action/chart_export.go index 6d2570066..75840d8bc 100644 --- a/pkg/action/chart_export.go +++ b/pkg/action/chart_export.go @@ -21,8 +21,8 @@ import ( "io" "path/filepath" - "helm.sh/helm/internal/experimental/registry" - "helm.sh/helm/pkg/chartutil" + "helm.sh/helm/v3/internal/experimental/registry" + "helm.sh/helm/v3/pkg/chartutil" ) // ChartExport performs a chart export operation. diff --git a/pkg/action/chart_pull.go b/pkg/action/chart_pull.go index 7fb7d6011..97abde7cc 100644 --- a/pkg/action/chart_pull.go +++ b/pkg/action/chart_pull.go @@ -19,7 +19,7 @@ package action import ( "io" - "helm.sh/helm/internal/experimental/registry" + "helm.sh/helm/v3/internal/experimental/registry" ) // ChartPull performs a chart pull operation. diff --git a/pkg/action/chart_push.go b/pkg/action/chart_push.go index 2c867e644..91ec49d38 100644 --- a/pkg/action/chart_push.go +++ b/pkg/action/chart_push.go @@ -19,7 +19,7 @@ package action import ( "io" - "helm.sh/helm/internal/experimental/registry" + "helm.sh/helm/v3/internal/experimental/registry" ) // ChartPush performs a chart push operation. diff --git a/pkg/action/chart_remove.go b/pkg/action/chart_remove.go index c810a395f..3c0fc2ed7 100644 --- a/pkg/action/chart_remove.go +++ b/pkg/action/chart_remove.go @@ -19,7 +19,7 @@ package action import ( "io" - "helm.sh/helm/internal/experimental/registry" + "helm.sh/helm/v3/internal/experimental/registry" ) // ChartRemove performs a chart remove operation. diff --git a/pkg/action/chart_save.go b/pkg/action/chart_save.go index cd1bfccb2..14a2d7c3c 100644 --- a/pkg/action/chart_save.go +++ b/pkg/action/chart_save.go @@ -19,8 +19,8 @@ package action import ( "io" - "helm.sh/helm/internal/experimental/registry" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/internal/experimental/registry" + "helm.sh/helm/v3/pkg/chart" ) // ChartSave performs a chart save operation. diff --git a/pkg/action/chart_save_test.go b/pkg/action/chart_save_test.go index 999130b16..4fd991a4e 100644 --- a/pkg/action/chart_save_test.go +++ b/pkg/action/chart_save_test.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "testing" - "helm.sh/helm/internal/experimental/registry" + "helm.sh/helm/v3/internal/experimental/registry" ) func chartSaveAction(t *testing.T) *ChartSave { diff --git a/pkg/action/dependency.go b/pkg/action/dependency.go index 84c6d9590..5781cc913 100644 --- a/pkg/action/dependency.go +++ b/pkg/action/dependency.go @@ -25,8 +25,8 @@ import ( "github.com/Masterminds/semver/v3" "github.com/gosuri/uitable" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" ) // Dependency is the action for building a given chart's dependency tree. diff --git a/pkg/action/get.go b/pkg/action/get.go index 0690ce0db..c776eb696 100644 --- a/pkg/action/get.go +++ b/pkg/action/get.go @@ -17,7 +17,7 @@ limitations under the License. package action import ( - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/release" ) // Get is the action for checking a given release's information. diff --git a/pkg/action/get_values.go b/pkg/action/get_values.go index 2ba6f54cd..e5f4f4f04 100644 --- a/pkg/action/get_values.go +++ b/pkg/action/get_values.go @@ -19,7 +19,7 @@ package action import ( "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/chartutil" + "helm.sh/helm/v3/pkg/chartutil" ) // GetValues is the action for checking a given release's values. diff --git a/pkg/action/history.go b/pkg/action/history.go index b2933585e..350876a9d 100644 --- a/pkg/action/history.go +++ b/pkg/action/history.go @@ -19,7 +19,7 @@ package action import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/release" ) // History is the action for checking the release's ledger. diff --git a/pkg/action/hooks.go b/pkg/action/hooks.go index 59e9c97ab..a8a27a5a2 100644 --- a/pkg/action/hooks.go +++ b/pkg/action/hooks.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/release" ) // execHook executes all of the hooks for the given hook event. diff --git a/pkg/action/install.go b/pkg/action/install.go index 34ed4e322..0badcdb58 100644 --- a/pkg/action/install.go +++ b/pkg/action/install.go @@ -32,18 +32,18 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/cli-runtime/pkg/resource" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/cli" - "helm.sh/helm/pkg/downloader" - "helm.sh/helm/pkg/engine" - "helm.sh/helm/pkg/getter" - kubefake "helm.sh/helm/pkg/kube/fake" - "helm.sh/helm/pkg/release" - "helm.sh/helm/pkg/releaseutil" - "helm.sh/helm/pkg/repo" - "helm.sh/helm/pkg/storage" - "helm.sh/helm/pkg/storage/driver" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/cli" + "helm.sh/helm/v3/pkg/downloader" + "helm.sh/helm/v3/pkg/engine" + "helm.sh/helm/v3/pkg/getter" + kubefake "helm.sh/helm/v3/pkg/kube/fake" + "helm.sh/helm/v3/pkg/release" + "helm.sh/helm/v3/pkg/releaseutil" + "helm.sh/helm/v3/pkg/repo" + "helm.sh/helm/v3/pkg/storage" + "helm.sh/helm/v3/pkg/storage/driver" ) // releaseNameMaxLen is the maximum length of a release name. diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go index 48551d962..de03a5a71 100644 --- a/pkg/action/install_test.go +++ b/pkg/action/install_test.go @@ -28,11 +28,11 @@ import ( "github.com/stretchr/testify/assert" - "helm.sh/helm/internal/test" - "helm.sh/helm/pkg/chartutil" - kubefake "helm.sh/helm/pkg/kube/fake" - "helm.sh/helm/pkg/release" - "helm.sh/helm/pkg/storage/driver" + "helm.sh/helm/v3/internal/test" + "helm.sh/helm/v3/pkg/chartutil" + kubefake "helm.sh/helm/v3/pkg/kube/fake" + "helm.sh/helm/v3/pkg/release" + "helm.sh/helm/v3/pkg/storage/driver" ) type nameTemplateTestCase struct { diff --git a/pkg/action/lint.go b/pkg/action/lint.go index c5a77eb4e..84a139686 100644 --- a/pkg/action/lint.go +++ b/pkg/action/lint.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/lint" - "helm.sh/helm/pkg/lint/support" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/lint" + "helm.sh/helm/v3/pkg/lint/support" ) var errLintNoChart = errors.New("no chart found for linting (missing Chart.yaml)") diff --git a/pkg/action/list.go b/pkg/action/list.go index 6022a24cd..6fb36ef40 100644 --- a/pkg/action/list.go +++ b/pkg/action/list.go @@ -19,8 +19,8 @@ package action import ( "regexp" - "helm.sh/helm/pkg/release" - "helm.sh/helm/pkg/releaseutil" + "helm.sh/helm/v3/pkg/release" + "helm.sh/helm/v3/pkg/releaseutil" ) // ListStates represents zero or more status codes that a list item may have set diff --git a/pkg/action/list_test.go b/pkg/action/list_test.go index 48e9a376a..cab0111fd 100644 --- a/pkg/action/list_test.go +++ b/pkg/action/list_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" - "helm.sh/helm/pkg/release" - "helm.sh/helm/pkg/storage" + "helm.sh/helm/v3/pkg/release" + "helm.sh/helm/v3/pkg/storage" ) func TestListStates(t *testing.T) { diff --git a/pkg/action/package.go b/pkg/action/package.go index a80239f46..5c85ebe0d 100644 --- a/pkg/action/package.go +++ b/pkg/action/package.go @@ -26,10 +26,10 @@ import ( "github.com/pkg/errors" "golang.org/x/crypto/ssh/terminal" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/provenance" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/provenance" ) // Package is the action for packaging a chart. diff --git a/pkg/action/package_test.go b/pkg/action/package_test.go index c526d7055..0f716118d 100644 --- a/pkg/action/package_test.go +++ b/pkg/action/package_test.go @@ -19,7 +19,7 @@ package action import ( "testing" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) func TestSetVersion(t *testing.T) { diff --git a/pkg/action/printer.go b/pkg/action/printer.go index 704ea523d..7133e4d1b 100644 --- a/pkg/action/printer.go +++ b/pkg/action/printer.go @@ -21,7 +21,7 @@ import ( "io" "strings" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/release" ) // PrintRelease prints info about a release diff --git a/pkg/action/pull.go b/pkg/action/pull.go index 8a1dc535e..aaf63861e 100644 --- a/pkg/action/pull.go +++ b/pkg/action/pull.go @@ -25,11 +25,11 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/cli" - "helm.sh/helm/pkg/downloader" - "helm.sh/helm/pkg/getter" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/cli" + "helm.sh/helm/v3/pkg/downloader" + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/repo" ) // Pull is the action for checking a given release's information. diff --git a/pkg/action/release_testing.go b/pkg/action/release_testing.go index 1a6e5b8ba..40dddf061 100644 --- a/pkg/action/release_testing.go +++ b/pkg/action/release_testing.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/release" ) // ReleaseTesting is the action for testing a release. diff --git a/pkg/action/resource_policy.go b/pkg/action/resource_policy.go index 5a0244bcd..cfabdf7ba 100644 --- a/pkg/action/resource_policy.go +++ b/pkg/action/resource_policy.go @@ -19,7 +19,7 @@ package action import ( "strings" - "helm.sh/helm/pkg/releaseutil" + "helm.sh/helm/v3/pkg/releaseutil" ) // resourcePolicyAnno is the annotation name for a resource policy diff --git a/pkg/action/rollback.go b/pkg/action/rollback.go index fa3f9d4fc..3d1ecb295 100644 --- a/pkg/action/rollback.go +++ b/pkg/action/rollback.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/release" ) // Rollback is the action for rolling back to a given release. diff --git a/pkg/action/show.go b/pkg/action/show.go index 7221e93ab..3733b28fd 100644 --- a/pkg/action/show.go +++ b/pkg/action/show.go @@ -22,8 +22,8 @@ import ( "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" ) type ShowOutputFormat string diff --git a/pkg/action/status.go b/pkg/action/status.go index dea9c0351..5e873ddd8 100644 --- a/pkg/action/status.go +++ b/pkg/action/status.go @@ -17,7 +17,7 @@ limitations under the License. package action import ( - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/release" ) // Status is the action for checking the deployment status of releases. diff --git a/pkg/action/uninstall.go b/pkg/action/uninstall.go index 4d42403bd..22123ad82 100644 --- a/pkg/action/uninstall.go +++ b/pkg/action/uninstall.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/release" - "helm.sh/helm/pkg/releaseutil" + "helm.sh/helm/v3/pkg/release" + "helm.sh/helm/v3/pkg/releaseutil" ) // Uninstall is the action for uninstalling releases. diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go index 3d53ff99e..bce561cfc 100644 --- a/pkg/action/upgrade.go +++ b/pkg/action/upgrade.go @@ -26,11 +26,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/cli-runtime/pkg/resource" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/kube" - "helm.sh/helm/pkg/release" - "helm.sh/helm/pkg/releaseutil" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/kube" + "helm.sh/helm/v3/pkg/release" + "helm.sh/helm/v3/pkg/releaseutil" ) // Upgrade is the action for upgrading releases. diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go index 81004e907..f2d2224e6 100644 --- a/pkg/action/upgrade_test.go +++ b/pkg/action/upgrade_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - kubefake "helm.sh/helm/pkg/kube/fake" - "helm.sh/helm/pkg/release" + kubefake "helm.sh/helm/v3/pkg/kube/fake" + "helm.sh/helm/v3/pkg/release" ) func upgradeAction(t *testing.T) *Upgrade { diff --git a/pkg/action/validate.go b/pkg/action/validate.go index 56b0acdeb..526a4c7fc 100644 --- a/pkg/action/validate.go +++ b/pkg/action/validate.go @@ -23,7 +23,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/cli-runtime/pkg/resource" - "helm.sh/helm/pkg/kube" + "helm.sh/helm/v3/pkg/kube" ) func existingResourceConflict(resources kube.ResourceList) error { diff --git a/pkg/action/verify.go b/pkg/action/verify.go index e78d50a14..c66b14b47 100644 --- a/pkg/action/verify.go +++ b/pkg/action/verify.go @@ -17,7 +17,7 @@ limitations under the License. package action import ( - "helm.sh/helm/pkg/downloader" + "helm.sh/helm/v3/pkg/downloader" ) // Verify is the action for building a given chart's Verify tree. diff --git a/pkg/chart/loader/archive.go b/pkg/chart/loader/archive.go index a8dc3f17b..1418f7bd9 100644 --- a/pkg/chart/loader/archive.go +++ b/pkg/chart/loader/archive.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) // FileLoader loads a chart from a file diff --git a/pkg/chart/loader/directory.go b/pkg/chart/loader/directory.go index ddfc0d4c9..bfb632405 100644 --- a/pkg/chart/loader/directory.go +++ b/pkg/chart/loader/directory.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/internal/ignore" - "helm.sh/helm/internal/sympath" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/internal/ignore" + "helm.sh/helm/v3/internal/sympath" + "helm.sh/helm/v3/pkg/chart" ) // DirLoader loads a chart from a directory diff --git a/pkg/chart/loader/load.go b/pkg/chart/loader/load.go index ca9eadb32..04105f9ac 100644 --- a/pkg/chart/loader/load.go +++ b/pkg/chart/loader/load.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) // ChartLoader loads a chart. diff --git a/pkg/chart/loader/load_test.go b/pkg/chart/loader/load_test.go index 0503d4edd..59f49349a 100644 --- a/pkg/chart/loader/load_test.go +++ b/pkg/chart/loader/load_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) func TestLoadDir(t *testing.T) { diff --git a/pkg/chartutil/chartfile.go b/pkg/chartutil/chartfile.go index 802960d07..68176ed5d 100644 --- a/pkg/chartutil/chartfile.go +++ b/pkg/chartutil/chartfile.go @@ -24,7 +24,7 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) // LoadChartfile loads a Chart.yaml file into a *chart.Metadata. diff --git a/pkg/chartutil/chartfile_test.go b/pkg/chartutil/chartfile_test.go index 33d149501..9a6e608f6 100644 --- a/pkg/chartutil/chartfile_test.go +++ b/pkg/chartutil/chartfile_test.go @@ -19,7 +19,7 @@ package chartutil import ( "testing" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) const testfile = "testdata/chartfiletest.yaml" diff --git a/pkg/chartutil/coalesce.go b/pkg/chartutil/coalesce.go index ea05e0b5b..f18d520a4 100644 --- a/pkg/chartutil/coalesce.go +++ b/pkg/chartutil/coalesce.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) // CoalesceValues coalesces all of the values in a chart (and its subcharts). diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go index b7f3b1c56..023e3bb9a 100644 --- a/pkg/chartutil/create.go +++ b/pkg/chartutil/create.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" ) const ( diff --git a/pkg/chartutil/create_test.go b/pkg/chartutil/create_test.go index d6e6a498f..87205cab0 100644 --- a/pkg/chartutil/create_test.go +++ b/pkg/chartutil/create_test.go @@ -22,8 +22,8 @@ import ( "path/filepath" "testing" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" ) func TestCreate(t *testing.T) { diff --git a/pkg/chartutil/dependencies.go b/pkg/chartutil/dependencies.go index f52b61313..4b389dc22 100644 --- a/pkg/chartutil/dependencies.go +++ b/pkg/chartutil/dependencies.go @@ -19,7 +19,7 @@ import ( "log" "strings" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) // ProcessDependencies checks through this chart's dependencies, processing accordingly. diff --git a/pkg/chartutil/dependencies_test.go b/pkg/chartutil/dependencies_test.go index 679db2989..ecd632540 100644 --- a/pkg/chartutil/dependencies_test.go +++ b/pkg/chartutil/dependencies_test.go @@ -21,8 +21,8 @@ import ( "strconv" "testing" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" ) func loadChart(t *testing.T, path string) *chart.Chart { diff --git a/pkg/chartutil/doc.go b/pkg/chartutil/doc.go index db90c12fe..5dd9c7038 100644 --- a/pkg/chartutil/doc.go +++ b/pkg/chartutil/doc.go @@ -41,4 +41,4 @@ into a Chart. When creating charts in memory, use the 'helm.sh/helm/pkg/proto/chart' package directly. */ -package chartutil // import "helm.sh/helm/pkg/chartutil" +package chartutil // import "helm.sh/helm/v3/pkg/chartutil" diff --git a/pkg/chartutil/jsonschema.go b/pkg/chartutil/jsonschema.go index fe1aced7c..0848faaf2 100644 --- a/pkg/chartutil/jsonschema.go +++ b/pkg/chartutil/jsonschema.go @@ -25,7 +25,7 @@ import ( "github.com/xeipuuv/gojsonschema" "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) // ValidateAgainstSchema checks that values does not violate the structure laid out in schema diff --git a/pkg/chartutil/jsonschema_test.go b/pkg/chartutil/jsonschema_test.go index 2a8f48102..2677ee0ea 100644 --- a/pkg/chartutil/jsonschema_test.go +++ b/pkg/chartutil/jsonschema_test.go @@ -20,7 +20,7 @@ import ( "io/ioutil" "testing" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) func TestValidateAgainstSingleSchema(t *testing.T) { diff --git a/pkg/chartutil/save.go b/pkg/chartutil/save.go index 83d95cc5a..8cf4991e0 100644 --- a/pkg/chartutil/save.go +++ b/pkg/chartutil/save.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) var headerBytes = []byte("+aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=") diff --git a/pkg/chartutil/save_test.go b/pkg/chartutil/save_test.go index 54e7fef79..fb608e5cf 100644 --- a/pkg/chartutil/save_test.go +++ b/pkg/chartutil/save_test.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" ) func TestSave(t *testing.T) { diff --git a/pkg/chartutil/values.go b/pkg/chartutil/values.go index f71d982ae..fe9152857 100644 --- a/pkg/chartutil/values.go +++ b/pkg/chartutil/values.go @@ -26,7 +26,7 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) // GlobalKey is the name of the Values key that is used for storing global vars. diff --git a/pkg/chartutil/values_test.go b/pkg/chartutil/values_test.go index 732f6e6f4..00bcfefed 100644 --- a/pkg/chartutil/values_test.go +++ b/pkg/chartutil/values_test.go @@ -22,7 +22,7 @@ import ( "testing" "text/template" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) func TestReadValues(t *testing.T) { diff --git a/pkg/cli/environment.go b/pkg/cli/environment.go index f2483dd19..bbe3e964b 100644 --- a/pkg/cli/environment.go +++ b/pkg/cli/environment.go @@ -29,7 +29,7 @@ import ( "github.com/spf13/pflag" - "helm.sh/helm/pkg/helmpath" + "helm.sh/helm/v3/pkg/helmpath" ) // EnvSettings describes all of the environment settings. diff --git a/pkg/cli/values/options.go b/pkg/cli/values/options.go index 9eade297e..e6ad71767 100644 --- a/pkg/cli/values/options.go +++ b/pkg/cli/values/options.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/getter" - "helm.sh/helm/pkg/strvals" + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/strvals" ) type Options struct { diff --git a/pkg/downloader/chart_downloader.go b/pkg/downloader/chart_downloader.go index af061dab7..8e251bc89 100644 --- a/pkg/downloader/chart_downloader.go +++ b/pkg/downloader/chart_downloader.go @@ -26,11 +26,11 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/internal/urlutil" - "helm.sh/helm/pkg/getter" - "helm.sh/helm/pkg/helmpath" - "helm.sh/helm/pkg/provenance" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/internal/urlutil" + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/helmpath" + "helm.sh/helm/v3/pkg/provenance" + "helm.sh/helm/v3/pkg/repo" ) // VerificationStrategy describes a strategy for determining whether to verify a chart. diff --git a/pkg/downloader/chart_downloader_test.go b/pkg/downloader/chart_downloader_test.go index 26d19343f..80249e240 100644 --- a/pkg/downloader/chart_downloader_test.go +++ b/pkg/downloader/chart_downloader_test.go @@ -21,11 +21,11 @@ import ( "path/filepath" "testing" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/cli" - "helm.sh/helm/pkg/getter" - "helm.sh/helm/pkg/repo" - "helm.sh/helm/pkg/repo/repotest" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/cli" + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/repo" + "helm.sh/helm/v3/pkg/repo/repotest" ) const ( diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go index ef334f130..4b49a7911 100644 --- a/pkg/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -30,14 +30,14 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "helm.sh/helm/internal/resolver" - "helm.sh/helm/internal/urlutil" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/getter" - "helm.sh/helm/pkg/helmpath" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/internal/resolver" + "helm.sh/helm/v3/internal/urlutil" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/helmpath" + "helm.sh/helm/v3/pkg/repo" ) // Manager handles the lifecycle of fetching, resolving, and storing dependencies. diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go index ae1f2325a..06c62ecaa 100644 --- a/pkg/downloader/manager_test.go +++ b/pkg/downloader/manager_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) func TestVersionEquals(t *testing.T) { diff --git a/pkg/engine/doc.go b/pkg/engine/doc.go index fc96b7bd6..a68b6f7af 100644 --- a/pkg/engine/doc.go +++ b/pkg/engine/doc.go @@ -20,4 +20,4 @@ Tiller provides a simple interface for taking a Chart and rendering its template The 'engine' package implements this interface using Go's built-in 'text/template' package. */ -package engine // import "helm.sh/helm/pkg/engine" +package engine // import "helm.sh/helm/v3/pkg/engine" diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 6ff2df799..dae0b6be7 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -28,8 +28,8 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chartutil" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chartutil" ) // Engine is an implementation of 'cmd/tiller/environment'.Engine that uses Go templates. diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index d55f6ae3e..031527dd0 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -22,8 +22,8 @@ import ( "sync" "testing" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chartutil" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chartutil" ) func TestSortTemplates(t *testing.T) { diff --git a/pkg/engine/files.go b/pkg/engine/files.go index 6caf9ca86..3a6659d11 100644 --- a/pkg/engine/files.go +++ b/pkg/engine/files.go @@ -23,7 +23,7 @@ import ( "github.com/gobwas/glob" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) // files is a map of files in a chart that can be accessed from a template. diff --git a/pkg/getter/getter.go b/pkg/getter/getter.go index fcc90fd3a..e11dbfcae 100644 --- a/pkg/getter/getter.go +++ b/pkg/getter/getter.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/cli" + "helm.sh/helm/v3/pkg/cli" ) // options are generic parameters to be provided to the getter during instantiation. diff --git a/pkg/getter/getter_test.go b/pkg/getter/getter_test.go index 9b55f86ce..60eb4738e 100644 --- a/pkg/getter/getter_test.go +++ b/pkg/getter/getter_test.go @@ -18,7 +18,7 @@ package getter import ( "testing" - "helm.sh/helm/pkg/cli" + "helm.sh/helm/v3/pkg/cli" ) const pluginDir = "testdata/plugins" diff --git a/pkg/getter/httpgetter.go b/pkg/getter/httpgetter.go index 2e409c104..320013541 100644 --- a/pkg/getter/httpgetter.go +++ b/pkg/getter/httpgetter.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/internal/tlsutil" - "helm.sh/helm/internal/urlutil" - "helm.sh/helm/internal/version" + "helm.sh/helm/v3/internal/tlsutil" + "helm.sh/helm/v3/internal/urlutil" + "helm.sh/helm/v3/internal/version" ) // HTTPGetter is the efault HTTP(/S) backend handler diff --git a/pkg/getter/httpgetter_test.go b/pkg/getter/httpgetter_test.go index 3801aa89f..93bfd96b1 100644 --- a/pkg/getter/httpgetter_test.go +++ b/pkg/getter/httpgetter_test.go @@ -24,9 +24,9 @@ import ( "strings" "testing" - "helm.sh/helm/internal/test" - "helm.sh/helm/internal/version" - "helm.sh/helm/pkg/cli" + "helm.sh/helm/v3/internal/test" + "helm.sh/helm/v3/internal/version" + "helm.sh/helm/v3/pkg/cli" ) func TestHTTPGetter(t *testing.T) { diff --git a/pkg/getter/plugingetter.go b/pkg/getter/plugingetter.go index a56ba8bbc..0d13ade57 100644 --- a/pkg/getter/plugingetter.go +++ b/pkg/getter/plugingetter.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/cli" - "helm.sh/helm/pkg/plugin" + "helm.sh/helm/v3/pkg/cli" + "helm.sh/helm/v3/pkg/plugin" ) // collectPlugins scans for getter plugins. diff --git a/pkg/getter/plugingetter_test.go b/pkg/getter/plugingetter_test.go index ed09babb0..71563e169 100644 --- a/pkg/getter/plugingetter_test.go +++ b/pkg/getter/plugingetter_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "helm.sh/helm/pkg/cli" + "helm.sh/helm/v3/pkg/cli" ) func TestCollectPlugins(t *testing.T) { diff --git a/pkg/helmpath/home_unix_test.go b/pkg/helmpath/home_unix_test.go index 1b813f4c4..6a72152c4 100644 --- a/pkg/helmpath/home_unix_test.go +++ b/pkg/helmpath/home_unix_test.go @@ -20,7 +20,7 @@ import ( "runtime" "testing" - "helm.sh/helm/pkg/helmpath/xdg" + "helm.sh/helm/v3/pkg/helmpath/xdg" ) func TestHelmHome(t *testing.T) { diff --git a/pkg/helmpath/home_windows_test.go b/pkg/helmpath/home_windows_test.go index ff1dfd6e7..af74558a8 100644 --- a/pkg/helmpath/home_windows_test.go +++ b/pkg/helmpath/home_windows_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "helm.sh/helm/pkg/helmpath/xdg" + "helm.sh/helm/v3/pkg/helmpath/xdg" ) func TestHelmHome(t *testing.T) { diff --git a/pkg/helmpath/lazypath.go b/pkg/helmpath/lazypath.go index fea018b1e..5fecfc75f 100644 --- a/pkg/helmpath/lazypath.go +++ b/pkg/helmpath/lazypath.go @@ -16,7 +16,7 @@ import ( "os" "path/filepath" - "helm.sh/helm/pkg/helmpath/xdg" + "helm.sh/helm/v3/pkg/helmpath/xdg" ) // lazypath is an lazy-loaded path buffer for the XDG base directory specification. diff --git a/pkg/helmpath/lazypath_darwin_test.go b/pkg/helmpath/lazypath_darwin_test.go index ce5240c4e..9381a44e2 100644 --- a/pkg/helmpath/lazypath_darwin_test.go +++ b/pkg/helmpath/lazypath_darwin_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/client-go/util/homedir" - "helm.sh/helm/pkg/helmpath/xdg" + "helm.sh/helm/v3/pkg/helmpath/xdg" ) const ( diff --git a/pkg/helmpath/lazypath_unix_test.go b/pkg/helmpath/lazypath_unix_test.go index 34a1dfff5..96d66e7a5 100644 --- a/pkg/helmpath/lazypath_unix_test.go +++ b/pkg/helmpath/lazypath_unix_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/client-go/util/homedir" - "helm.sh/helm/pkg/helmpath/xdg" + "helm.sh/helm/v3/pkg/helmpath/xdg" ) const ( diff --git a/pkg/helmpath/lazypath_windows_test.go b/pkg/helmpath/lazypath_windows_test.go index c82430a27..d02a0a7f6 100644 --- a/pkg/helmpath/lazypath_windows_test.go +++ b/pkg/helmpath/lazypath_windows_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/client-go/util/homedir" - "helm.sh/helm/pkg/helmpath/xdg" + "helm.sh/helm/v3/pkg/helmpath/xdg" ) const ( diff --git a/pkg/kube/client.go b/pkg/kube/client.go index 9602529be..6f5ce44d2 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package kube // import "helm.sh/helm/pkg/kube" +package kube // import "helm.sh/helm/v3/pkg/kube" import ( "context" diff --git a/pkg/kube/config.go b/pkg/kube/config.go index 098aa7503..624c4a1f7 100644 --- a/pkg/kube/config.go +++ b/pkg/kube/config.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package kube // import "helm.sh/helm/pkg/kube" +package kube // import "helm.sh/helm/v3/pkg/kube" import "k8s.io/cli-runtime/pkg/genericclioptions" diff --git a/pkg/kube/converter.go b/pkg/kube/converter.go index d298ad623..a5a6ae1f7 100644 --- a/pkg/kube/converter.go +++ b/pkg/kube/converter.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package kube // import "helm.sh/helm/pkg/kube" +package kube // import "helm.sh/helm/v3/pkg/kube" import ( "k8s.io/apimachinery/pkg/api/meta" diff --git a/pkg/kube/factory.go b/pkg/kube/factory.go index 0ea544943..f47f9d9f6 100644 --- a/pkg/kube/factory.go +++ b/pkg/kube/factory.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package kube // import "helm.sh/helm/pkg/kube" +package kube // import "helm.sh/helm/v3/pkg/kube" import ( "k8s.io/cli-runtime/pkg/resource" diff --git a/pkg/kube/fake/fake.go b/pkg/kube/fake/fake.go index 478cc635a..938f43364 100644 --- a/pkg/kube/fake/fake.go +++ b/pkg/kube/fake/fake.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/cli-runtime/pkg/resource" - "helm.sh/helm/pkg/kube" + "helm.sh/helm/v3/pkg/kube" ) // FailingKubeClient implements KubeClient for testing purposes. It also has diff --git a/pkg/kube/fake/printer.go b/pkg/kube/fake/printer.go index 21c67a63c..4e8344171 100644 --- a/pkg/kube/fake/printer.go +++ b/pkg/kube/fake/printer.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/cli-runtime/pkg/resource" - "helm.sh/helm/pkg/kube" + "helm.sh/helm/v3/pkg/kube" ) // PrintingKubeClient implements KubeClient, but simply prints the reader to diff --git a/pkg/kube/resource.go b/pkg/kube/resource.go index b61c6d198..0f2d94f3a 100644 --- a/pkg/kube/resource.go +++ b/pkg/kube/resource.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package kube // import "helm.sh/helm/pkg/kube" +package kube // import "helm.sh/helm/v3/pkg/kube" import "k8s.io/cli-runtime/pkg/resource" diff --git a/pkg/kube/resource_test.go b/pkg/kube/resource_test.go index 8bf8b0bf5..2e13c3253 100644 --- a/pkg/kube/resource_test.go +++ b/pkg/kube/resource_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package kube // import "helm.sh/helm/pkg/kube" +package kube // import "helm.sh/helm/v3/pkg/kube" import ( "testing" diff --git a/pkg/kube/wait.go b/pkg/kube/wait.go index 4c4bb9ddc..ce0a2b3a3 100644 --- a/pkg/kube/wait.go +++ b/pkg/kube/wait.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package kube // import "helm.sh/helm/pkg/kube" +package kube // import "helm.sh/helm/v3/pkg/kube" import ( "fmt" diff --git a/pkg/lint/lint.go b/pkg/lint/lint.go index e4848e7af..d47951671 100644 --- a/pkg/lint/lint.go +++ b/pkg/lint/lint.go @@ -14,13 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -package lint // import "helm.sh/helm/pkg/lint" +package lint // import "helm.sh/helm/v3/pkg/lint" import ( "path/filepath" - "helm.sh/helm/pkg/lint/rules" - "helm.sh/helm/pkg/lint/support" + "helm.sh/helm/v3/pkg/lint/rules" + "helm.sh/helm/v3/pkg/lint/support" ) // All runs all of the available linters on the given base directory. diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go index 770bc2365..b770704c6 100644 --- a/pkg/lint/lint_test.go +++ b/pkg/lint/lint_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "helm.sh/helm/pkg/lint/support" + "helm.sh/helm/v3/pkg/lint/support" ) var values map[string]interface{} diff --git a/pkg/lint/rules/chartfile.go b/pkg/lint/rules/chartfile.go index f6b4827df..35bb81571 100644 --- a/pkg/lint/rules/chartfile.go +++ b/pkg/lint/rules/chartfile.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package rules // import "helm.sh/helm/pkg/lint/rules" +package rules // import "helm.sh/helm/v3/pkg/lint/rules" import ( "fmt" @@ -25,9 +25,9 @@ import ( "github.com/asaskevich/govalidator" "github.com/pkg/errors" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/lint/support" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/lint/support" ) // Chartfile runs a set of linter rules related to Chart.yaml file diff --git a/pkg/lint/rules/chartfile_test.go b/pkg/lint/rules/chartfile_test.go index 4f1694606..ff2a63583 100644 --- a/pkg/lint/rules/chartfile_test.go +++ b/pkg/lint/rules/chartfile_test.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/lint/support" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/lint/support" ) const ( diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go index 36230c4ee..dcbe5bc72 100644 --- a/pkg/lint/rules/template.go +++ b/pkg/lint/rules/template.go @@ -23,10 +23,10 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/chart/loader" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/engine" - "helm.sh/helm/pkg/lint/support" + "helm.sh/helm/v3/pkg/chart/loader" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/engine" + "helm.sh/helm/v3/pkg/lint/support" ) // Templates lints the templates in the Linter. diff --git a/pkg/lint/rules/template_test.go b/pkg/lint/rules/template_test.go index c31e695cb..5d6d6ac0c 100644 --- a/pkg/lint/rules/template_test.go +++ b/pkg/lint/rules/template_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "helm.sh/helm/pkg/lint/support" + "helm.sh/helm/v3/pkg/lint/support" ) const templateTestBasedir = "./testdata/albatross" diff --git a/pkg/lint/rules/values.go b/pkg/lint/rules/values.go index a0310e934..0f202f475 100644 --- a/pkg/lint/rules/values.go +++ b/pkg/lint/rules/values.go @@ -23,8 +23,8 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/lint/support" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/lint/support" ) // Values lints a chart's values.yaml file. diff --git a/pkg/lint/support/doc.go b/pkg/lint/support/doc.go index 4d2ea80af..b9a9d0918 100644 --- a/pkg/lint/support/doc.go +++ b/pkg/lint/support/doc.go @@ -19,4 +19,4 @@ limitations under the License. Linting is the process of testing charts for errors or warnings regarding formatting, compilation, or standards compliance. */ -package support // import "helm.sh/helm/pkg/lint/support" +package support // import "helm.sh/helm/v3/pkg/lint/support" diff --git a/pkg/plugin/cache/cache.go b/pkg/plugin/cache/cache.go index e5119439e..5f3345b63 100644 --- a/pkg/plugin/cache/cache.go +++ b/pkg/plugin/cache/cache.go @@ -14,7 +14,7 @@ limitations under the License. */ // Package cache provides a key generator for vcs urls. -package cache // import "helm.sh/helm/pkg/plugin/cache" +package cache // import "helm.sh/helm/v3/pkg/plugin/cache" import ( "net/url" diff --git a/pkg/plugin/hooks.go b/pkg/plugin/hooks.go index c2fc829dd..e3481515f 100644 --- a/pkg/plugin/hooks.go +++ b/pkg/plugin/hooks.go @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package plugin // import "helm.sh/helm/pkg/plugin" +package plugin // import "helm.sh/helm/v3/pkg/plugin" // Types of hooks const ( diff --git a/pkg/plugin/installer/base.go b/pkg/plugin/installer/base.go index 12ae8c58c..a8ec97416 100644 --- a/pkg/plugin/installer/base.go +++ b/pkg/plugin/installer/base.go @@ -13,13 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -package installer // import "helm.sh/helm/pkg/plugin/installer" +package installer // import "helm.sh/helm/v3/pkg/plugin/installer" import ( "os" "path/filepath" - "helm.sh/helm/pkg/helmpath" + "helm.sh/helm/v3/pkg/helmpath" ) type base struct { diff --git a/pkg/plugin/installer/doc.go b/pkg/plugin/installer/doc.go index e5f7c1e45..3e3b2ebeb 100644 --- a/pkg/plugin/installer/doc.go +++ b/pkg/plugin/installer/doc.go @@ -14,4 +14,4 @@ limitations under the License. */ // Package installer provides an interface for installing Helm plugins. -package installer // import "helm.sh/helm/pkg/plugin/installer" +package installer // import "helm.sh/helm/v3/pkg/plugin/installer" diff --git a/pkg/plugin/installer/http_installer.go b/pkg/plugin/installer/http_installer.go index 7bb0f34aa..bac495a40 100644 --- a/pkg/plugin/installer/http_installer.go +++ b/pkg/plugin/installer/http_installer.go @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package installer // import "helm.sh/helm/pkg/plugin/installer" +package installer // import "helm.sh/helm/v3/pkg/plugin/installer" import ( "archive/tar" @@ -27,10 +27,10 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/pkg/cli" - "helm.sh/helm/pkg/getter" - "helm.sh/helm/pkg/helmpath" - "helm.sh/helm/pkg/plugin/cache" + "helm.sh/helm/v3/pkg/cli" + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/helmpath" + "helm.sh/helm/v3/pkg/plugin/cache" ) // HTTPInstaller installs plugins from an archive served by a web server. diff --git a/pkg/plugin/installer/http_installer_test.go b/pkg/plugin/installer/http_installer_test.go index 10929a514..a8fa06d79 100644 --- a/pkg/plugin/installer/http_installer_test.go +++ b/pkg/plugin/installer/http_installer_test.go @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package installer // import "helm.sh/helm/pkg/plugin/installer" +package installer // import "helm.sh/helm/v3/pkg/plugin/installer" import ( "bytes" @@ -23,9 +23,9 @@ import ( "github.com/pkg/errors" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/getter" - "helm.sh/helm/pkg/helmpath" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/helmpath" ) var _ Installer = new(HTTPInstaller) diff --git a/pkg/plugin/installer/local_installer.go b/pkg/plugin/installer/local_installer.go index a3743d4da..662ef5b29 100644 --- a/pkg/plugin/installer/local_installer.go +++ b/pkg/plugin/installer/local_installer.go @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package installer // import "helm.sh/helm/pkg/plugin/installer" +package installer // import "helm.sh/helm/v3/pkg/plugin/installer" import ( "path/filepath" diff --git a/pkg/plugin/installer/local_installer_test.go b/pkg/plugin/installer/local_installer_test.go index c21e6afac..d11e44860 100644 --- a/pkg/plugin/installer/local_installer_test.go +++ b/pkg/plugin/installer/local_installer_test.go @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package installer // import "helm.sh/helm/pkg/plugin/installer" +package installer // import "helm.sh/helm/v3/pkg/plugin/installer" import ( "io/ioutil" @@ -21,7 +21,7 @@ import ( "path/filepath" "testing" - "helm.sh/helm/pkg/helmpath" + "helm.sh/helm/v3/pkg/helmpath" ) var _ Installer = new(LocalInstaller) diff --git a/pkg/plugin/installer/vcs_installer.go b/pkg/plugin/installer/vcs_installer.go index 77846af9c..21a65cd13 100644 --- a/pkg/plugin/installer/vcs_installer.go +++ b/pkg/plugin/installer/vcs_installer.go @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package installer // import "helm.sh/helm/pkg/plugin/installer" +package installer // import "helm.sh/helm/v3/pkg/plugin/installer" import ( "os" @@ -23,8 +23,8 @@ import ( "github.com/Masterminds/vcs" "github.com/pkg/errors" - "helm.sh/helm/pkg/helmpath" - "helm.sh/helm/pkg/plugin/cache" + "helm.sh/helm/v3/pkg/helmpath" + "helm.sh/helm/v3/pkg/plugin/cache" ) // VCSInstaller installs plugins from remote a repository. diff --git a/pkg/plugin/installer/vcs_installer_test.go b/pkg/plugin/installer/vcs_installer_test.go index f9ffa8ace..ce1ee609e 100644 --- a/pkg/plugin/installer/vcs_installer_test.go +++ b/pkg/plugin/installer/vcs_installer_test.go @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package installer // import "helm.sh/helm/pkg/plugin/installer" +package installer // import "helm.sh/helm/v3/pkg/plugin/installer" import ( "fmt" @@ -23,8 +23,8 @@ import ( "github.com/Masterminds/vcs" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/helmpath" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/helmpath" ) var _ Installer = new(VCSInstaller) diff --git a/pkg/plugin/plugin.go b/pkg/plugin/plugin.go index cfa665d21..2eb354fca 100644 --- a/pkg/plugin/plugin.go +++ b/pkg/plugin/plugin.go @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package plugin // import "helm.sh/helm/pkg/plugin" +package plugin // import "helm.sh/helm/v3/pkg/plugin" import ( "fmt" @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/cli" + "helm.sh/helm/v3/pkg/cli" ) const pluginFileName = "plugin.yaml" diff --git a/pkg/plugin/plugin_test.go b/pkg/plugin/plugin_test.go index dfe607cd6..f637eca28 100644 --- a/pkg/plugin/plugin_test.go +++ b/pkg/plugin/plugin_test.go @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package plugin // import "helm.sh/helm/pkg/plugin" +package plugin // import "helm.sh/helm/v3/pkg/plugin" import ( "os" @@ -22,7 +22,7 @@ import ( "runtime" "testing" - "helm.sh/helm/pkg/cli" + "helm.sh/helm/v3/pkg/cli" ) func checkCommand(p *Plugin, extraArgs []string, osStrCmp string, t *testing.T) { diff --git a/pkg/provenance/doc.go b/pkg/provenance/doc.go index 2a09c404e..3d2d0ea97 100644 --- a/pkg/provenance/doc.go +++ b/pkg/provenance/doc.go @@ -34,4 +34,4 @@ and using `gpg --verify`, `keybase pgp verify`, or similar: gpg: Signature made Mon Jul 25 17:23:44 2016 MDT using RSA key ID 1FC18762 gpg: Good signature from "Helm Testing (This key should only be used for testing. DO NOT TRUST.) " [ultimate] */ -package provenance // import "helm.sh/helm/pkg/provenance" +package provenance // import "helm.sh/helm/v3/pkg/provenance" diff --git a/pkg/provenance/sign.go b/pkg/provenance/sign.go index 6e828ff5d..6032eb063 100644 --- a/pkg/provenance/sign.go +++ b/pkg/provenance/sign.go @@ -31,8 +31,8 @@ import ( "golang.org/x/crypto/openpgp/packet" "sigs.k8s.io/yaml" - hapi "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" + hapi "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" ) var defaultPGPConfig = packet.Config{ diff --git a/pkg/release/mock.go b/pkg/release/mock.go index 32644a3cd..0ad18a8da 100644 --- a/pkg/release/mock.go +++ b/pkg/release/mock.go @@ -20,7 +20,7 @@ import ( "math/rand" "time" - "helm.sh/helm/pkg/chart" + "helm.sh/helm/v3/pkg/chart" ) // MockHookTemplate is the hook template used for all mock release objects. diff --git a/pkg/release/release.go b/pkg/release/release.go index 80813dd7b..a436998aa 100644 --- a/pkg/release/release.go +++ b/pkg/release/release.go @@ -15,7 +15,7 @@ limitations under the License. package release -import "helm.sh/helm/pkg/chart" +import "helm.sh/helm/v3/pkg/chart" // Release describes a deployment of a chart, together with the chart // and the variables used to deploy that chart. diff --git a/pkg/releaseutil/filter.go b/pkg/releaseutil/filter.go index 5bc1d810e..dbd0df8e2 100644 --- a/pkg/releaseutil/filter.go +++ b/pkg/releaseutil/filter.go @@ -14,9 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -package releaseutil // import "helm.sh/helm/pkg/releaseutil" +package releaseutil // import "helm.sh/helm/v3/pkg/releaseutil" -import rspb "helm.sh/helm/pkg/release" +import rspb "helm.sh/helm/v3/pkg/release" // FilterFunc returns true if the release object satisfies // the predicate of the underlying filter func. diff --git a/pkg/releaseutil/filter_test.go b/pkg/releaseutil/filter_test.go index a4f241d9a..31ac306f6 100644 --- a/pkg/releaseutil/filter_test.go +++ b/pkg/releaseutil/filter_test.go @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -package releaseutil // import "helm.sh/helm/pkg/releaseutil" +package releaseutil // import "helm.sh/helm/v3/pkg/releaseutil" import ( "testing" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) func TestFilterAny(t *testing.T) { diff --git a/pkg/releaseutil/manifest_sorter.go b/pkg/releaseutil/manifest_sorter.go index 3e91189e4..68ba1bf5e 100644 --- a/pkg/releaseutil/manifest_sorter.go +++ b/pkg/releaseutil/manifest_sorter.go @@ -25,8 +25,8 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/release" ) // Manifest represents a manifest file, which has a name and some content. diff --git a/pkg/releaseutil/manifest_sorter_test.go b/pkg/releaseutil/manifest_sorter_test.go index a82a1941e..0d2d6660a 100644 --- a/pkg/releaseutil/manifest_sorter_test.go +++ b/pkg/releaseutil/manifest_sorter_test.go @@ -22,8 +22,8 @@ import ( "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/chartutil" - "helm.sh/helm/pkg/release" + "helm.sh/helm/v3/pkg/chartutil" + "helm.sh/helm/v3/pkg/release" ) func TestSortManifests(t *testing.T) { diff --git a/pkg/releaseutil/manifest_test.go b/pkg/releaseutil/manifest_test.go index b667f796f..8664d20ef 100644 --- a/pkg/releaseutil/manifest_test.go +++ b/pkg/releaseutil/manifest_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package releaseutil // import "helm.sh/helm/pkg/releaseutil" +package releaseutil // import "helm.sh/helm/v3/pkg/releaseutil" import ( "reflect" diff --git a/pkg/releaseutil/sorter.go b/pkg/releaseutil/sorter.go index f500aeea3..1a8aa78a6 100644 --- a/pkg/releaseutil/sorter.go +++ b/pkg/releaseutil/sorter.go @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -package releaseutil // import "helm.sh/helm/pkg/releaseutil" +package releaseutil // import "helm.sh/helm/v3/pkg/releaseutil" import ( "sort" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) type list []*rspb.Release diff --git a/pkg/releaseutil/sorter_test.go b/pkg/releaseutil/sorter_test.go index f7225d6d3..d8b455124 100644 --- a/pkg/releaseutil/sorter_test.go +++ b/pkg/releaseutil/sorter_test.go @@ -14,13 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -package releaseutil // import "helm.sh/helm/pkg/releaseutil" +package releaseutil // import "helm.sh/helm/v3/pkg/releaseutil" import ( "testing" "time" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) // note: this test data is shared with filter_test.go. diff --git a/pkg/repo/chartrepo.go b/pkg/repo/chartrepo.go index 1ce869580..a88f68527 100644 --- a/pkg/repo/chartrepo.go +++ b/pkg/repo/chartrepo.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package repo // import "helm.sh/helm/pkg/repo" +package repo // import "helm.sh/helm/v3/pkg/repo" import ( "crypto/rand" @@ -29,10 +29,10 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/chart/loader" - "helm.sh/helm/pkg/getter" - "helm.sh/helm/pkg/helmpath" - "helm.sh/helm/pkg/provenance" + "helm.sh/helm/v3/pkg/chart/loader" + "helm.sh/helm/v3/pkg/getter" + "helm.sh/helm/v3/pkg/helmpath" + "helm.sh/helm/v3/pkg/provenance" ) // Entry represents a collection of parameters for chart repository diff --git a/pkg/repo/chartrepo_test.go b/pkg/repo/chartrepo_test.go index d840f963f..9f4273682 100644 --- a/pkg/repo/chartrepo_test.go +++ b/pkg/repo/chartrepo_test.go @@ -30,10 +30,10 @@ import ( "sigs.k8s.io/yaml" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/cli" - "helm.sh/helm/pkg/getter" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/cli" + "helm.sh/helm/v3/pkg/getter" ) const ( diff --git a/pkg/repo/index.go b/pkg/repo/index.go index 8a62a8686..8e8f56d47 100644 --- a/pkg/repo/index.go +++ b/pkg/repo/index.go @@ -31,10 +31,10 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" - "helm.sh/helm/internal/urlutil" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/chart/loader" - "helm.sh/helm/pkg/provenance" + "helm.sh/helm/v3/internal/urlutil" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/chart/loader" + "helm.sh/helm/v3/pkg/provenance" ) var indexPath = "index.yaml" diff --git a/pkg/repo/index_test.go b/pkg/repo/index_test.go index c33f257ea..f5203646c 100644 --- a/pkg/repo/index_test.go +++ b/pkg/repo/index_test.go @@ -21,9 +21,9 @@ import ( "os" "testing" - "helm.sh/helm/pkg/chart" - "helm.sh/helm/pkg/cli" - "helm.sh/helm/pkg/getter" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/cli" + "helm.sh/helm/v3/pkg/getter" ) const ( diff --git a/pkg/repo/repo.go b/pkg/repo/repo.go index d6bfc75e7..b73efdd9b 100644 --- a/pkg/repo/repo.go +++ b/pkg/repo/repo.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package repo // import "helm.sh/helm/pkg/repo" +package repo // import "helm.sh/helm/v3/pkg/repo" import ( "io/ioutil" diff --git a/pkg/repo/repotest/server.go b/pkg/repo/repotest/server.go index b344b336e..96a8bbfcc 100644 --- a/pkg/repo/repotest/server.go +++ b/pkg/repo/repotest/server.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/yaml" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/pkg/repo" ) // NewTempServer creates a server inside of a temp dir. diff --git a/pkg/repo/repotest/server_test.go b/pkg/repo/repotest/server_test.go index 77a7855b9..ee62791af 100644 --- a/pkg/repo/repotest/server_test.go +++ b/pkg/repo/repotest/server_test.go @@ -23,8 +23,8 @@ import ( "sigs.k8s.io/yaml" - "helm.sh/helm/internal/test/ensure" - "helm.sh/helm/pkg/repo" + "helm.sh/helm/v3/internal/test/ensure" + "helm.sh/helm/v3/pkg/repo" ) // Young'n, in these here parts, we test our tests. diff --git a/pkg/storage/driver/cfgmaps.go b/pkg/storage/driver/cfgmaps.go index 0888cd9f1..1b630f407 100644 --- a/pkg/storage/driver/cfgmaps.go +++ b/pkg/storage/driver/cfgmaps.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package driver // import "helm.sh/helm/pkg/storage/driver" +package driver // import "helm.sh/helm/v3/pkg/storage/driver" import ( "strconv" @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) var _ Driver = (*ConfigMaps)(nil) diff --git a/pkg/storage/driver/cfgmaps_test.go b/pkg/storage/driver/cfgmaps_test.go index 961b68f3b..6efd790ce 100644 --- a/pkg/storage/driver/cfgmaps_test.go +++ b/pkg/storage/driver/cfgmaps_test.go @@ -21,7 +21,7 @@ import ( v1 "k8s.io/api/core/v1" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) func TestConfigMapName(t *testing.T) { diff --git a/pkg/storage/driver/driver.go b/pkg/storage/driver/driver.go index b562376d2..9a1fbc579 100644 --- a/pkg/storage/driver/driver.go +++ b/pkg/storage/driver/driver.go @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -package driver // import "helm.sh/helm/pkg/storage/driver" +package driver // import "helm.sh/helm/v3/pkg/storage/driver" import ( "github.com/pkg/errors" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) var ( diff --git a/pkg/storage/driver/labels_test.go b/pkg/storage/driver/labels_test.go index fd17faef5..bfd80911b 100644 --- a/pkg/storage/driver/labels_test.go +++ b/pkg/storage/driver/labels_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package driver // import "helm.sh/helm/pkg/storage/driver" +package driver // import "helm.sh/helm/v3/pkg/storage/driver" import ( "testing" diff --git a/pkg/storage/driver/memory.go b/pkg/storage/driver/memory.go index 5d91767a2..ca8756c0c 100644 --- a/pkg/storage/driver/memory.go +++ b/pkg/storage/driver/memory.go @@ -21,7 +21,7 @@ import ( "strings" "sync" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) var _ Driver = (*Memory)(nil) diff --git a/pkg/storage/driver/memory_test.go b/pkg/storage/driver/memory_test.go index e05a196b0..c74df9432 100644 --- a/pkg/storage/driver/memory_test.go +++ b/pkg/storage/driver/memory_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) func TestMemoryName(t *testing.T) { diff --git a/pkg/storage/driver/mock_test.go b/pkg/storage/driver/mock_test.go index 10eb6d3fe..4c9b4ef9c 100644 --- a/pkg/storage/driver/mock_test.go +++ b/pkg/storage/driver/mock_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package driver // import "helm.sh/helm/pkg/storage/driver" +package driver // import "helm.sh/helm/v3/pkg/storage/driver" import ( "fmt" @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) func releaseStub(name string, vers int, namespace string, status rspb.Status) *rspb.Release { diff --git a/pkg/storage/driver/records.go b/pkg/storage/driver/records.go index ee05f6676..9df173384 100644 --- a/pkg/storage/driver/records.go +++ b/pkg/storage/driver/records.go @@ -14,13 +14,13 @@ See the License for the specific language governing permissions and limitations under the License. */ -package driver // import "helm.sh/helm/pkg/storage/driver" +package driver // import "helm.sh/helm/v3/pkg/storage/driver" import ( "sort" "strconv" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) // records holds a list of in-memory release records diff --git a/pkg/storage/driver/records_test.go b/pkg/storage/driver/records_test.go index bb325ef68..79b60044f 100644 --- a/pkg/storage/driver/records_test.go +++ b/pkg/storage/driver/records_test.go @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -package driver // import "helm.sh/helm/pkg/storage/driver" +package driver // import "helm.sh/helm/v3/pkg/storage/driver" import ( "testing" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) func TestRecordsAdd(t *testing.T) { diff --git a/pkg/storage/driver/secrets.go b/pkg/storage/driver/secrets.go index edd1cca0d..eea285be1 100644 --- a/pkg/storage/driver/secrets.go +++ b/pkg/storage/driver/secrets.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package driver // import "helm.sh/helm/pkg/storage/driver" +package driver // import "helm.sh/helm/v3/pkg/storage/driver" import ( "strconv" @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) var _ Driver = (*Secrets)(nil) diff --git a/pkg/storage/driver/secrets_test.go b/pkg/storage/driver/secrets_test.go index fdcd40d1f..892482e5b 100644 --- a/pkg/storage/driver/secrets_test.go +++ b/pkg/storage/driver/secrets_test.go @@ -21,7 +21,7 @@ import ( v1 "k8s.io/api/core/v1" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) func TestSecretName(t *testing.T) { diff --git a/pkg/storage/driver/util.go b/pkg/storage/driver/util.go index 5846c60f2..6cde74cd3 100644 --- a/pkg/storage/driver/util.go +++ b/pkg/storage/driver/util.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package driver // import "helm.sh/helm/pkg/storage/driver" +package driver // import "helm.sh/helm/v3/pkg/storage/driver" import ( "bytes" @@ -23,7 +23,7 @@ import ( "encoding/json" "io/ioutil" - rspb "helm.sh/helm/pkg/release" + rspb "helm.sh/helm/v3/pkg/release" ) var b64 = base64.StdEncoding diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index e676ac474..58a7eb06f 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package storage // import "helm.sh/helm/pkg/storage" +package storage // import "helm.sh/helm/v3/pkg/storage" import ( "fmt" @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" - rspb "helm.sh/helm/pkg/release" - relutil "helm.sh/helm/pkg/releaseutil" - "helm.sh/helm/pkg/storage/driver" + rspb "helm.sh/helm/v3/pkg/release" + relutil "helm.sh/helm/v3/pkg/releaseutil" + "helm.sh/helm/v3/pkg/storage/driver" ) // The type field of the Kubernetes storage object which stores the Helm release diff --git a/pkg/storage/storage_test.go b/pkg/storage/storage_test.go index 25572ae96..b8c333d24 100644 --- a/pkg/storage/storage_test.go +++ b/pkg/storage/storage_test.go @@ -14,15 +14,15 @@ See the License for the specific language governing permissions and limitations under the License. */ -package storage // import "helm.sh/helm/pkg/storage" +package storage // import "helm.sh/helm/v3/pkg/storage" import ( "fmt" "reflect" "testing" - rspb "helm.sh/helm/pkg/release" - "helm.sh/helm/pkg/storage/driver" + rspb "helm.sh/helm/v3/pkg/release" + "helm.sh/helm/v3/pkg/storage/driver" ) func TestStorageCreate(t *testing.T) {