From 397688b9185adba643c5c75316252264bba79365 Mon Sep 17 00:00:00 2001 From: Matthew Fisher Date: Tue, 20 Jun 2017 15:39:16 -0700 Subject: [PATCH] bump to helm v2.5.0 --- README.md | 5 ++-- cmd/draft/init.go | 9 ++----- docs/contributing/hacking.md | 2 +- docs/install.md | 2 +- glide.lock | 51 ++++++++---------------------------- glide.yaml | 2 +- 6 files changed, 18 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index da8cd82..925e65b 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Using Draft is as simple as: 2. `draft up` to deploy your application to a Kubernetes dev sandbox, accessible via a public URL 3. Use a local editor to modify the application, with changes deployed to Kubernetes in seconds -Once the developer is happy with changes made via Draft, they commit and push to version control, after which a continuous integration (CI) system takes over. Draft builds upon [Kubernetes Helm](https://github.com/kubernetes/helm) and the [Kubernetes Chart format](https://github.com/kubernetes/helm/blob/master/docs/charts.md), making it easy to construct CI pipelines from Draft-enabled applications. +Once the developer is happy with changes made via Draft, they commit and push to version control, after which a continuous integration (CI) system takes over. Draft builds upon [Kubernetes Helm][helm] and the [Kubernetes Chart format](https://github.com/kubernetes/helm/blob/master/docs/charts.md), making it easy to construct CI pipelines from Draft-enabled applications. Here is a video demonstrating how to set up Draft on Azure Container Services: @@ -51,8 +51,7 @@ You can read third-party software licenses [here][Third-Party Licenses]. [Installation Guide]: docs/install.md [Getting Started]: docs/getting-started.md [hacking]: docs/contributing/hacking.md -[`helm` v2.4.2]: https://github.com/kubernetes/helm/releases/tag/v2.4.2 -[Helm]: https://github.com/kubernetes/helm +[helm]: https://github.com/kubernetes/helm [Installing Helm]: https://github.com/kubernetes/helm/blob/master/docs/install.md [Kubernetes]: https://kubernetes.io/ [license]: LICENSE diff --git a/cmd/draft/init.go b/cmd/draft/init.go index 972c435..ce14f52 100644 --- a/cmd/draft/init.go +++ b/cmd/draft/init.go @@ -16,7 +16,6 @@ import ( "k8s.io/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/strvals" "k8s.io/helm/pkg/tiller/environment" - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "github.com/Azure/draft/cmd/draft/installer" "github.com/Azure/draft/pkg/draft/draftpath" @@ -133,15 +132,11 @@ func (i *initCmd) run() error { if !i.clientOnly { if i.helmClient == nil { - _, config, err := getKubeClient(kubeContext) + client, config, err := getKubeClient(kubeContext) if err != nil { return fmt.Errorf("Could not get a kube client: %s", err) } - internalclient, err := internalclientset.NewForConfig(config) - if err != nil { - return fmt.Errorf("Could not get a kube client: %s", err) - } - tunnel, err := portforwarder.New(environment.DefaultTillerNamespace, internalclient, config) + tunnel, err := portforwarder.New(environment.DefaultTillerNamespace, client, config) if err != nil { return fmt.Errorf("Could not get a connection to tiller: %s", err) } diff --git a/docs/contributing/hacking.md b/docs/contributing/hacking.md index 22c9659..0f4f5d1 100644 --- a/docs/contributing/hacking.md +++ b/docs/contributing/hacking.md @@ -13,7 +13,7 @@ To compile and test Draft binaries and to build Docker images, you will need: - [Go][] 1.7 or later, with support for compiling to `linux/amd64` - [glide][] - a [Kubernetes][] cluster. We recommend [minikube][] - - [helm][] v2.4.x + - [helm][] - [upx][] (optional) to compress binaries for a smaller Docker image In most cases, install the prerequisite according to its instructions. See the next section diff --git a/docs/install.md b/docs/install.md index 6686f81..d9639ba 100644 --- a/docs/install.md +++ b/docs/install.md @@ -3,7 +3,7 @@ - Draft will need a Kubernetes cluster to deploy your app. [Minikube][minikube], Azure Container Services and Google Container Engine are a few examples that will work with Draft, but any Kubernetes cluster will do. -- Draft expects [Helm](https://github.com/kubernetes/helm) to be installed on your Kubernetes cluster. Download [`helm` v2.4.x](https://github.com/kubernetes/helm/releases) and +- Draft expects [Helm](https://github.com/kubernetes/helm) to be installed on your Kubernetes cluster. Download [`helm`](https://github.com/kubernetes/helm/releases) and do a `helm init` first, as described in [Installing Helm](https://github.com/kubernetes/helm/blob/master/docs/install.md). - Draft needs to push images to a Docker registry, so you'll need to configure Draft with your Docker registry credentials. If you don't already have one, you can create a Docker registry for free on either [Docker Hub](https://hub.docker.com/) or [Quay.io](https://quay.io). - An ingress controller installed within your Kubernetes cluster with a wildcard domain pointing to it. Review the [Ingress Guide][Ingress Guide] for more information about what Draft expects and how to set up an ingress controller. diff --git a/glide.lock b/glide.lock index e7c5297..6e28f52 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 0a3624ca7754a89d5353d1f0c27e2c64f0b71e93ace9c8c73644fc5ef367ab90 -updated: 2017-06-01T20:15:24.363479679-04:00 +hash: f5a7f23585502f42141b89cfdc8a5c3881f1a308bfc2cea96e37c43b40068524 +updated: 2017-06-20T15:29:50.958065797-07:00 imports: - name: cloud.google.com/go version: 3b1ae45394a234c385be014e9a488f2bb6eef821 @@ -7,7 +7,7 @@ imports: - compute/metadata - internal - name: github.com/aokoli/goutils - version: e57d01ace047c1a43e6a49ecf3ecc50ed2be81d1 + version: 9c37978a95bd5c709a15883b6242714ea6709e64 - name: github.com/Azure/go-ansiterm version: 388960b655244e76e24c75f48631564eaefade62 subpackages: @@ -34,19 +34,18 @@ imports: - spew - name: github.com/dgrijalva/jwt-go version: 01aeca54ebda6e0fbfafd0a524d234159c05ec20 +- name: github.com/docker/cli + version: 30af87981d8d464c385b247f524fcbc503207940 - name: github.com/docker/distribution version: b38e5838b7b2f2ad48e06ec4b500011976080621 subpackages: - - context - digestset - reference - - uuid - name: github.com/docker/docker version: 89658bed64c2a8fe05a978e5b87dbec409d57a0f subpackages: - api - api/types - - api/types/backend - api/types/blkiodev - api/types/container - api/types/events @@ -60,15 +59,10 @@ imports: - api/types/time - api/types/versions - api/types/volume - - builder - builder/dockerignore + - cli/command/image/build - client - - daemon/graphdriver - - image - - layer - - oci - pkg/archive - - pkg/chrootarchive - pkg/fileutils - pkg/gitutils - pkg/httputils @@ -77,25 +71,16 @@ imports: - pkg/jsonlog - pkg/jsonmessage - pkg/longpath - - pkg/mount - - pkg/plugingetter - - pkg/plugins - - pkg/plugins/transport - pkg/pools - pkg/progress - pkg/promise - - pkg/random - - pkg/reexec - pkg/streamformatter - - pkg/stringid - pkg/symlink - pkg/system - - pkg/tarsum - pkg/term - pkg/term/windows - pkg/tlsconfig - pkg/urlutil - - plugin/v2 - name: github.com/docker/engine-api version: dea108d3aa0c67d7162a3fd8aa65f38a430019fd subpackages: @@ -182,10 +167,6 @@ imports: - ptypes/timestamp - name: github.com/google/gofuzz version: 44d81051d367757e1c7c6a5a86423ece9afcf63c -- name: github.com/gorilla/context - version: 215affda49addc4c8ef7e2534915df2c8c35c6cd -- name: github.com/gorilla/mux - version: 8096f47503459bcc74d1f4c487b7e6e42e5746b5 - name: github.com/gorilla/websocket version: 7fe3183ee95b29153898356cc2c6026a8cb7afe5 repo: https://github.com/bacongobbler/websocket @@ -229,14 +210,8 @@ imports: - name: github.com/opencontainers/runc version: 45c30e75abfd52107b53048004a83165403ad0d1 subpackages: - - libcontainer/configs - - libcontainer/devices - libcontainer/system - libcontainer/user -- name: github.com/opencontainers/runtime-spec - version: 1c7c27d043c2a5e513a44084d2b10d77d1402b8c - subpackages: - - specs-go - name: github.com/pborman/uuid version: ca53cad383cad2479bbba7f7a1a05797ec1386e4 - name: github.com/pkg/errors @@ -256,17 +231,11 @@ imports: - name: github.com/spf13/pflag version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7 - name: github.com/technosophos/moniker - version: ab470f5e105a44d0c87ea21bacd6a335c4816d83 + version: 9f956786b91d9786ca11aa5be6104542fa911546 - name: github.com/ugorji/go version: ded73eae5db7e7a0ef6f55aace87a2873c5d2b74 subpackages: - codec -- name: github.com/vbatts/tar-split - version: b9127a139315e57ebc26030e7decf72d0a20acb4 - subpackages: - - archive/tar - - tar/asm - - tar/storage - name: golang.org/x/crypto version: d172538b2cfce0c13cee31e647d0367aa8cd2486 subpackages: @@ -403,7 +372,7 @@ imports: - third_party/forked/golang/netutil - third_party/forked/golang/reflect - name: k8s.io/apiserver - version: 156ed5ba2d435ec2db08d2f803fecb591b72c058 + version: 2308857ad3b8b18abf74ff734853973eda9da94d subpackages: - pkg/authentication/authenticator - pkg/authentication/serviceaccount @@ -495,7 +464,7 @@ imports: - util/integer - util/jsonpath - name: k8s.io/helm - version: 82d8e9498d96535cc6787a6a9194a76161d29b4c + version: 012cb0ac1a1b2f888144ef5a67b8dab6c2d45be6 subpackages: - pkg/chartutil - pkg/engine @@ -650,6 +619,8 @@ imports: - pkg/version - name: vbom.ml/util version: db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 + repo: https://github.com/fvbommel/util.git + vcs: git subpackages: - sortorder testImports: [] diff --git a/glide.yaml b/glide.yaml index 79a25f5..940dbe6 100644 --- a/glide.yaml +++ b/glide.yaml @@ -28,7 +28,7 @@ import: - package: k8s.io/client-go version: 8aceb98010c1c18b6b54a35b52fd5b46905e3d7f - package: k8s.io/helm - version: ~2.4.0 + version: ~2.5.0 - package: k8s.io/kubernetes version: v1.6.2 - package: github.com/Sirupsen/logrus