feat(dep): replace glide with dep

.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

.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

.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'"

Gopkg.toml

+
+[[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

Makefile

@@ -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:

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

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

glide.yaml

-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

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");'))