diff --git a/_proto/Makefile b/_proto/Makefile index baf437cc5..756934a0b 100644 --- a/_proto/Makefile +++ b/_proto/Makefile @@ -2,7 +2,7 @@ space := $(empty) $(empty) comma := , empty := -import_path = github.com/deis/tiller/pkg/proto/hapi +import_path = github.com/kubernetes/helm/pkg/proto/hapi dst = ../pkg/proto target = go diff --git a/circle.yml b/circle.yml index 2d7c7a450..b6eab93f1 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: GO15VENDOREXPERIMENT: 1 GOPATH: /usr/local/go_workspace HOME: /home/ubuntu - IMPORT_PATH: "github.com/deis/tiller" + IMPORT_PATH: "github.com/kubernetes/helm" PATH: $HOME/go/bin:$PATH GOROOT: $HOME/go diff --git a/cmd/helm/create.go b/cmd/helm/create.go index 7f52d04b2..1cf1e949c 100644 --- a/cmd/helm/create.go +++ b/cmd/helm/create.go @@ -4,7 +4,7 @@ import ( "errors" "path/filepath" - "github.com/deis/tiller/pkg/chart" + "github.com/kubernetes/helm/pkg/chart" "github.com/spf13/cobra" ) diff --git a/cmd/helm/get.go b/cmd/helm/get.go index 9ba031435..c431543bd 100644 --- a/cmd/helm/get.go +++ b/cmd/helm/get.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/deis/tiller/pkg/helm" + "github.com/kubernetes/helm/pkg/helm" "github.com/spf13/cobra" ) diff --git a/cmd/helm/init.go b/cmd/helm/init.go index 24dbde8c2..3fc777c10 100644 --- a/cmd/helm/init.go +++ b/cmd/helm/init.go @@ -6,8 +6,8 @@ import ( "io/ioutil" "os" - "github.com/deis/tiller/pkg/client" - "github.com/deis/tiller/pkg/kubectl" + "github.com/kubernetes/helm/pkg/client" + "github.com/kubernetes/helm/pkg/kubectl" "github.com/spf13/cobra" ) diff --git a/cmd/helm/install.go b/cmd/helm/install.go index 073edfd97..8b515522c 100644 --- a/cmd/helm/install.go +++ b/cmd/helm/install.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" - "github.com/deis/tiller/pkg/chart" - "github.com/deis/tiller/pkg/helm" + "github.com/kubernetes/helm/pkg/chart" + "github.com/kubernetes/helm/pkg/helm" ) const installDesc = ` diff --git a/cmd/helm/lint.go b/cmd/helm/lint.go index 1210d15d0..04eb25c6c 100644 --- a/cmd/helm/lint.go +++ b/cmd/helm/lint.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/deis/tiller/pkg/lint" + "github.com/kubernetes/helm/pkg/lint" "github.com/spf13/cobra" ) diff --git a/cmd/helm/package.go b/cmd/helm/package.go index 98c12ce05..c64784ef4 100644 --- a/cmd/helm/package.go +++ b/cmd/helm/package.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/deis/tiller/pkg/chart" - "github.com/deis/tiller/pkg/repo" + "github.com/kubernetes/helm/pkg/chart" + "github.com/kubernetes/helm/pkg/repo" "github.com/spf13/cobra" ) diff --git a/cmd/helm/remove.go b/cmd/helm/remove.go index cdaf93b13..900c1f06d 100644 --- a/cmd/helm/remove.go +++ b/cmd/helm/remove.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/deis/tiller/pkg/helm" + "github.com/kubernetes/helm/pkg/helm" "github.com/spf13/cobra" ) diff --git a/cmd/helm/repo.go b/cmd/helm/repo.go index 43f32f15a..97612cc78 100644 --- a/cmd/helm/repo.go +++ b/cmd/helm/repo.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/deis/tiller/pkg/repo" "github.com/gosuri/uitable" + "github.com/kubernetes/helm/pkg/repo" "github.com/spf13/cobra" "gopkg.in/yaml.v2" ) diff --git a/cmd/helm/repo_test.go b/cmd/helm/repo_test.go index f4c234ebf..6f29a20d7 100644 --- a/cmd/helm/repo_test.go +++ b/cmd/helm/repo_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/deis/tiller/pkg/repo" + "github.com/kubernetes/helm/pkg/repo" ) func TestRepoAdd(t *testing.T) { diff --git a/cmd/helm/search.go b/cmd/helm/search.go index b4175b99c..9ef651387 100644 --- a/cmd/helm/search.go +++ b/cmd/helm/search.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/deis/tiller/pkg/repo" + "github.com/kubernetes/helm/pkg/repo" "github.com/spf13/cobra" ) diff --git a/cmd/helm/serve.go b/cmd/helm/serve.go index fd713dafd..0673f13e5 100644 --- a/cmd/helm/serve.go +++ b/cmd/helm/serve.go @@ -1,7 +1,7 @@ package main import ( - "github.com/deis/tiller/pkg/repo" + "github.com/kubernetes/helm/pkg/repo" "github.com/spf13/cobra" ) diff --git a/cmd/helm/status.go b/cmd/helm/status.go index 2a1ec08ed..5a381545d 100644 --- a/cmd/helm/status.go +++ b/cmd/helm/status.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/deis/tiller/pkg/helm" - "github.com/deis/tiller/pkg/timeconv" + "github.com/kubernetes/helm/pkg/helm" + "github.com/kubernetes/helm/pkg/timeconv" "github.com/spf13/cobra" ) diff --git a/cmd/tiller/environment/environment.go b/cmd/tiller/environment/environment.go index e8949b1cd..e9140bf1f 100644 --- a/cmd/tiller/environment/environment.go +++ b/cmd/tiller/environment/environment.go @@ -1,10 +1,10 @@ package environment import ( - "github.com/deis/tiller/pkg/engine" - "github.com/deis/tiller/pkg/proto/hapi/chart" - "github.com/deis/tiller/pkg/proto/hapi/release" - "github.com/deis/tiller/pkg/storage" + "github.com/kubernetes/helm/pkg/engine" + "github.com/kubernetes/helm/pkg/proto/hapi/chart" + "github.com/kubernetes/helm/pkg/proto/hapi/release" + "github.com/kubernetes/helm/pkg/storage" ) // GoTplEngine is the name of the Go template engine, as registered in the EngineYard. diff --git a/cmd/tiller/environment/environment_test.go b/cmd/tiller/environment/environment_test.go index 5cfbf22ae..abdb015bc 100644 --- a/cmd/tiller/environment/environment_test.go +++ b/cmd/tiller/environment/environment_test.go @@ -3,8 +3,8 @@ package environment import ( "testing" - "github.com/deis/tiller/pkg/proto/hapi/chart" - "github.com/deis/tiller/pkg/proto/hapi/release" + "github.com/kubernetes/helm/pkg/proto/hapi/chart" + "github.com/kubernetes/helm/pkg/proto/hapi/release" ) type mockEngine struct { diff --git a/cmd/tiller/release_server.go b/cmd/tiller/release_server.go index 887968803..68f37daf4 100644 --- a/cmd/tiller/release_server.go +++ b/cmd/tiller/release_server.go @@ -5,10 +5,10 @@ import ( "errors" "log" - "github.com/deis/tiller/cmd/tiller/environment" - "github.com/deis/tiller/pkg/proto/hapi/release" - "github.com/deis/tiller/pkg/proto/hapi/services" - "github.com/deis/tiller/pkg/timeconv" + "github.com/kubernetes/helm/cmd/tiller/environment" + "github.com/kubernetes/helm/pkg/proto/hapi/release" + "github.com/kubernetes/helm/pkg/proto/hapi/services" + "github.com/kubernetes/helm/pkg/timeconv" "github.com/technosophos/moniker" ctx "golang.org/x/net/context" ) diff --git a/cmd/tiller/release_server_test.go b/cmd/tiller/release_server_test.go index cf1369a38..ba479253b 100644 --- a/cmd/tiller/release_server_test.go +++ b/cmd/tiller/release_server_test.go @@ -4,13 +4,13 @@ import ( "strings" "testing" - "github.com/deis/tiller/cmd/tiller/environment" - "github.com/deis/tiller/pkg/proto/hapi/chart" - "github.com/deis/tiller/pkg/proto/hapi/release" - "github.com/deis/tiller/pkg/proto/hapi/services" - "github.com/deis/tiller/pkg/storage" - "github.com/deis/tiller/pkg/timeconv" "github.com/golang/protobuf/ptypes/timestamp" + "github.com/kubernetes/helm/cmd/tiller/environment" + "github.com/kubernetes/helm/pkg/proto/hapi/chart" + "github.com/kubernetes/helm/pkg/proto/hapi/release" + "github.com/kubernetes/helm/pkg/proto/hapi/services" + "github.com/kubernetes/helm/pkg/storage" + "github.com/kubernetes/helm/pkg/timeconv" "golang.org/x/net/context" ) diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go index d53d220ba..d1fda6c8f 100644 --- a/cmd/tiller/tiller.go +++ b/cmd/tiller/tiller.go @@ -5,7 +5,7 @@ import ( "net" "os" - "github.com/deis/tiller/cmd/tiller/environment" + "github.com/kubernetes/helm/cmd/tiller/environment" "github.com/spf13/cobra" "google.golang.org/grpc" ) diff --git a/cmd/tiller/tiller_test.go b/cmd/tiller/tiller_test.go index 58a79744e..55f20ef9c 100644 --- a/cmd/tiller/tiller_test.go +++ b/cmd/tiller/tiller_test.go @@ -3,9 +3,9 @@ package main import ( "testing" - "github.com/deis/tiller/cmd/tiller/environment" - "github.com/deis/tiller/pkg/engine" - "github.com/deis/tiller/pkg/storage" + "github.com/kubernetes/helm/cmd/tiller/environment" + "github.com/kubernetes/helm/pkg/engine" + "github.com/kubernetes/helm/pkg/storage" ) // These are canary tests to make sure that the default server actually diff --git a/docs/examples/alpine/Chart.yaml b/docs/examples/alpine/Chart.yaml index 6e9f807e0..0e86771b3 100644 --- a/docs/examples/alpine/Chart.yaml +++ b/docs/examples/alpine/Chart.yaml @@ -1,4 +1,4 @@ name: alpine description: Deploy a basic Alpine Linux pod version: 0.1.0 -home: "https://github.com/deis/tiller" +home: "https://github.com/kubernetes/helm" diff --git a/glide.yaml b/glide.yaml index 5cc7b0744..670332665 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/deis/tiller +package: github.com/kubernetes/helm import: - package: golang.org/x/net version: fb93926129b8ec0056f2f458b1f519654814edf0 diff --git a/pkg/chart/testdata/frobnitz-0.0.1.tgz b/pkg/chart/testdata/frobnitz-0.0.1.tgz index 41f3197a5..83b921979 100644 Binary files a/pkg/chart/testdata/frobnitz-0.0.1.tgz and b/pkg/chart/testdata/frobnitz-0.0.1.tgz differ diff --git a/pkg/client/install.go b/pkg/client/install.go index adf34f8d0..5fb15b20a 100644 --- a/pkg/client/install.go +++ b/pkg/client/install.go @@ -5,7 +5,7 @@ import ( "text/template" "github.com/Masterminds/sprig" - "github.com/deis/tiller/pkg/kubectl" + "github.com/kubernetes/helm/pkg/kubectl" ) // Installer installs tiller into Kubernetes diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 76af245a9..cabd40656 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -7,8 +7,8 @@ import ( "text/template" "github.com/Masterminds/sprig" - chartutil "github.com/deis/tiller/pkg/chart" - "github.com/deis/tiller/pkg/proto/hapi/chart" + chartutil "github.com/kubernetes/helm/pkg/chart" + "github.com/kubernetes/helm/pkg/proto/hapi/chart" ) // 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 6a88fe2bd..305c44769 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -5,8 +5,8 @@ import ( "sync" "testing" - chartutil "github.com/deis/tiller/pkg/chart" - "github.com/deis/tiller/pkg/proto/hapi/chart" + chartutil "github.com/kubernetes/helm/pkg/chart" + "github.com/kubernetes/helm/pkg/proto/hapi/chart" ) func TestEngine(t *testing.T) { diff --git a/pkg/helm/client.go b/pkg/helm/client.go index 69c6b4535..45988f19c 100644 --- a/pkg/helm/client.go +++ b/pkg/helm/client.go @@ -4,7 +4,7 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc" - "github.com/deis/tiller/pkg/proto/hapi/services" + "github.com/kubernetes/helm/pkg/proto/hapi/services" ) type client struct { diff --git a/pkg/helm/helm.go b/pkg/helm/helm.go index 5224d251f..cf9993477 100644 --- a/pkg/helm/helm.go +++ b/pkg/helm/helm.go @@ -1,9 +1,9 @@ package helm import ( - "github.com/deis/tiller/pkg/chart" - chartpb "github.com/deis/tiller/pkg/proto/hapi/chart" - "github.com/deis/tiller/pkg/proto/hapi/services" + "github.com/kubernetes/helm/pkg/chart" + chartpb "github.com/kubernetes/helm/pkg/proto/hapi/chart" + "github.com/kubernetes/helm/pkg/proto/hapi/services" "golang.org/x/net/context" ) diff --git a/pkg/lint/chartfile.go b/pkg/lint/chartfile.go index b8a33a30b..2eb8d2aa6 100644 --- a/pkg/lint/chartfile.go +++ b/pkg/lint/chartfile.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - chartutil "github.com/deis/tiller/pkg/chart" + chartutil "github.com/kubernetes/helm/pkg/chart" ) func Chartfile(basepath string) (m []Message) { diff --git a/pkg/proto/hapi/release/release.pb.go b/pkg/proto/hapi/release/release.pb.go index b97f38f15..6608f64a9 100644 --- a/pkg/proto/hapi/release/release.pb.go +++ b/pkg/proto/hapi/release/release.pb.go @@ -7,8 +7,8 @@ package release import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import hapi_chart "github.com/deis/tiller/pkg/proto/hapi/chart" -import hapi_chart3 "github.com/deis/tiller/pkg/proto/hapi/chart" +import hapi_chart "github.com/kubernetes/helm/pkg/proto/hapi/chart" +import hapi_chart3 "github.com/kubernetes/helm/pkg/proto/hapi/chart" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/pkg/proto/hapi/services/tiller.pb.go b/pkg/proto/hapi/services/tiller.pb.go index 265544d6f..6a4618645 100644 --- a/pkg/proto/hapi/services/tiller.pb.go +++ b/pkg/proto/hapi/services/tiller.pb.go @@ -7,10 +7,10 @@ package services import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import hapi_chart3 "github.com/deis/tiller/pkg/proto/hapi/chart" -import hapi_chart "github.com/deis/tiller/pkg/proto/hapi/chart" -import hapi_release2 "github.com/deis/tiller/pkg/proto/hapi/release" -import hapi_release1 "github.com/deis/tiller/pkg/proto/hapi/release" +import hapi_chart3 "github.com/kubernetes/helm/pkg/proto/hapi/chart" +import hapi_chart "github.com/kubernetes/helm/pkg/proto/hapi/chart" +import hapi_release2 "github.com/kubernetes/helm/pkg/proto/hapi/release" +import hapi_release1 "github.com/kubernetes/helm/pkg/proto/hapi/release" import ( context "golang.org/x/net/context" diff --git a/pkg/repo/local.go b/pkg/repo/local.go index c85e1e618..f7d7245d1 100644 --- a/pkg/repo/local.go +++ b/pkg/repo/local.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/deis/tiller/pkg/chart" + "github.com/kubernetes/helm/pkg/chart" "gopkg.in/yaml.v2" ) diff --git a/pkg/storage/memory.go b/pkg/storage/memory.go index bc57d7c4d..c2e9e8721 100644 --- a/pkg/storage/memory.go +++ b/pkg/storage/memory.go @@ -4,7 +4,7 @@ import ( "errors" "sync" - "github.com/deis/tiller/pkg/proto/hapi/release" + "github.com/kubernetes/helm/pkg/proto/hapi/release" ) // Memory is an in-memory ReleaseStorage implementation. diff --git a/pkg/storage/memory_test.go b/pkg/storage/memory_test.go index d2105b928..93a9d0bd9 100644 --- a/pkg/storage/memory_test.go +++ b/pkg/storage/memory_test.go @@ -3,7 +3,7 @@ package storage import ( "testing" - "github.com/deis/tiller/pkg/proto/hapi/release" + "github.com/kubernetes/helm/pkg/proto/hapi/release" ) func TestCreate(t *testing.T) {