Merge pull request #3945 from adamreese/dev-v3-dep

feat(dep): replace glide with dep
7 years ago · d6afa4a403
parent 1a508ccdd1 840c489c6b
commit d6afa4a403
11 changed files with 1147 additions and 903 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -4,27 +4,35 @@ jobs:
    working_directory: /go/src/k8s.io/helm
    parallelism: 3
    docker:
-      - image: golang:1.10
+      - image: circleci/golang:1.10.0
    environment:
-      PROJECT_NAME: "kubernetes-helm"
+      - PROJECT_NAME: "kubernetes-helm"
+      - GOCACHE: "/tmp/go/cache"
    steps:
      - checkout
-      - setup_remote_docker:
-          version: 17.09.0-ce
      - restore_cache:
-          keys:
-            - glide-{{ checksum "glide.yaml" }}-{{ checksum "glide.lock" }}
-            - glide- # used as a fall through if the checksum fails to find exact entry
+          key: gopkg-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
+          paths:
+              - /go/src/k8s.io/helm/vendor
      - run:
          name: install dependencies
          command: .circleci/bootstrap.sh
      - save_cache:
-          key: glide-{{ checksum "glide.yaml" }}-{{ checksum "glide.lock" }}
+          key: gopkg-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
          paths:
-            - /root/.glide  # Where the glide cache is stored
+              - /go/src/k8s.io/helm/vendor
+      - restore_cache:
+          keys:
+              - build-cache-{{ .Branch }}-{{ .Environment.CIRCLE_PREVIOUS_BUILD_NUM }}
+          paths:
+              - /tmp/go/cache
      - run:
          name: test
          command: .circleci/test.sh
+      - save_cache:
+          key: build-cache-{{ .Branch }}-{{ .Environment.CIRCLE_BUILD_NUM }}
+          paths:
+              - /tmp/go/cache
      - deploy:
          name: deploy
          command: .circleci/deploy.sh
--- a/.circleci/deploy.sh
+++ b/.circleci/deploy.sh
@ -33,12 +33,6 @@ else
  exit
 fi

-echo "Install docker client"
-VER="17.09.0-ce"
-curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz
-tar -xz -C /tmp -f /tmp/docker-$VER.tgz
-mv /tmp/docker/* /usr/bin
-
 echo "Install gcloud components"
 export CLOUDSDK_CORE_DISABLE_PROMPTS=1
 curl https://sdk.cloud.google.com | bash
@ -48,13 +42,6 @@ echo "Configuring gcloud authentication"
 echo "${GCLOUD_SERVICE_KEY}" | base64 --decode > "${HOME}/gcloud-service-key.json"
 ${HOME}/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file "${HOME}/gcloud-service-key.json"
 ${HOME}/google-cloud-sdk/bin/gcloud config set project "${PROJECT_NAME}"
-docker login -u _json_key -p "$(cat ${HOME}/gcloud-service-key.json)" https://gcr.io
-
-echo "Building the tiller image"
-make docker-build VERSION="${VERSION}"
-
-echo "Pushing image to gcr.io"
-docker push "gcr.io/kubernetes-helm/tiller:${VERSION}"

 echo "Building helm binaries"
 make build-cross
--- a/.circleci/test.sh
+++ b/.circleci/test.sh
@ -22,6 +22,8 @@ IFS=$'\n\t'
 HELM_ROOT="${BASH_SOURCE[0]%/*}/.."
 cd "$HELM_ROOT"

+mkdir -p "${GOCACHE:-/tmp/go/cache}"
+
 run_unit_test() {
  if [[ "${CIRCLE_BRANCH-}" == "master" ]]; then
    echo "Running unit tests with coverage'"
--- a/Gopkg.lock
+++ b/Gopkg.lock
--- a/Gopkg.toml
+++ b/Gopkg.toml
@ -0,0 +1,52 @@
+
+[[constraint]]
+  name = "github.com/BurntSushi/toml"
+  version = "0.3.0"
+
+[[constraint]]
+  name = "github.com/Masterminds/semver"
+  version = "~1.3.1"
+
+[[constraint]]
+  name = "github.com/Masterminds/sprig"
+  version = "2.14.1"
+
+[[constraint]]
+  name = "github.com/Masterminds/vcs"
+  version = "~1.11.0"
+
+[[constraint]]
+  name = "github.com/asaskevich/govalidator"
+  version = "4.0.0"
+
+[[constraint]]
+  name = "github.com/gobwas/glob"
+  version = "0.2.1"
+
+[[constraint]]
+  name = "github.com/gosuri/uitable"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/technosophos/moniker"
+  branch = "master"
+
+[[constraint]]
+  name = "k8s.io/api"
+  branch = "release-1.10"
+
+[[constraint]]
+  name = "k8s.io/apimachinery"
+  branch = "release-1.10"
+
+[[constraint]]
+  version = "kubernetes-1.10.0"
+  name = "k8s.io/client-go"
+
+[[constraint]]
+  name = "k8s.io/kubernetes"
+  branch = "release-1.10"
+
+[prune]
+  go-tests = true
+  unused-packages = true
--- a/8
+++ b/8
@ -97,7 +97,7 @@ clean:
 coverage:
 	@scripts/coverage.sh

-HAS_GLIDE := $(shell command -v glide;)
+HAS_DEP := $(shell command -v dep;)
 HAS_GOX := $(shell command -v gox;)
 HAS_GIT := $(shell command -v git;)

@ -106,13 +106,13 @@ bootstrap:
 ifndef HAS_GIT
 	$(error You must install Git)
 endif
-ifndef HAS_GLIDE
-	go get -u github.com/Masterminds/glide
+ifndef HAS_DEP
+	go get -u github.com/golang/dep/cmd/dep
 endif
 ifndef HAS_GOX
 	go get -u github.com/mitchellh/gox
 endif
-	glide install --strip-vendor
+	dep ensure -vendor-only

 .PHONY: info
 info:
--- a/docs/developers.md
+++ b/docs/developers.md
@ -6,7 +6,7 @@ Helm and Tiller.
 ## Prerequisites

 - The latest version of Go
- The latest version of Glide
+- The latest version of Dep
 - A Kubernetes cluster w/ kubectl (optional)
 - The gRPC toolchain
 - Git
@ -149,7 +149,7 @@ The code for the Helm project is organized as follows:
 - The `docs/` folder is used for documentation and examples.

 Go dependencies are managed with
-[Glide](https://github.com/Masterminds/glide) and stored in the
+[Dep](https://github.com/golang/dep) and stored in the
 `vendor/` directory.

 ### Git Conventions
--- a/docs/install.md
+++ b/docs/install.md
@ -81,7 +81,7 @@ Building Helm from source is slightly more work, but is the best way to
 go if you want to test the latest (pre-release) Helm version.

 You must have a working Go environment with
-[glide](https://github.com/Masterminds/glide) installed.
+[dep](https://github.com/golang/dep) installed.

 ```console
 $ cd $GOPATH
--- a/glide.lock
+++ b/glide.lock
@ -1,822 +0,0 @@
-hash: f61bc9a14aff4543b59b89891e4ad0ae787a0ce0e6d775d02b8964e857d41aad
-updated: 2018-04-18T23:27:56.45176431Z
-imports:
- name: cloud.google.com/go
-  version: 3b1ae45394a234c385be014e9a488f2bb6eef821
-  subpackages:
-  - compute/metadata
-  - internal
- name: github.com/aokoli/goutils
-  version: 9c37978a95bd5c709a15883b6242714ea6709e64
- name: github.com/asaskevich/govalidator
-  version: 7664702784775e51966f0885f5cd27435916517b
- name: github.com/Azure/go-ansiterm
-  version: 19f72df4d05d31cbe1c56bfc8045c96babff6c7e
-  subpackages:
-  - winterm
- name: github.com/Azure/go-autorest
-  version: d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab
-  subpackages:
-  - autorest
-  - autorest/adal
-  - autorest/azure
-  - autorest/date
- name: github.com/beorn7/perks
-  version: 3ac7bf7a47d159a033b107610db8a1b6575507a4
-  subpackages:
-  - quantile
- name: github.com/BurntSushi/toml
-  version: b26d9c308763d68093482582cea63d69be07a0f0
- name: github.com/cpuguy83/go-md2man
-  version: 71acacd42f85e5e82f70a55327789582a5200a90
-  subpackages:
-  - md2man
- name: github.com/davecgh/go-spew
-  version: 782f4967f2dc4564575ca782fe2d04090b5faca8
-  subpackages:
-  - spew
- name: github.com/dgrijalva/jwt-go
-  version: 01aeca54ebda6e0fbfafd0a524d234159c05ec20
- name: github.com/docker/distribution
-  version: edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c
-  subpackages:
-  - digestset
-  - reference
- name: github.com/docker/docker
-  version: 4f3616fb1c112e206b88cb7a9922bf49067a7756
-  subpackages:
-  - api
-  - api/types
-  - api/types/blkiodev
-  - api/types/container
-  - api/types/events
-  - api/types/filters
-  - api/types/image
-  - api/types/mount
-  - api/types/network
-  - api/types/registry
-  - api/types/strslice
-  - api/types/swarm
-  - api/types/swarm/runtime
-  - api/types/time
-  - api/types/versions
-  - api/types/volume
-  - client
-  - pkg/ioutils
-  - pkg/jsonlog
-  - pkg/jsonmessage
-  - pkg/longpath
-  - pkg/mount
-  - pkg/parsers
-  - pkg/stdcopy
-  - pkg/sysinfo
-  - pkg/system
-  - pkg/term
-  - pkg/term/windows
-  - pkg/tlsconfig
- name: github.com/docker/go-connections
-  version: 3ede32e2033de7505e6500d6c868c2b9ed9f169d
-  subpackages:
-  - nat
-  - sockets
-  - tlsconfig
- name: github.com/docker/go-units
-  version: 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1
- name: github.com/docker/spdystream
-  version: 449fdfce4d962303d702fec724ef0ad181c92528
-  subpackages:
-  - spdy
- name: github.com/evanphx/json-patch
-  version: 944e07253867aacae43c04b2e6a239005443f33a
- name: github.com/exponent-io/jsonpath
-  version: d6023ce2651d8eafb5c75bb0c7167536102ec9f5
- name: github.com/fatih/camelcase
-  version: f6a740d52f961c60348ebb109adde9f4635d7540
- name: github.com/ghodss/yaml
-  version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee
- name: github.com/go-openapi/jsonpointer
-  version: 46af16f9f7b149af66e5d1bd010e3574dc06de98
- name: github.com/go-openapi/jsonreference
-  version: 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272
- name: github.com/go-openapi/spec
-  version: 1de3e0542de65ad8d75452a595886fdd0befb363
- name: github.com/go-openapi/swag
-  version: f3f9494671f93fcff853e3c6e9e948b3eb71e590
- name: github.com/gobwas/glob
-  version: 5ccd90ef52e1e632236f7326478d4faa74f99438
-  subpackages:
-  - compiler
-  - match
-  - syntax
-  - syntax/ast
-  - syntax/lexer
-  - util/runes
-  - util/strings
- name: github.com/gogo/protobuf
-  version: c0656edd0d9eab7c66d1eb0c568f9039345796f7
-  subpackages:
-  - proto
-  - sortkeys
- name: github.com/golang/glog
-  version: 44145f04b68cf362d9c4df2182967c2275eaefed
- name: github.com/golang/groupcache
-  version: 02826c3e79038b59d737d3b1c0a1d937f71a4433
-  subpackages:
-  - lru
- name: github.com/golang/protobuf
-  version: 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9
-  subpackages:
-  - proto
-  - ptypes
-  - ptypes/any
-  - ptypes/duration
-  - ptypes/timestamp
- name: github.com/google/btree
-  version: 7d79101e329e5a3adf994758c578dab82b90c017
- name: github.com/google/gofuzz
-  version: 44d81051d367757e1c7c6a5a86423ece9afcf63c
- name: github.com/google/uuid
-  version: 064e2069ce9c359c118179501254f67d7d37ba24
- name: github.com/googleapis/gnostic
-  version: 0c5108395e2debce0d731cf0287ddf7242066aba
-  subpackages:
-  - OpenAPIv2
-  - compiler
-  - extensions
- name: github.com/gophercloud/gophercloud
-  version: 6da026c32e2d622cc242d32984259c77237aefe1
-  subpackages:
-  - openstack
-  - openstack/identity/v2/tenants
-  - openstack/identity/v2/tokens
-  - openstack/identity/v3/tokens
-  - openstack/utils
-  - pagination
- name: github.com/gosuri/uitable
-  version: 36ee7e946282a3fb1cfecd476ddc9b35d8847e42
-  subpackages:
-  - util/strutil
-  - util/wordwrap
- name: github.com/gregjones/httpcache
-  version: 787624de3eb7bd915c329cba748687a3b22666a6
-  subpackages:
-  - diskcache
- name: github.com/hashicorp/golang-lru
-  version: a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
-  subpackages:
-  - simplelru
- name: github.com/howeyc/gopass
-  version: bf9dde6d0d2c004a008c27aaee91170c786f6db8
- name: github.com/huandu/xstrings
-  version: 3959339b333561bf62a38b424fd41517c2c90f40
- name: github.com/imdario/mergo
-  version: 6633656539c1639d9d78127b7d47c622b5d7b6dc
- name: github.com/inconshreveable/mousetrap
-  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
- name: github.com/json-iterator/go
-  version: 13f86432b882000a51c6e610c620974462691a97
- name: github.com/mailru/easyjson
-  version: 2f5df55504ebc322e4d52d34df6a1f5b503bf26d
-  subpackages:
-  - buffer
-  - jlexer
-  - jwriter
- name: github.com/MakeNowJust/heredoc
-  version: bb23615498cded5e105af4ce27de75b089cbe851
- name: github.com/Masterminds/semver
-  version: 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd
- name: github.com/Masterminds/sprig
-  version: 6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c
- name: github.com/Masterminds/vcs
-  version: 3084677c2c188840777bff30054f2b553729d329
- name: github.com/mattn/go-runewidth
-  version: d6bea18f789704b5f83375793155289da36a3c7f
- name: github.com/matttproud/golang_protobuf_extensions
-  version: fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a
-  subpackages:
-  - pbutil
- name: github.com/mitchellh/go-wordwrap
-  version: ad45545899c7b13c020ea92b2072220eefad42b8
- name: github.com/opencontainers/go-digest
-  version: a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb
- name: github.com/opencontainers/image-spec
-  version: 372ad780f63454fbbbbcc7cf80e5b90245c13e13
-  subpackages:
-  - specs-go
-  - specs-go/v1
- name: github.com/pborman/uuid
-  version: ca53cad383cad2479bbba7f7a1a05797ec1386e4
- name: github.com/peterbourgon/diskv
-  version: 5f041e8faa004a95c88a202771f4cc3e991971e6
- name: github.com/prometheus/client_golang
-  version: e7e903064f5e9eb5da98208bae10b475d4db0f8c
-  subpackages:
-  - prometheus
-  - prometheus/promhttp
- name: github.com/prometheus/client_model
-  version: fa8ad6fec33561be4280a8f0514318c79d7f6cb6
-  subpackages:
-  - go
- name: github.com/prometheus/common
-  version: 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207
-  subpackages:
-  - expfmt
-  - internal/bitbucket.org/ww/goautoneg
-  - model
- name: github.com/prometheus/procfs
-  version: 65c1f6f8f0fc1e2185eb9863a3bc751496404259
-  subpackages:
-  - xfs
- name: github.com/PuerkitoBio/purell
-  version: 8a290539e2e8629dbc4e6bad948158f790ec31f4
- name: github.com/PuerkitoBio/urlesc
-  version: 5bd2802263f21d8788851d5305584c82a5c75d7e
- name: github.com/russross/blackfriday
-  version: 300106c228d52c8941d4b3de6054a6062a86dda3
- name: github.com/shurcooL/sanitized_anchor_name
-  version: 10ef21a441db47d8b13ebcc5fd2310f636973c77
- name: github.com/sirupsen/logrus
-  version: 89742aefa4b206dcf400792f3bd35b542998eb3b
- name: github.com/spf13/cobra
-  version: f62e98d28ab7ad31d707ba837a966378465c7b57
-  subpackages:
-  - doc
- name: github.com/spf13/pflag
-  version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7
- name: github.com/technosophos/moniker
-  version: ab470f5e105a44d0c87ea21bacd6a335c4816d83
- name: golang.org/x/crypto
-  version: 81e90905daefcd6fd217b62423c0908922eadb30
-  subpackages:
-  - cast5
-  - ed25519
-  - ed25519/internal/edwards25519
-  - openpgp
-  - openpgp/armor
-  - openpgp/clearsign
-  - openpgp/elgamal
-  - openpgp/errors
-  - openpgp/packet
-  - openpgp/s2k
-  - pbkdf2
-  - scrypt
-  - ssh/terminal
- name: golang.org/x/net
-  version: 1c05540f6879653db88113bc4a2b70aec4bd491f
-  subpackages:
-  - context
-  - context/ctxhttp
-  - http2
-  - http2/hpack
-  - idna
-  - lex/httplex
- name: golang.org/x/oauth2
-  version: a6bd8cefa1811bd24b86f8902872e4e8225f74c4
-  subpackages:
-  - google
-  - internal
-  - jws
-  - jwt
- name: golang.org/x/sys
-  version: 43eea11bc92608addb41b8a406b0407495c106f6
-  subpackages:
-  - unix
-  - windows
- name: golang.org/x/text
-  version: b19bf474d317b857955b12035d2c5acb57ce8b01
-  subpackages:
-  - cases
-  - encoding
-  - encoding/internal
-  - encoding/internal/identifier
-  - encoding/unicode
-  - internal
-  - internal/tag
-  - internal/utf8internal
-  - language
-  - runes
-  - secure/bidirule
-  - secure/precis
-  - transform
-  - unicode/bidi
-  - unicode/norm
-  - width
- name: golang.org/x/time
-  version: f51c12702a4d776e4c1fa9b0fabab841babae631
-  subpackages:
-  - rate
- name: google.golang.org/appengine
-  version: 12d5545dc1cfa6047a286d5e853841b6471f4c19
-  subpackages:
-  - internal
-  - internal/app_identity
-  - internal/base
-  - internal/datastore
-  - internal/log
-  - internal/modules
-  - internal/remote_api
-  - internal/urlfetch
-  - urlfetch
- name: gopkg.in/inf.v0
-  version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
- name: gopkg.in/square/go-jose.v2
-  version: f8f38de21b4dcd69d0413faf231983f5fd6634b1
-  subpackages:
-  - cipher
-  - json
-  - jwt
- name: gopkg.in/yaml.v2
-  version: 53feefa2559fb8dfa8d81baad31be332c97d6c77
- name: k8s.io/api
-  version: c699ec51538f0cfd4afa8bfcfe1e0779cafbe666
-  subpackages:
-  - admission/v1beta1
-  - admissionregistration/v1alpha1
-  - admissionregistration/v1beta1
-  - apps/v1
-  - apps/v1beta1
-  - apps/v1beta2
-  - authentication/v1
-  - authentication/v1beta1
-  - authorization/v1
-  - authorization/v1beta1
-  - autoscaling/v1
-  - autoscaling/v2beta1
-  - batch/v1
-  - batch/v1beta1
-  - batch/v2alpha1
-  - certificates/v1beta1
-  - core/v1
-  - events/v1beta1
-  - extensions/v1beta1
-  - imagepolicy/v1alpha1
-  - networking/v1
-  - policy/v1beta1
-  - rbac/v1
-  - rbac/v1alpha1
-  - rbac/v1beta1
-  - scheduling/v1alpha1
-  - settings/v1alpha1
-  - storage/v1
-  - storage/v1alpha1
-  - storage/v1beta1
- name: k8s.io/apiextensions-apiserver
-  version: 898b0eda132e1aeac43a459785144ee4bf9b0a2e
-  subpackages:
-  - pkg/features
- name: k8s.io/apimachinery
-  version: 54101a56dda9a0962bc48751c058eb4c546dcbb9
-  subpackages:
-  - pkg/api/equality
-  - pkg/api/errors
-  - pkg/api/meta
-  - pkg/api/resource
-  - pkg/api/validation
-  - pkg/apimachinery
-  - pkg/apimachinery/announced
-  - pkg/apimachinery/registered
-  - pkg/apis/meta/internalversion
-  - pkg/apis/meta/v1
-  - pkg/apis/meta/v1/unstructured
-  - 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/net
-  - pkg/util/rand
-  - pkg/util/remotecommand
-  - pkg/util/runtime
-  - pkg/util/sets
-  - pkg/util/strategicpatch
-  - pkg/util/uuid
-  - pkg/util/validation
-  - pkg/util/validation/field
-  - pkg/util/wait
-  - pkg/util/yaml
-  - pkg/version
-  - pkg/watch
-  - third_party/forked/golang/json
-  - third_party/forked/golang/netutil
-  - third_party/forked/golang/reflect
- name: k8s.io/apiserver
-  version: ea53f8588c655568158b4ff53f5ec6fa4ebfc332
-  subpackages:
-  - pkg/apis/audit
-  - pkg/authentication/authenticator
-  - pkg/authentication/serviceaccount
-  - pkg/authentication/user
-  - pkg/endpoints/request
-  - pkg/features
-  - pkg/util/feature
-  - pkg/util/flag
- name: k8s.io/client-go
-  version: 23781f4d6632d88e869066eaebb743857aa1ef9b
-  subpackages:
-  - discovery
-  - discovery/fake
-  - dynamic
-  - informers
-  - informers/admissionregistration
-  - informers/admissionregistration/v1alpha1
-  - informers/admissionregistration/v1beta1
-  - informers/apps
-  - informers/apps/v1
-  - informers/apps/v1beta1
-  - informers/apps/v1beta2
-  - informers/autoscaling
-  - informers/autoscaling/v1
-  - informers/autoscaling/v2beta1
-  - informers/batch
-  - informers/batch/v1
-  - informers/batch/v1beta1
-  - informers/batch/v2alpha1
-  - informers/certificates
-  - informers/certificates/v1beta1
-  - informers/core
-  - informers/core/v1
-  - informers/events
-  - informers/events/v1beta1
-  - informers/extensions
-  - informers/extensions/v1beta1
-  - informers/internalinterfaces
-  - informers/networking
-  - informers/networking/v1
-  - informers/policy
-  - informers/policy/v1beta1
-  - informers/rbac
-  - informers/rbac/v1
-  - informers/rbac/v1alpha1
-  - informers/rbac/v1beta1
-  - informers/scheduling
-  - informers/scheduling/v1alpha1
-  - informers/settings
-  - informers/settings/v1alpha1
-  - informers/storage
-  - informers/storage/v1
-  - informers/storage/v1alpha1
-  - informers/storage/v1beta1
-  - kubernetes
-  - kubernetes/fake
-  - kubernetes/scheme
-  - kubernetes/typed/admissionregistration/v1alpha1
-  - kubernetes/typed/admissionregistration/v1alpha1/fake
-  - kubernetes/typed/admissionregistration/v1beta1
-  - kubernetes/typed/admissionregistration/v1beta1/fake
-  - kubernetes/typed/apps/v1
-  - kubernetes/typed/apps/v1/fake
-  - kubernetes/typed/apps/v1beta1
-  - kubernetes/typed/apps/v1beta1/fake
-  - kubernetes/typed/apps/v1beta2
-  - kubernetes/typed/apps/v1beta2/fake
-  - kubernetes/typed/authentication/v1
-  - kubernetes/typed/authentication/v1/fake
-  - kubernetes/typed/authentication/v1beta1
-  - kubernetes/typed/authentication/v1beta1/fake
-  - kubernetes/typed/authorization/v1
-  - kubernetes/typed/authorization/v1/fake
-  - kubernetes/typed/authorization/v1beta1
-  - kubernetes/typed/authorization/v1beta1/fake
-  - kubernetes/typed/autoscaling/v1
-  - kubernetes/typed/autoscaling/v1/fake
-  - kubernetes/typed/autoscaling/v2beta1
-  - kubernetes/typed/autoscaling/v2beta1/fake
-  - kubernetes/typed/batch/v1
-  - kubernetes/typed/batch/v1/fake
-  - kubernetes/typed/batch/v1beta1
-  - kubernetes/typed/batch/v1beta1/fake
-  - kubernetes/typed/batch/v2alpha1
-  - kubernetes/typed/batch/v2alpha1/fake
-  - kubernetes/typed/certificates/v1beta1
-  - kubernetes/typed/certificates/v1beta1/fake
-  - kubernetes/typed/core/v1
-  - kubernetes/typed/core/v1/fake
-  - kubernetes/typed/events/v1beta1
-  - kubernetes/typed/events/v1beta1/fake
-  - kubernetes/typed/extensions/v1beta1
-  - kubernetes/typed/extensions/v1beta1/fake
-  - kubernetes/typed/networking/v1
-  - kubernetes/typed/networking/v1/fake
-  - kubernetes/typed/policy/v1beta1
-  - kubernetes/typed/policy/v1beta1/fake
-  - kubernetes/typed/rbac/v1
-  - kubernetes/typed/rbac/v1/fake
-  - kubernetes/typed/rbac/v1alpha1
-  - kubernetes/typed/rbac/v1alpha1/fake
-  - kubernetes/typed/rbac/v1beta1
-  - kubernetes/typed/rbac/v1beta1/fake
-  - kubernetes/typed/scheduling/v1alpha1
-  - kubernetes/typed/scheduling/v1alpha1/fake
-  - kubernetes/typed/settings/v1alpha1
-  - kubernetes/typed/settings/v1alpha1/fake
-  - kubernetes/typed/storage/v1
-  - kubernetes/typed/storage/v1/fake
-  - kubernetes/typed/storage/v1alpha1
-  - kubernetes/typed/storage/v1alpha1/fake
-  - kubernetes/typed/storage/v1beta1
-  - kubernetes/typed/storage/v1beta1/fake
-  - listers/admissionregistration/v1alpha1
-  - listers/admissionregistration/v1beta1
-  - listers/apps/v1
-  - listers/apps/v1beta1
-  - listers/apps/v1beta2
-  - listers/autoscaling/v1
-  - listers/autoscaling/v2beta1
-  - listers/batch/v1
-  - listers/batch/v1beta1
-  - listers/batch/v2alpha1
-  - listers/certificates/v1beta1
-  - listers/core/v1
-  - listers/events/v1beta1
-  - listers/extensions/v1beta1
-  - listers/networking/v1
-  - listers/policy/v1beta1
-  - listers/rbac/v1
-  - listers/rbac/v1alpha1
-  - listers/rbac/v1beta1
-  - listers/scheduling/v1alpha1
-  - listers/settings/v1alpha1
-  - listers/storage/v1
-  - listers/storage/v1alpha1
-  - listers/storage/v1beta1
-  - pkg/apis/clientauthentication
-  - pkg/apis/clientauthentication/v1alpha1
-  - 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
-  - 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/reference
-  - tools/remotecommand
-  - transport
-  - transport/spdy
-  - util/buffer
-  - util/cert
-  - util/exec
-  - util/flowcontrol
-  - util/homedir
-  - util/integer
-  - util/jsonpath
-  - util/retry
-  - util/workqueue
- name: k8s.io/kube-openapi
-  version: 50ae88d24ede7b8bad68e23c805b5d3da5c8abaf
-  subpackages:
-  - pkg/util/proto
-  - pkg/util/proto/validation
- name: k8s.io/kubernetes
-  version: a7685bbc127ba77463c89e363c5cec0d94a5f485
-  subpackages:
-  - pkg/api/events
-  - pkg/api/legacyscheme
-  - pkg/api/pod
-  - pkg/api/ref
-  - pkg/api/resource
-  - pkg/api/service
-  - pkg/api/testapi
-  - pkg/api/v1/pod
-  - pkg/apis/admission
-  - pkg/apis/admission/install
-  - pkg/apis/admission/v1beta1
-  - pkg/apis/admissionregistration
-  - pkg/apis/admissionregistration/install
-  - pkg/apis/admissionregistration/v1alpha1
-  - pkg/apis/admissionregistration/v1beta1
-  - pkg/apis/apps
-  - pkg/apis/apps/install
-  - pkg/apis/apps/v1
-  - pkg/apis/apps/v1beta1
-  - pkg/apis/apps/v1beta2
-  - pkg/apis/authentication
-  - pkg/apis/authentication/install
-  - pkg/apis/authentication/v1
-  - pkg/apis/authentication/v1beta1
-  - pkg/apis/authorization
-  - pkg/apis/authorization/install
-  - pkg/apis/authorization/v1
-  - pkg/apis/authorization/v1beta1
-  - pkg/apis/autoscaling
-  - pkg/apis/autoscaling/install
-  - pkg/apis/autoscaling/v1
-  - pkg/apis/autoscaling/v2beta1
-  - pkg/apis/batch
-  - pkg/apis/batch/install
-  - pkg/apis/batch/v1
-  - pkg/apis/batch/v1beta1
-  - pkg/apis/batch/v2alpha1
-  - pkg/apis/certificates
-  - pkg/apis/certificates/install
-  - pkg/apis/certificates/v1beta1
-  - pkg/apis/componentconfig
-  - pkg/apis/componentconfig/install
-  - pkg/apis/componentconfig/v1alpha1
-  - pkg/apis/core
-  - pkg/apis/core/helper
-  - pkg/apis/core/helper/qos
-  - pkg/apis/core/install
-  - pkg/apis/core/pods
-  - pkg/apis/core/v1
-  - pkg/apis/core/v1/helper
-  - pkg/apis/core/v1/helper/qos
-  - pkg/apis/core/validation
-  - pkg/apis/events
-  - pkg/apis/events/install
-  - pkg/apis/events/v1beta1
-  - pkg/apis/extensions
-  - pkg/apis/extensions/install
-  - pkg/apis/extensions/v1beta1
-  - pkg/apis/imagepolicy
-  - pkg/apis/imagepolicy/install
-  - pkg/apis/imagepolicy/v1alpha1
-  - pkg/apis/networking
-  - pkg/apis/networking/install
-  - pkg/apis/networking/v1
-  - pkg/apis/policy
-  - pkg/apis/policy/install
-  - pkg/apis/policy/v1beta1
-  - pkg/apis/rbac
-  - pkg/apis/rbac/install
-  - pkg/apis/rbac/v1
-  - pkg/apis/rbac/v1alpha1
-  - pkg/apis/rbac/v1beta1
-  - pkg/apis/scheduling
-  - pkg/apis/scheduling/install
-  - pkg/apis/scheduling/v1alpha1
-  - pkg/apis/settings
-  - pkg/apis/settings/install
-  - pkg/apis/settings/v1alpha1
-  - pkg/apis/storage
-  - pkg/apis/storage/install
-  - pkg/apis/storage/util
-  - pkg/apis/storage/v1
-  - pkg/apis/storage/v1alpha1
-  - pkg/apis/storage/v1beta1
-  - pkg/capabilities
-  - pkg/client/clientset_generated/internalclientset
-  - pkg/client/clientset_generated/internalclientset/fake
-  - pkg/client/clientset_generated/internalclientset/scheme
-  - pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/apps/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/apps/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/batch/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/batch/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/core/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/core/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/events/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/events/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/networking/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/networking/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/policy/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/scheduling/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/scheduling/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/settings/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/settings/internalversion/fake
-  - pkg/client/clientset_generated/internalclientset/typed/storage/internalversion
-  - pkg/client/clientset_generated/internalclientset/typed/storage/internalversion/fake
-  - pkg/cloudprovider
-  - pkg/controller
-  - pkg/controller/daemon
-  - pkg/controller/daemon/util
-  - pkg/controller/deployment/util
-  - pkg/controller/history
-  - pkg/controller/statefulset
-  - pkg/controller/volume/events
-  - pkg/controller/volume/persistentvolume
-  - pkg/controller/volume/persistentvolume/metrics
-  - pkg/credentialprovider
-  - pkg/features
-  - pkg/fieldpath
-  - pkg/kubectl
-  - pkg/kubectl/apps
-  - pkg/kubectl/categories
-  - pkg/kubectl/cmd/templates
-  - 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/plugins
-  - pkg/kubectl/resource
-  - pkg/kubectl/scheme
-  - pkg/kubectl/util
-  - pkg/kubectl/util/hash
-  - pkg/kubectl/util/slice
-  - pkg/kubectl/util/term
-  - pkg/kubectl/util/transport
-  - pkg/kubectl/validation
-  - pkg/kubelet/apis
-  - pkg/kubelet/types
-  - pkg/master/ports
-  - pkg/printers
-  - pkg/printers/internalversion
-  - pkg/registry/rbac/validation
-  - pkg/scheduler/algorithm
-  - pkg/scheduler/algorithm/predicates
-  - pkg/scheduler/algorithm/priorities/util
-  - pkg/scheduler/api
-  - pkg/scheduler/schedulercache
-  - pkg/scheduler/util
-  - pkg/scheduler/volumebinder
-  - pkg/security/apparmor
-  - pkg/serviceaccount
-  - pkg/util/file
-  - pkg/util/goroutinemap
-  - pkg/util/goroutinemap/exponentialbackoff
-  - pkg/util/hash
-  - pkg/util/interrupt
-  - pkg/util/io
-  - pkg/util/labels
-  - pkg/util/metrics
-  - pkg/util/mount
-  - pkg/util/net/sets
-  - pkg/util/node
-  - pkg/util/nsenter
-  - pkg/util/parsers
-  - pkg/util/pointer
-  - pkg/util/slice
-  - pkg/util/taints
-  - pkg/version
-  - pkg/volume
-  - pkg/volume/util
-  - pkg/volume/util/fs
-  - pkg/volume/util/recyclerclient
-  - pkg/volume/util/types
- name: k8s.io/utils
-  version: aedf551cdb8b0119df3a19c65fde413a13b34997
-  subpackages:
-  - clock
-  - exec
-  - exec/testing
- name: vbom.ml/util
-  version: db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394
-  subpackages:
-  - sortorder
-testImports:
- name: github.com/pmezard/go-difflib
-  version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
-  subpackages:
-  - difflib
- name: github.com/stretchr/testify
-  version: e3a8ff8ce36581f87a15341206f205b1da467059
-  subpackages:
-  - assert
--- a/glide.yaml
+++ b/glide.yaml
@ -1,51 +0,0 @@
-package: k8s.io/helm
-import:
- package: github.com/spf13/cobra
-  version: f62e98d28ab7ad31d707ba837a966378465c7b57
- package: github.com/spf13/pflag
-  version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7
- package: github.com/Masterminds/vcs
-  version: ~1.11.0
-  # Pin version of mergo that is compatible with both sprig and Kubernetes
- package: github.com/imdario/mergo
-  version: 6633656539c1639d9d78127b7d47c622b5d7b6dc
- package: github.com/Masterminds/sprig
-  version: ^2.14.1
- package: github.com/ghodss/yaml
- package: github.com/Masterminds/semver
-  version: ~1.3.1
- package: github.com/technosophos/moniker
- package: github.com/gosuri/uitable
- package: github.com/asaskevich/govalidator
-  version: ^4.0.0
- package: golang.org/x/crypto
-  subpackages:
-  - openpgp
-# pin version of golang.org/x/sys that is compatible with golang.org/x/crypto
- package: golang.org/x/sys
-  version: 43eea11
-  subpackages:
-  - unix
-  - windows
- package: github.com/gobwas/glob
-  version: ^0.2.1
- package: github.com/evanphx/json-patch
- package: github.com/BurntSushi/toml
-  version: ~0.3.0
-
- package: k8s.io/kubernetes
-  version: release-1.10
- package: k8s.io/client-go
-  version: kubernetes-1.10.0
- package: k8s.io/api
-  version: release-1.10
- package: k8s.io/apimachinery
-  version: release-1.10
- package: k8s.io/apiserver
-  version: release-1.10
-
-testImports:
- package: github.com/stretchr/testify
-  version: ^1.1.4
-  subpackages:
-  - assert
--- a/scripts/validate-license.sh
+++ b/scripts/validate-license.sh
@ -23,7 +23,7 @@ find_files() {
      -o -wholename '*testdata*' \
    \) -prune \
  \) \
-  \( -name '*.go' -o -name '*.sh' -o -name 'Dockerfile' \)
+  \( -name '*.go' -o -name '*.sh' \)
 }

 failed=($(find_files | xargs grep -L 'Licensed under the Apache License, Version 2.0 (the "License");'))