Merge pull request #302 from adamreese/helm-rename

fix(*): update import paths for helm repo naming
pull/381/head
Adam Reese 9 years ago
commit 6ea146ae6a

@ -1,6 +1,6 @@
# Deployment Manager # Deployment Manager
[![Circle CI](https://circleci.com/gh/kubernetes/deployment-manager.svg?style=svg)](https://circleci.com/gh/kubernetes/deployment-manager) [![Go Report Card](http://goreportcard.com/badge/kubernetes/deployment-manager)](http://goreportcard.com/report/kubernetes/deployment-manager) [![Circle CI](https://circleci.com/gh/kubernetes/helm.svg?style=svg)](https://circleci.com/gh/kubernetes/helm) [![Go Report Card](http://goreportcard.com/badge/kubernetes/helm)](http://goreportcard.com/report/kubernetes/helm)
Deployment Manager (DM) `dm` makes it easy to create, describe, update and Deployment Manager (DM) `dm` makes it easy to create, describe, update and
delete Kubernetes resources using declarative configuration. A configuration is delete Kubernetes resources using declarative configuration. A configuration is
@ -63,13 +63,13 @@ for the Kubernetes configuration SIG.
## Installing Deployment Manager ## Installing Deployment Manager
Note: if you're exploring or using the project, you'll probably want to pull Note: if you're exploring or using the project, you'll probably want to pull
(the latest release)[https://github.com/kubernetes/deployment-manager/releases/latest], (the latest release)[https://github.com/kubernetes/helm/releases/latest],
since there may be undiscovered or unresolved issues at HEAD. since there may be undiscovered or unresolved issues at HEAD.
From a Linux or Mac OS X client: From a Linux or Mac OS X client:
``` ```
curl -s https://raw.githubusercontent.com/kubernetes/deployment-manager/master/get-install.sh | sh curl -s https://raw.githubusercontent.com/kubernetes/helm/master/get-install.sh | sh
``` ```
and then install the DM services into your Kubernetes cluster: and then install the DM services into your Kubernetes cluster:

@ -4,14 +4,14 @@ machine:
GO15VENDOREXPERIMENT: 1 GO15VENDOREXPERIMENT: 1
GOPATH: /usr/local/go_workspace GOPATH: /usr/local/go_workspace
HOME: /home/ubuntu HOME: /home/ubuntu
IMPORT_PATH: "github.com/kubernetes/deployment-manager" IMPORT_PATH: "github.com/kubernetes/helm"
dependencies: dependencies:
override: override:
- sudo chown -R $(whoami):staff /usr/local - sudo chown -R $(whoami):staff /usr/local
- cd $GOPATH - cd $GOPATH
- mkdir -p $GOPATH/src/$IMPORT_PATH - mkdir -p $GOPATH/src/$IMPORT_PATH
- cd $HOME/deployment-manager - cd $HOME/helm
- rsync -az --delete ./ "$GOPATH/src/$IMPORT_PATH/" - rsync -az --delete ./ "$GOPATH/src/$IMPORT_PATH/"
- wget "https://github.com/Masterminds/glide/releases/download/$GLIDE_VERSION/glide-$GLIDE_VERSION-linux-amd64.tar.gz" - wget "https://github.com/Masterminds/glide/releases/download/$GLIDE_VERSION/glide-$GLIDE_VERSION-linux-amd64.tar.gz"
- mkdir -p $HOME/bin - mkdir -p $HOME/bin

@ -19,8 +19,8 @@ package main
import ( import (
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
"archive/tar" "archive/tar"
"bytes" "bytes"

@ -24,7 +24,7 @@ import (
"os/exec" "os/exec"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
) )
// Expander abstracts interactions with the expander and deployer services. // Expander abstracts interactions with the expander and deployer services.

@ -26,8 +26,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
) )
var importFileNames = []string{ var importFileNames = []string{

@ -17,9 +17,9 @@ limitations under the License.
package main package main
import ( import (
"github.com/kubernetes/deployment-manager/cmd/expandybird/expander" "github.com/kubernetes/helm/cmd/expandybird/expander"
"github.com/kubernetes/deployment-manager/cmd/expandybird/service" "github.com/kubernetes/helm/cmd/expandybird/service"
"github.com/kubernetes/deployment-manager/pkg/version" "github.com/kubernetes/helm/pkg/version"
"flag" "flag"
"fmt" "fmt"

@ -17,9 +17,9 @@ limitations under the License.
package service package service
import ( import (
"github.com/kubernetes/deployment-manager/cmd/expandybird/expander" "github.com/kubernetes/helm/cmd/expandybird/expander"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
"errors" "errors"
"fmt" "fmt"

@ -26,9 +26,9 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/kubernetes/deployment-manager/cmd/expandybird/expander" "github.com/kubernetes/helm/cmd/expandybird/expander"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
restful "github.com/emicklei/go-restful" restful "github.com/emicklei/go-restful"
) )

@ -25,8 +25,8 @@ import (
"github.com/aokoli/goutils" "github.com/aokoli/goutils"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/kubernetes/deployment-manager/pkg/chart" "github.com/kubernetes/helm/pkg/chart"
"github.com/kubernetes/deployment-manager/pkg/format" "github.com/kubernetes/helm/pkg/format"
) )
func uploadChart(c *cli.Context) error { func uploadChart(c *cli.Context) error {

@ -21,7 +21,7 @@ import (
"path/filepath" "path/filepath"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/kubernetes/deployment-manager/pkg/chart" "github.com/kubernetes/helm/pkg/chart"
) )
func init() { func init() {

@ -20,7 +20,7 @@ import (
"errors" "errors"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/kubernetes/deployment-manager/pkg/format" "github.com/kubernetes/helm/pkg/format"
) )
func init() { func init() {

@ -21,7 +21,7 @@ import (
"os" "os"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

@ -21,9 +21,9 @@ import (
"os" "os"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/kubernetes/deployment-manager/pkg/client" "github.com/kubernetes/helm/pkg/client"
"github.com/kubernetes/deployment-manager/pkg/format" "github.com/kubernetes/helm/pkg/format"
"github.com/kubernetes/deployment-manager/pkg/kubectl" "github.com/kubernetes/helm/pkg/kubectl"
) )
// ErrAlreadyInstalled indicates that DM is already installed. // ErrAlreadyInstalled indicates that DM is already installed.

@ -18,9 +18,9 @@ package main
import ( import (
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/kubernetes/deployment-manager/pkg/client" "github.com/kubernetes/helm/pkg/client"
"github.com/kubernetes/deployment-manager/pkg/format" "github.com/kubernetes/helm/pkg/format"
"github.com/kubernetes/deployment-manager/pkg/kubectl" "github.com/kubernetes/helm/pkg/kubectl"
) )
func init() { func init() {

@ -20,7 +20,7 @@ import (
"errors" "errors"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/kubernetes/deployment-manager/pkg/format" "github.com/kubernetes/helm/pkg/format"
) )
func init() { func init() {

@ -20,8 +20,8 @@ import (
"os" "os"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/kubernetes/deployment-manager/pkg/client" "github.com/kubernetes/helm/pkg/client"
"github.com/kubernetes/deployment-manager/pkg/version" "github.com/kubernetes/helm/pkg/version"
) )
var commands []cli.Command var commands []cli.Command

@ -18,7 +18,7 @@ package main
import ( import (
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/kubernetes/deployment-manager/pkg/format" "github.com/kubernetes/helm/pkg/format"
) )
func init() { func init() {

@ -22,8 +22,8 @@ import (
"os" "os"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/kubernetes/deployment-manager/pkg/chart" "github.com/kubernetes/helm/pkg/chart"
"github.com/kubernetes/deployment-manager/pkg/format" "github.com/kubernetes/helm/pkg/format"
) )
func init() { func init() {

@ -21,7 +21,7 @@ import (
"os" "os"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
"github.com/kubernetes/deployment-manager/pkg/format" "github.com/kubernetes/helm/pkg/format"
) )
func init() { func init() {

@ -19,8 +19,8 @@ package main
import ( import (
"fmt" "fmt"
"github.com/kubernetes/deployment-manager/pkg/format" "github.com/kubernetes/helm/pkg/format"
"github.com/kubernetes/deployment-manager/pkg/kubectl" "github.com/kubernetes/helm/pkg/kubectl"
) )
func target(dryRun bool) error { func target(dryRun bool) error {

@ -32,15 +32,15 @@ import (
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/kubernetes/deployment-manager/cmd/manager/manager" "github.com/kubernetes/helm/cmd/manager/manager"
"github.com/kubernetes/deployment-manager/cmd/manager/repository" "github.com/kubernetes/helm/cmd/manager/repository"
"github.com/kubernetes/deployment-manager/cmd/manager/repository/persistent" "github.com/kubernetes/helm/cmd/manager/repository/persistent"
"github.com/kubernetes/deployment-manager/cmd/manager/repository/transient" "github.com/kubernetes/helm/cmd/manager/repository/transient"
"github.com/kubernetes/deployment-manager/cmd/manager/router" "github.com/kubernetes/helm/cmd/manager/router"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/httputil" "github.com/kubernetes/helm/pkg/httputil"
"github.com/kubernetes/deployment-manager/pkg/registry" "github.com/kubernetes/helm/pkg/registry"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
) )
var deployments = []Route{ var deployments = []Route{

@ -5,7 +5,7 @@ import (
"net/http/httptest" "net/http/httptest"
"testing" "testing"
"github.com/kubernetes/deployment-manager/cmd/manager/router" "github.com/kubernetes/helm/cmd/manager/router"
) )
func TestHealthz(t *testing.T) { func TestHealthz(t *testing.T) {

@ -17,8 +17,8 @@ limitations under the License.
package main package main
import ( import (
"github.com/kubernetes/deployment-manager/cmd/manager/router" "github.com/kubernetes/helm/cmd/manager/router"
"github.com/kubernetes/deployment-manager/pkg/version" "github.com/kubernetes/helm/pkg/version"
"flag" "flag"
"fmt" "fmt"

@ -28,7 +28,7 @@ import (
"time" "time"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
) )
// Deployer abstracts interactions with the expander and deployer services. // Deployer abstracts interactions with the expander and deployer services.

@ -26,8 +26,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
) )

@ -24,7 +24,7 @@ import (
"net/http" "net/http"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
) )
const ( const (

@ -26,8 +26,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
) )

@ -24,10 +24,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/kubernetes/deployment-manager/cmd/manager/repository" "github.com/kubernetes/helm/cmd/manager/repository"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/registry" "github.com/kubernetes/helm/pkg/registry"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
) )
// Manager manages a persistent set of Deployments. // Manager manages a persistent set of Deployments.

@ -22,8 +22,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/registry" "github.com/kubernetes/helm/pkg/registry"
) )
var template = common.Template{Name: "test", Content: "test"} var template = common.Template{Name: "test", Content: "test"}

@ -20,9 +20,9 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/registry" "github.com/kubernetes/helm/pkg/registry"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
) )

@ -24,8 +24,8 @@ import (
"testing" "testing"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/registry" "github.com/kubernetes/helm/pkg/registry"
) )
type responseAndError struct { type responseAndError struct {

@ -25,8 +25,8 @@ import (
"os" "os"
"time" "time"
"github.com/kubernetes/deployment-manager/cmd/manager/repository" "github.com/kubernetes/helm/cmd/manager/repository"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"gopkg.in/mgo.v2" "gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/bson"

@ -14,7 +14,7 @@ limitations under the License.
package persistent package persistent
import ( import (
"github.com/kubernetes/deployment-manager/cmd/manager/repository" "github.com/kubernetes/helm/cmd/manager/repository"
"sync" "sync"
"testing" "testing"

@ -18,7 +18,7 @@ limitations under the License.
package repository package repository
import ( import (
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
) )
// Repository manages storage for all Deployment Manager entities, as well as // Repository manages storage for all Deployment Manager entities, as well as

@ -17,7 +17,7 @@ limitations under the License.
package repository package repository
import ( import (
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"fmt" "fmt"
"testing" "testing"

@ -23,8 +23,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/kubernetes/deployment-manager/cmd/manager/repository" "github.com/kubernetes/helm/cmd/manager/repository"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
) )
// deploymentTypeInstanceMap stores type instances mapped by deployment name. // deploymentTypeInstanceMap stores type instances mapped by deployment name.

@ -14,7 +14,7 @@ limitations under the License.
package transient package transient
import ( import (
"github.com/kubernetes/deployment-manager/cmd/manager/repository" "github.com/kubernetes/helm/cmd/manager/repository"
"testing" "testing"
) )

@ -1,9 +1,9 @@
package router package router
import ( import (
"github.com/kubernetes/deployment-manager/cmd/manager/manager" "github.com/kubernetes/helm/cmd/manager/manager"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
helmhttp "github.com/kubernetes/deployment-manager/pkg/httputil" helmhttp "github.com/kubernetes/helm/pkg/httputil"
) )
// Config holds the global configuration parameters passed into the router. // Config holds the global configuration parameters passed into the router.
@ -44,7 +44,7 @@ type Config struct {
// Members of the context must be concurrency safe. // Members of the context must be concurrency safe.
type Context struct { type Context struct {
Config *Config Config *Config
// Manager is a deployment-manager/manager/manager.Manager // Manager is a helm/manager/manager.Manager
Manager manager.Manager Manager manager.Manager
Encoder helmhttp.Encoder Encoder helmhttp.Encoder
CredentialProvider common.CredentialProvider CredentialProvider common.CredentialProvider

@ -33,7 +33,7 @@ import (
"net/http" "net/http"
"github.com/Masterminds/httputil" "github.com/Masterminds/httputil"
helmhttp "github.com/kubernetes/deployment-manager/pkg/httputil" helmhttp "github.com/kubernetes/helm/pkg/httputil"
) )
// HandlerFunc responds to an individual HTTP request. // HandlerFunc responds to an individual HTTP request.

@ -17,9 +17,9 @@ limitations under the License.
package main package main
import ( import (
"github.com/kubernetes/deployment-manager/cmd/resourcifier/configurator" "github.com/kubernetes/helm/cmd/resourcifier/configurator"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
"encoding/json" "encoding/json"
"errors" "errors"

@ -23,8 +23,8 @@ import (
"strings" "strings"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
) )
// Configurator configures a Kubernetes cluster using kubectl. // Configurator configures a Kubernetes cluster using kubectl.

@ -25,8 +25,8 @@ import (
"github.com/gorilla/handlers" "github.com/gorilla/handlers"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
"github.com/kubernetes/deployment-manager/pkg/version" "github.com/kubernetes/helm/pkg/version"
) )
// Route defines a routing table entry to be registered with gorilla/mux. // Route defines a routing table entry to be registered with gorilla/mux.

@ -16,7 +16,7 @@ In order to build and push DM, you must:
To build and push the service containers: To build and push the service containers:
``` ```
$ cd ${GOPATH}/src/github.com/kubernetes/deployment-manager $ cd ${GOPATH}/src/github.com/kubernetes/helm
$ export PROJECT=dm-k8s-prod $ export PROJECT=dm-k8s-prod
$ make push $ make push
``` ```

@ -2,7 +2,7 @@
DM lets configurations instantiate [templates](../design/design.md#templates) DM lets configurations instantiate [templates](../design/design.md#templates)
using both [imports](../design/design.md#template-imports) and using both [imports](../design/design.md#template-imports) and
[references](../design/design.md#template-references). [references](../design/design.md#template-references).
Because template references can use any public HTTP endpoint, they provide Because template references can use any public HTTP endpoint, they provide
a way to share templates. While you can store templates anywhere you want and a way to share templates. While you can store templates anywhere you want and
@ -24,7 +24,7 @@ Every template must therefore carry a version based on the
[Semantic Versioning](http://semver.org/) specification. A template version [Semantic Versioning](http://semver.org/) specification. A template version
consists of a MAJOR version, a MINOR version and a PATCH version, and can consists of a MAJOR version, a MINOR version and a PATCH version, and can
be represented as a three part string starting with the letter `v` and using be represented as a three part string starting with the letter `v` and using
dot delimiters between the parts. For example `v1.1.0`. dot delimiters between the parts. For example `v1.1.0`.
Parts may be omitted from right to left, up to but not include the MAJOR Parts may be omitted from right to left, up to but not include the MAJOR
version. All omitted parts default to zero. So, for example: version. All omitted parts default to zero. So, for example:
@ -53,15 +53,15 @@ Every template version should include a configuration named `example.yaml`
that can be used to deploy an instance of the template. This file, along with that can be used to deploy an instance of the template. This file, along with
any supporting files it requires, may be used automatically in the future by any supporting files it requires, may be used automatically in the future by
a template testing framework to validate the template, and should therefore be a template testing framework to validate the template, and should therefore be
well formed. well formed.
## Template Organization ## Template Organization
Technically, all you need to reference a template is a directory at a public Technically, all you need to reference a template is a directory at a public
HTTP endpoint that contains a template file named either `<template-name>.py` HTTP endpoint that contains a template file named either `<template-name>.py`
or `<template-name>.jinja`, depending on the implementation language, along or `<template-name>.jinja`, depending on the implementation language, along
with any supporting files it might require, such as an optional schema file with any supporting files it might require, such as an optional schema file
named `<template-name>.py.schema` or `<template-name>.jinja.schema`, respectively, named `<template-name>.py.schema` or `<template-name>.jinja.schema`, respectively,
helper files used by the implementation, files imported by the schema, and so on. helper files used by the implementation, files imported by the schema, and so on.
### Basic structure ### Basic structure
@ -109,13 +109,13 @@ templateA/
helper.py helper.py
``` ```
In this example, `templateA` is a template directory, and `v1`, `v1.01`, and In this example, `templateA` is a template directory, and `v1`, `v1.01`, and
`v1.1` are template version directories that hold the versions of `templateA`. `v1.1` are template version directories that hold the versions of `templateA`.
### Registry based template references ### Registry based template references
In general, In general,
[templates references](https://github.com/kubernetes/deployment-manager/blob/master/docs/design/design.md#template-references) [templates references](https://github.com/kubernetes/helm/blob/master/docs/design/design.md#template-references)
are just URLs to HTTP endpoints. However, because a template registry follows are just URLs to HTTP endpoints. However, because a template registry follows
the conventions outlined above, references to templates in a template registry the conventions outlined above, references to templates in a template registry
can be shorter and simpler than generalized template references. can be shorter and simpler than generalized template references.
@ -164,7 +164,7 @@ This example, where template directories are organized by category, is also vali
``` ```
templates/ templates/
big-data/ big-data/
templateA/ templateA/
v1/ v1/
... ...

@ -1,4 +1,4 @@
package: github.com/kubernetes/deployment-manager package: github.com/kubernetes/helm
ignore: ignore:
- google.golang.com/appengine - google.golang.com/appengine
import: import:

@ -7,18 +7,18 @@ Collection of convenience scripts
A Vagrantfile to create a standalone build environment for helm. A Vagrantfile to create a standalone build environment for helm.
It is handy if you do not have Golang and the dependencies used by Helm on your local machine. It is handy if you do not have Golang and the dependencies used by Helm on your local machine.
$ git clone https://github.com/kubernetes/deployment-manager.git $ git clone https://github.com/kubernetes/helm.git
$ cd deployment-manager/hack $ cd helm/hack
$ vagrant up $ vagrant up
Once the machine is up, you can SSH to it and start a new build of helm Once the machine is up, you can SSH to it and start a new build of helm
$ vagrant ssh $ vagrant ssh
$ cd src/github.com/kubernetes/deployment-manager $ cd src/github.com/kubernetes/helm
$ make build $ make build
[dm-push.sh](dm-push.sh) [dm-push.sh](dm-push.sh)
------------------------ ------------------------
Run this from deployment-manager root to build and push the dm client plus Run this from helm root to build and push the dm client plus
kubernetes install config into the publicly readable GCS bucket gs://get-dm. kubernetes install config into the publicly readable GCS bucket gs://get-dm.

6
hack/Vagrantfile vendored

@ -20,7 +20,7 @@ curl -L https://storage.googleapis.com/golang/go#{GO_VERSION}.linux-amd64.tar.gz
tar -C /usr/local -xzf go#{GO_VERSION}.linux-amd64.tar.gz tar -C /usr/local -xzf go#{GO_VERSION}.linux-amd64.tar.gz
wget "https://github.com/Masterminds/glide/releases/download/#{GLIDE_VERSION}/glide-#{GLIDE_VERSION}-linux-amd64.tar.gz" wget "https://github.com/Masterminds/glide/releases/download/#{GLIDE_VERSION}/glide-#{GLIDE_VERSION}-linux-amd64.tar.gz"
su vagrant -c "mkdir -p /home/vagrant/bin" su vagrant -c "mkdir -p /home/vagrant/bin"
su vagrant -c "mkdir -p /home/vagrant/src/github.com/kubernetes/deployment-manager" su vagrant -c "mkdir -p /home/vagrant/src/github.com/kubernetes/helm"
chgrp vagrant -R /home/vagrant/src chgrp vagrant -R /home/vagrant/src
chown vagrant -R /home/vagrant/src chown vagrant -R /home/vagrant/src
su vagrant -c "tar -vxz -C /home/vagrant/bin --strip=1 -f glide-#{GLIDE_VERSION}-linux-amd64.tar.gz" su vagrant -c "tar -vxz -C /home/vagrant/bin --strip=1 -f glide-#{GLIDE_VERSION}-linux-amd64.tar.gz"
@ -40,10 +40,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
vb.customize ["modifyvm", :id, "--memory", "2048"] vb.customize ["modifyvm", :id, "--memory", "2048"]
end end
config.vm.synced_folder "../", "/home/vagrant/src/github.com/kubernetes/deployment-manager" config.vm.synced_folder "../", "/home/vagrant/src/github.com/kubernetes/helm"
config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.provision :shell, inline: $bootstrap config.vm.provision :shell, inline: $bootstrap
config.vm.provision :shell, inline: $helm config.vm.provision :shell, inline: $helm
end end

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Run this from deployment-manager root to build and push the dm client plus # Run this from helm root to build and push the dm client plus
# kubernetes install config into the publicly readable GCS bucket gs://get-dm. # kubernetes install config into the publicly readable GCS bucket gs://get-dm.
# #
# Must have EDIT permissions on the dm-k8s-prod GCP project. # Must have EDIT permissions on the dm-k8s-prod GCP project.

@ -28,7 +28,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/kubernetes/deployment-manager/pkg/log" "github.com/kubernetes/helm/pkg/log"
) )
// ChartfileName is the default Chart file name. // ChartfileName is the default Chart file name.

@ -21,7 +21,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/kubernetes/deployment-manager/pkg/log" "github.com/kubernetes/helm/pkg/log"
) )
const ( const (

@ -24,7 +24,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/kubernetes/deployment-manager/pkg/log" "github.com/kubernetes/helm/pkg/log"
) )
// Save creates an archived chart to the given directory. // Save creates an archived chart to the given directory.

@ -31,7 +31,7 @@ import (
"time" "time"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
) )
// DefaultHTTPTimeout is the default HTTP timeout. // DefaultHTTPTimeout is the default HTTP timeout.

@ -23,7 +23,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
) )
func TestDefaultServerURL(t *testing.T) { func TestDefaultServerURL(t *testing.T) {

@ -21,8 +21,8 @@ import (
"text/template" "text/template"
"github.com/Masterminds/sprig" "github.com/Masterminds/sprig"
"github.com/kubernetes/deployment-manager/pkg/format" "github.com/kubernetes/helm/pkg/format"
"github.com/kubernetes/deployment-manager/pkg/kubectl" "github.com/kubernetes/helm/pkg/kubectl"
) )
// Installer is capable of installing DM into Kubernetes. // Installer is capable of installing DM into Kubernetes.

@ -17,7 +17,7 @@ limitations under the License.
package client package client
import ( import (
"github.com/kubernetes/deployment-manager/pkg/kubectl" "github.com/kubernetes/helm/pkg/kubectl"
) )
// Uninstall uses kubectl to uninstall the base DM. // Uninstall uses kubectl to uninstall the base DM.

@ -22,7 +22,7 @@ import (
"log" "log"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
) )
// FilebasedCredentialProvider provides credentials for registries. // FilebasedCredentialProvider provides credentials for registries.

@ -19,7 +19,7 @@ package registry
import ( import (
"testing" "testing"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
) )
var filename = "./test/test_credentials_file.yaml" var filename = "./test/test_credentials_file.yaml"

@ -17,8 +17,8 @@ limitations under the License.
package registry package registry
import ( import (
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
// "golang.org/x/net/context" // "golang.org/x/net/context"
// "golang.org/x/oauth2/google" // "golang.org/x/oauth2/google"

@ -18,7 +18,7 @@ package registry
import ( import (
"github.com/google/go-github/github" "github.com/google/go-github/github"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"fmt" "fmt"
"log" "log"

@ -18,8 +18,8 @@ package registry
import ( import (
"github.com/google/go-github/github" "github.com/google/go-github/github"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
"fmt" "fmt"
"net/http" "net/http"

@ -18,7 +18,7 @@ package registry
import ( import (
"github.com/google/go-github/github" "github.com/google/go-github/github"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"fmt" "fmt"
"log" "log"

@ -17,7 +17,7 @@ limitations under the License.
package registry package registry
import ( import (
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"fmt" "fmt"
) )

@ -21,7 +21,7 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
) )
type testCase struct { type testCase struct {

@ -17,8 +17,8 @@ limitations under the License.
package registry package registry
import ( import (
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
"fmt" "fmt"
"strings" "strings"

@ -17,8 +17,8 @@ limitations under the License.
package registry package registry
import ( import (
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
"fmt" "fmt"
"net/url" "net/url"

@ -18,8 +18,8 @@ package registry
import ( import (
"github.com/google/go-github/github" "github.com/google/go-github/github"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"golang.org/x/oauth2/google" "golang.org/x/oauth2/google"
storage "google.golang.org/api/storage/v1" storage "google.golang.org/api/storage/v1"

@ -24,8 +24,8 @@ import (
"log" "log"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
) )
var ( var (

@ -22,8 +22,8 @@ import (
"bytes" "bytes"
"io/ioutil" "io/ioutil"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
"github.com/kubernetes/deployment-manager/pkg/util" "github.com/kubernetes/helm/pkg/util"
"fmt" "fmt"
"net/http" "net/http"

@ -21,7 +21,7 @@ import (
"time" "time"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
) )
// ParseKubernetesObject parses a Kubernetes API object in YAML format. // ParseKubernetesObject parses a Kubernetes API object in YAML format.

@ -23,7 +23,7 @@ import (
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
) )
var serviceInput = ` var serviceInput = `

@ -26,7 +26,7 @@ import (
"path/filepath" "path/filepath"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes/deployment-manager/pkg/common" "github.com/kubernetes/helm/pkg/common"
) )
// NewTemplateFromType creates and returns a new template whose content // NewTemplateFromType creates and returns a new template whose content

@ -18,7 +18,7 @@ set -o pipefail
[[ "$TRACE" ]] && set -x [[ "$TRACE" ]] && set -x
readonly REPO=github.com/kubernetes/deployment-manager readonly REPO=github.com/kubernetes/helm
readonly DIR="${GOPATH}/src/${REPO}" readonly DIR="${GOPATH}/src/${REPO}"
source "${DIR}/scripts/common.sh" source "${DIR}/scripts/common.sh"

Loading…
Cancel
Save