diff --git a/Makefile b/Makefile index ab5ba4e4d..7acf02858 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ all: build .PHONY: build build: - GOBIN=$(BINDIR) $(GO) install $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' github.com/kubernetes/helm/cmd/... + GOBIN=$(BINDIR) $(GO) install $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/... .PHONY: check-docker check-docker: @@ -31,7 +31,7 @@ check-docker: docker-binary: BINDIR = ./rootfs docker-binary: GOFLAGS += -a -installsuffix cgo docker-binary: - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -o $(BINDIR)/tiller $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' github.com/kubernetes/helm/cmd/tiller + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -o $(BINDIR)/tiller $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/tiller .PHONY: docker-build docker-build: check-docker docker-binary diff --git a/README.md b/README.md index c406d00fc..d27e0031f 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Make sure you have the prerequisites: - [Glide](https://glide.sh/) 0.10 or greater with both git and mercurial installed. 1. [Properly set your $GOPATH](https://golang.org/doc/code.html) -2. Clone (or otherwise download) this repository into $GOPATH/src/github.com/kubernetes/helm +2. Clone (or otherwise download) this repository into $GOPATH/src/k8s.io/helm 3. Run `make bootstrap build` You will now have two binaries built: diff --git a/_proto/Makefile b/_proto/Makefile index 756934a0b..1fab11d40 100644 --- a/_proto/Makefile +++ b/_proto/Makefile @@ -2,7 +2,7 @@ space := $(empty) $(empty) comma := , empty := -import_path = github.com/kubernetes/helm/pkg/proto/hapi +import_path = k8s.io/helm/pkg/proto/hapi dst = ../pkg/proto target = go diff --git a/_proto/hapi/chart/metadata.proto b/_proto/hapi/chart/metadata.proto index c8b5e75c3..f64327a4a 100644 --- a/_proto/hapi/chart/metadata.proto +++ b/_proto/hapi/chart/metadata.proto @@ -15,7 +15,7 @@ message Maintainer { // Metadata for a Chart file. This models the structure of a Chart.yaml file. // -// Spec: https://github.com/kubernetes/helm/blob/master/docs/design/chart_format.md#the-chart-file +// Spec: https://k8s.io/helm/blob/master/docs/design/chart_format.md#the-chart-file message Metadata { // The name of the chart string name = 1; diff --git a/circle.yml b/circle.yml index 07825d6e6..17ff50167 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/kubernetes/helm" + IMPORT_PATH: "k8s.io/helm" PATH: $HOME/go/bin:$PATH GOROOT: $HOME/go diff --git a/cmd/helm/create.go b/cmd/helm/create.go index fff8778ae..4270e1bbc 100644 --- a/cmd/helm/create.go +++ b/cmd/helm/create.go @@ -4,8 +4,9 @@ import ( "errors" "path/filepath" - "github.com/kubernetes/helm/pkg/chart" "github.com/spf13/cobra" + + "k8s.io/helm/pkg/chart" ) const createDesc = ` diff --git a/cmd/helm/delete.go b/cmd/helm/delete.go index 73187ee82..1785e73ea 100644 --- a/cmd/helm/delete.go +++ b/cmd/helm/delete.go @@ -3,8 +3,9 @@ package main import ( "errors" - "github.com/kubernetes/helm/pkg/helm" "github.com/spf13/cobra" + + "k8s.io/helm/pkg/helm" ) const deleteDesc = ` diff --git a/cmd/helm/fetch.go b/cmd/helm/fetch.go index 339ad0c9a..4505975d4 100644 --- a/cmd/helm/fetch.go +++ b/cmd/helm/fetch.go @@ -8,9 +8,10 @@ import ( "os" "strings" - "github.com/kubernetes/helm/pkg/chart" - "github.com/kubernetes/helm/pkg/repo" "github.com/spf13/cobra" + + "k8s.io/helm/pkg/chart" + "k8s.io/helm/pkg/repo" ) var untarFile bool diff --git a/cmd/helm/get.go b/cmd/helm/get.go index 015cb815b..fa876d58e 100644 --- a/cmd/helm/get.go +++ b/cmd/helm/get.go @@ -6,9 +6,10 @@ import ( "os" "time" - "github.com/kubernetes/helm/pkg/helm" - "github.com/kubernetes/helm/pkg/timeconv" "github.com/spf13/cobra" + + "k8s.io/helm/pkg/helm" + "k8s.io/helm/pkg/timeconv" ) var getHelp = ` diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go index dbc22c001..b63a122ea 100644 --- a/cmd/helm/helm.go +++ b/cmd/helm/helm.go @@ -6,9 +6,10 @@ import ( "os" "strings" - "github.com/kubernetes/helm/pkg/helm" "github.com/spf13/cobra" "google.golang.org/grpc" + + "k8s.io/helm/pkg/helm" ) const ( diff --git a/cmd/helm/init.go b/cmd/helm/init.go index 0a2e0d2da..cb49b72f3 100644 --- a/cmd/helm/init.go +++ b/cmd/helm/init.go @@ -5,8 +5,9 @@ import ( "fmt" "os" - "github.com/kubernetes/helm/pkg/client" "github.com/spf13/cobra" + + "k8s.io/helm/pkg/client" ) const initDesc = ` diff --git a/cmd/helm/install.go b/cmd/helm/install.go index 7ff8886a6..a8de096c5 100644 --- a/cmd/helm/install.go +++ b/cmd/helm/install.go @@ -9,9 +9,9 @@ import ( "github.com/spf13/cobra" - "github.com/kubernetes/helm/pkg/helm" - "github.com/kubernetes/helm/pkg/proto/hapi/release" - "github.com/kubernetes/helm/pkg/timeconv" + "k8s.io/helm/pkg/helm" + "k8s.io/helm/pkg/proto/hapi/release" + "k8s.io/helm/pkg/timeconv" ) const installDesc = ` diff --git a/cmd/helm/lint.go b/cmd/helm/lint.go index 525015348..e0accf464 100644 --- a/cmd/helm/lint.go +++ b/cmd/helm/lint.go @@ -6,8 +6,9 @@ import ( "os" "path/filepath" - "github.com/kubernetes/helm/pkg/lint" "github.com/spf13/cobra" + + "k8s.io/helm/pkg/lint" ) var longLintHelp = ` diff --git a/cmd/helm/list.go b/cmd/helm/list.go index 51daae61c..277e74870 100644 --- a/cmd/helm/list.go +++ b/cmd/helm/list.go @@ -5,11 +5,12 @@ import ( "strings" "github.com/gosuri/uitable" - "github.com/kubernetes/helm/pkg/helm" - "github.com/kubernetes/helm/pkg/proto/hapi/release" - "github.com/kubernetes/helm/pkg/proto/hapi/services" - "github.com/kubernetes/helm/pkg/timeconv" "github.com/spf13/cobra" + + "k8s.io/helm/pkg/helm" + "k8s.io/helm/pkg/proto/hapi/release" + "k8s.io/helm/pkg/proto/hapi/services" + "k8s.io/helm/pkg/timeconv" ) var listHelp = ` diff --git a/cmd/helm/package.go b/cmd/helm/package.go index f5ac902d8..f6277924f 100644 --- a/cmd/helm/package.go +++ b/cmd/helm/package.go @@ -5,9 +5,10 @@ import ( "os" "path/filepath" - "github.com/kubernetes/helm/pkg/chart" - "github.com/kubernetes/helm/pkg/repo" "github.com/spf13/cobra" + + "k8s.io/helm/pkg/chart" + "k8s.io/helm/pkg/repo" ) const packageDesc = ` diff --git a/cmd/helm/repo.go b/cmd/helm/repo.go index cce323e1c..04e7119d2 100644 --- a/cmd/helm/repo.go +++ b/cmd/helm/repo.go @@ -7,9 +7,10 @@ import ( "path/filepath" "github.com/gosuri/uitable" - "github.com/kubernetes/helm/pkg/repo" "github.com/spf13/cobra" "gopkg.in/yaml.v2" + + "k8s.io/helm/pkg/repo" ) func init() { diff --git a/cmd/helm/repo_test.go b/cmd/helm/repo_test.go index b65013e10..12cd7648b 100644 --- a/cmd/helm/repo_test.go +++ b/cmd/helm/repo_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "github.com/kubernetes/helm/pkg/repo" + "k8s.io/helm/pkg/repo" ) var ( diff --git a/cmd/helm/search.go b/cmd/helm/search.go index 1959deab9..354a51b91 100644 --- a/cmd/helm/search.go +++ b/cmd/helm/search.go @@ -7,8 +7,9 @@ import ( "path/filepath" "strings" - "github.com/kubernetes/helm/pkg/repo" "github.com/spf13/cobra" + + "k8s.io/helm/pkg/repo" ) func init() { diff --git a/cmd/helm/search_test.go b/cmd/helm/search_test.go index 131d78dd3..f643c3bac 100644 --- a/cmd/helm/search_test.go +++ b/cmd/helm/search_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/kubernetes/helm/pkg/repo" + "k8s.io/helm/pkg/repo" ) const testDir = "testdata/" diff --git a/cmd/helm/serve.go b/cmd/helm/serve.go index 0673f13e5..a9460dafa 100644 --- a/cmd/helm/serve.go +++ b/cmd/helm/serve.go @@ -1,8 +1,9 @@ package main import ( - "github.com/kubernetes/helm/pkg/repo" "github.com/spf13/cobra" + + "k8s.io/helm/pkg/repo" ) var serveDesc = `This command starts a local chart repository server that serves the charts saved in your $HELM_HOME/local/ directory.` diff --git a/cmd/helm/status.go b/cmd/helm/status.go index 6e6afa97c..deec52d13 100644 --- a/cmd/helm/status.go +++ b/cmd/helm/status.go @@ -3,9 +3,10 @@ package main import ( "fmt" - "github.com/kubernetes/helm/pkg/helm" - "github.com/kubernetes/helm/pkg/timeconv" "github.com/spf13/cobra" + + "k8s.io/helm/pkg/helm" + "k8s.io/helm/pkg/timeconv" ) var statusHelp = ` diff --git a/cmd/helm/tunnel.go b/cmd/helm/tunnel.go index a626ff59f..9b65fdd0c 100644 --- a/cmd/helm/tunnel.go +++ b/cmd/helm/tunnel.go @@ -6,7 +6,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/labels" - "github.com/kubernetes/helm/pkg/kube" + "k8s.io/helm/pkg/kube" ) // TODO refactor out this global var diff --git a/cmd/helm/update.go b/cmd/helm/update.go index 9d8c160ea..0b1d54b04 100644 --- a/cmd/helm/update.go +++ b/cmd/helm/update.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/kubernetes/helm/pkg/repo" + "k8s.io/helm/pkg/repo" ) var verboseUpdate bool diff --git a/cmd/helm/version.go b/cmd/helm/version.go index 78556f6fb..90a3f8e41 100644 --- a/cmd/helm/version.go +++ b/cmd/helm/version.go @@ -3,9 +3,9 @@ package main import ( "fmt" - "github.com/kubernetes/helm/pkg/version" - "github.com/spf13/cobra" + + "k8s.io/helm/pkg/version" ) func init() { diff --git a/cmd/tiller/environment/environment.go b/cmd/tiller/environment/environment.go index 17ff55959..f0b5ff48c 100644 --- a/cmd/tiller/environment/environment.go +++ b/cmd/tiller/environment/environment.go @@ -9,11 +9,11 @@ package environment import ( "io" - "github.com/kubernetes/helm/pkg/engine" - "github.com/kubernetes/helm/pkg/kube" - "github.com/kubernetes/helm/pkg/proto/hapi/chart" - "github.com/kubernetes/helm/pkg/proto/hapi/release" - "github.com/kubernetes/helm/pkg/storage" + "k8s.io/helm/pkg/engine" + "k8s.io/helm/pkg/kube" + "k8s.io/helm/pkg/proto/hapi/chart" + "k8s.io/helm/pkg/proto/hapi/release" + "k8s.io/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 4ee214356..1b842070f 100644 --- a/cmd/tiller/environment/environment_test.go +++ b/cmd/tiller/environment/environment_test.go @@ -5,8 +5,8 @@ import ( "io" "testing" - "github.com/kubernetes/helm/pkg/proto/hapi/chart" - "github.com/kubernetes/helm/pkg/proto/hapi/release" + "k8s.io/helm/pkg/proto/hapi/chart" + "k8s.io/helm/pkg/proto/hapi/release" ) type mockEngine struct { diff --git a/cmd/tiller/release_server.go b/cmd/tiller/release_server.go index 933f0b318..ce4f061ac 100644 --- a/cmd/tiller/release_server.go +++ b/cmd/tiller/release_server.go @@ -8,13 +8,14 @@ import ( "regexp" "sort" - "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/storage" - "github.com/kubernetes/helm/pkg/timeconv" "github.com/technosophos/moniker" ctx "golang.org/x/net/context" + + "k8s.io/helm/cmd/tiller/environment" + "k8s.io/helm/pkg/proto/hapi/release" + "k8s.io/helm/pkg/proto/hapi/services" + "k8s.io/helm/pkg/storage" + "k8s.io/helm/pkg/timeconv" ) var srv *releaseServer diff --git a/cmd/tiller/release_server_test.go b/cmd/tiller/release_server_test.go index 04b34b285..4a31c2dbe 100644 --- a/cmd/tiller/release_server_test.go +++ b/cmd/tiller/release_server_test.go @@ -7,14 +7,15 @@ import ( "testing" "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" "google.golang.org/grpc/metadata" + + "k8s.io/helm/cmd/tiller/environment" + "k8s.io/helm/pkg/proto/hapi/chart" + "k8s.io/helm/pkg/proto/hapi/release" + "k8s.io/helm/pkg/proto/hapi/services" + "k8s.io/helm/pkg/storage" + "k8s.io/helm/pkg/timeconv" ) func rsFixture() *releaseServer { diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go index f1b209a10..1f563f989 100644 --- a/cmd/tiller/tiller.go +++ b/cmd/tiller/tiller.go @@ -6,9 +6,10 @@ import ( "net/http" "os" - "github.com/kubernetes/helm/cmd/tiller/environment" "github.com/spf13/cobra" "google.golang.org/grpc" + + "k8s.io/helm/cmd/tiller/environment" ) // rootServer is the root gRPC server. diff --git a/cmd/tiller/tiller_test.go b/cmd/tiller/tiller_test.go index 55f20ef9c..e6db6497b 100644 --- a/cmd/tiller/tiller_test.go +++ b/cmd/tiller/tiller_test.go @@ -3,9 +3,9 @@ package main import ( "testing" - "github.com/kubernetes/helm/cmd/tiller/environment" - "github.com/kubernetes/helm/pkg/engine" - "github.com/kubernetes/helm/pkg/storage" + "k8s.io/helm/cmd/tiller/environment" + "k8s.io/helm/pkg/engine" + "k8s.io/helm/pkg/storage" ) // These are canary tests to make sure that the default server actually diff --git a/docs/developers.md b/docs/developers.md index 03dc81a10..2a135cca2 100644 --- a/docs/developers.md +++ b/docs/developers.md @@ -73,7 +73,7 @@ elegant and high-quality open source code so that our users will benefit. Make sure you have read and understood the main CONTRIBUTING guide: -https://github.com/kubernetes/helm/blob/master/CONTRIBUTING.md +https://k8s.io/helm/blob/master/CONTRIBUTING.md We follow the coding standards and guidelines outlined by the Deis project: diff --git a/docs/examples/alpine/Chart.yaml b/docs/examples/alpine/Chart.yaml index cab858d0a..38a4aaa54 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/kubernetes/helm +home: https://k8s.io/helm diff --git a/glide.yaml b/glide.yaml index b70e170f1..042afb189 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/kubernetes/helm +package: k8s.io/helm import: - package: golang.org/x/net version: fb93926129b8ec0056f2f458b1f519654814edf0 diff --git a/pkg/chartutil/chartfile.go b/pkg/chartutil/chartfile.go index 995a496a1..70bfc7ac8 100644 --- a/pkg/chartutil/chartfile.go +++ b/pkg/chartutil/chartfile.go @@ -4,7 +4,8 @@ import ( "io/ioutil" "github.com/ghodss/yaml" - "github.com/kubernetes/helm/pkg/proto/hapi/chart" + + "k8s.io/helm/pkg/proto/hapi/chart" ) // UnmarshalChartfile takes raw Chart.yaml data and unmarshals it. diff --git a/pkg/chartutil/chartfile_test.go b/pkg/chartutil/chartfile_test.go index 8df26b058..39abc1378 100644 --- a/pkg/chartutil/chartfile_test.go +++ b/pkg/chartutil/chartfile_test.go @@ -3,7 +3,7 @@ package chartutil import ( "testing" - "github.com/kubernetes/helm/pkg/proto/hapi/chart" + "k8s.io/helm/pkg/proto/hapi/chart" ) const testfile = "testdata/chartfiletest.yaml" diff --git a/pkg/chartutil/doc.go b/pkg/chartutil/doc.go index 0191c3800..ef93a02e6 100644 --- a/pkg/chartutil/doc.go +++ b/pkg/chartutil/doc.go @@ -22,7 +22,7 @@ For accepting raw compressed tar file data from an io.Reader, the 'chartutil.LoadArchive()' will read in the data, uncompress it, and unpack it into a Chart. -When creating charts in memory, use the 'github.com/kubernetes/helm/pkg/proto/happy/chart' +When creating charts in memory, use the 'k8s.io/helm/pkg/proto/happy/chart' package directly. */ package chartutil diff --git a/pkg/chartutil/load.go b/pkg/chartutil/load.go index 0a8757205..c7b3b6d59 100644 --- a/pkg/chartutil/load.go +++ b/pkg/chartutil/load.go @@ -13,7 +13,8 @@ import ( "strings" "github.com/golang/protobuf/ptypes/any" - "github.com/kubernetes/helm/pkg/proto/hapi/chart" + + "k8s.io/helm/pkg/proto/hapi/chart" ) // Load takes a string name, tries to resolve it to a file or directory, and then loads it. diff --git a/pkg/chartutil/load_test.go b/pkg/chartutil/load_test.go index 2ed052c69..a56c4ab21 100644 --- a/pkg/chartutil/load_test.go +++ b/pkg/chartutil/load_test.go @@ -3,7 +3,7 @@ package chartutil import ( "testing" - "github.com/kubernetes/helm/pkg/proto/hapi/chart" + "k8s.io/helm/pkg/proto/hapi/chart" ) func TestLoadDir(t *testing.T) { diff --git a/pkg/chartutil/save.go b/pkg/chartutil/save.go index 11a2b190e..15af6cb8c 100644 --- a/pkg/chartutil/save.go +++ b/pkg/chartutil/save.go @@ -9,7 +9,8 @@ import ( "path/filepath" "github.com/ghodss/yaml" - "github.com/kubernetes/helm/pkg/proto/hapi/chart" + + "k8s.io/helm/pkg/proto/hapi/chart" ) var headerBytes = []byte("+aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=") diff --git a/pkg/chartutil/save_test.go b/pkg/chartutil/save_test.go index 451d15583..9f162a1cd 100644 --- a/pkg/chartutil/save_test.go +++ b/pkg/chartutil/save_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/kubernetes/helm/pkg/proto/hapi/chart" + "k8s.io/helm/pkg/proto/hapi/chart" ) func TestSave(t *testing.T) { diff --git a/pkg/chartutil/testdata/frobnitz/charts/alpine/Chart.yaml b/pkg/chartutil/testdata/frobnitz/charts/alpine/Chart.yaml index cab858d0a..38a4aaa54 100644 --- a/pkg/chartutil/testdata/frobnitz/charts/alpine/Chart.yaml +++ b/pkg/chartutil/testdata/frobnitz/charts/alpine/Chart.yaml @@ -1,4 +1,4 @@ name: alpine description: Deploy a basic Alpine Linux pod version: 0.1.0 -home: https://github.com/kubernetes/helm +home: https://k8s.io/helm diff --git a/pkg/client/install.go b/pkg/client/install.go index 35fd42f21..1ca9d257a 100644 --- a/pkg/client/install.go +++ b/pkg/client/install.go @@ -6,7 +6,8 @@ import ( "text/template" "github.com/Masterminds/sprig" - "github.com/kubernetes/helm/pkg/kube" + + "k8s.io/helm/pkg/kube" ) // Installer installs tiller into Kubernetes diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index f185c752a..70e809580 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -7,8 +7,9 @@ import ( "text/template" "github.com/Masterminds/sprig" - chartutil "github.com/kubernetes/helm/pkg/chart" - "github.com/kubernetes/helm/pkg/proto/hapi/chart" + + chartutil "k8s.io/helm/pkg/chart" + "k8s.io/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 4783bbd88..aa9cc4110 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -5,8 +5,8 @@ import ( "sync" "testing" - chartutil "github.com/kubernetes/helm/pkg/chart" - "github.com/kubernetes/helm/pkg/proto/hapi/chart" + chartutil "k8s.io/helm/pkg/chart" + "k8s.io/helm/pkg/proto/hapi/chart" ) func TestEngine(t *testing.T) { diff --git a/pkg/helm/client.go b/pkg/helm/client.go index 45988f19c..afbb5a1ff 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/kubernetes/helm/pkg/proto/hapi/services" + "k8s.io/helm/pkg/proto/hapi/services" ) type client struct { diff --git a/pkg/helm/convert.go b/pkg/helm/convert.go index b6a723b40..77d50df0a 100644 --- a/pkg/helm/convert.go +++ b/pkg/helm/convert.go @@ -3,8 +3,8 @@ package helm import ( "bytes" - chartutil "github.com/kubernetes/helm/pkg/chart" - chartpbs "github.com/kubernetes/helm/pkg/proto/hapi/chart" + chartutil "k8s.io/helm/pkg/chart" + chartpbs "k8s.io/helm/pkg/proto/hapi/chart" ) // ChartToProto converts a chart to its Protobuf struct representation. diff --git a/pkg/helm/convert_test.go b/pkg/helm/convert_test.go index 514e0dd68..6fcb024d6 100644 --- a/pkg/helm/convert_test.go +++ b/pkg/helm/convert_test.go @@ -3,8 +3,9 @@ package helm import ( "testing" - chartutil "github.com/kubernetes/helm/pkg/chart" "gopkg.in/yaml.v2" + + chartutil "k8s.io/helm/pkg/chart" ) func TestInstallReleaseOverrides(t *testing.T) { diff --git a/pkg/helm/helm.go b/pkg/helm/helm.go index 5222222b9..24a87aa8d 100644 --- a/pkg/helm/helm.go +++ b/pkg/helm/helm.go @@ -1,9 +1,10 @@ package helm import ( - chartutil "github.com/kubernetes/helm/pkg/chart" - "github.com/kubernetes/helm/pkg/proto/hapi/services" "golang.org/x/net/context" + + chartutil "k8s.io/helm/pkg/chart" + "k8s.io/helm/pkg/proto/hapi/services" ) // Config defines a gRPC client's configuration. diff --git a/pkg/helm/testdata/albatross/Chart.yaml b/pkg/helm/testdata/albatross/Chart.yaml index 94056aff1..e01790950 100644 --- a/pkg/helm/testdata/albatross/Chart.yaml +++ b/pkg/helm/testdata/albatross/Chart.yaml @@ -1,4 +1,4 @@ name: albatross description: testing chart version: 0.1.0 -home: "https://github.com/kubernetes/helm" +home: "https://k8s.io/helm" diff --git a/pkg/helm/traverse.go b/pkg/helm/traverse.go index 8d02f05a0..d9c7d1b8e 100644 --- a/pkg/helm/traverse.go +++ b/pkg/helm/traverse.go @@ -1,7 +1,7 @@ package helm import ( - chartutil "github.com/kubernetes/helm/pkg/chart" + chartutil "k8s.io/helm/pkg/chart" ) // diff --git a/pkg/lint/chartfile.go b/pkg/lint/chartfile.go index ef1c843b3..2a970fddf 100644 --- a/pkg/lint/chartfile.go +++ b/pkg/lint/chartfile.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - chartutil "github.com/kubernetes/helm/pkg/chart" + chartutil "k8s.io/helm/pkg/chart" ) // Chartfile checks the Chart.yaml file for errors and warnings. diff --git a/pkg/lint/values.go b/pkg/lint/values.go index 206392ed9..1fb4773f3 100644 --- a/pkg/lint/values.go +++ b/pkg/lint/values.go @@ -2,9 +2,9 @@ package lint import ( "os" - - "github.com/kubernetes/helm/pkg/chart" "path/filepath" + + "k8s.io/helm/pkg/chart" ) // Values lints a chart's values.toml file. diff --git a/pkg/proto/hapi/chart/metadata.pb.go b/pkg/proto/hapi/chart/metadata.pb.go index ee020f5d2..1109e8b44 100644 --- a/pkg/proto/hapi/chart/metadata.pb.go +++ b/pkg/proto/hapi/chart/metadata.pb.go @@ -28,7 +28,7 @@ func (*Maintainer) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{ // Metadata for a Chart file. This models the structure of a Chart.yaml file. // -// Spec: https://github.com/kubernetes/helm/blob/master/docs/design/chart_format.md#the-chart-file +// Spec: https://k8s.io/helm/blob/master/docs/design/chart_format.md#the-chart-file type Metadata struct { // The name of the chart Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` diff --git a/pkg/proto/hapi/release/release.pb.go b/pkg/proto/hapi/release/release.pb.go index f3a737f52..587a446e5 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/kubernetes/helm/pkg/proto/hapi/chart" -import hapi_chart3 "github.com/kubernetes/helm/pkg/proto/hapi/chart" +import hapi_chart "k8s.io/helm/pkg/proto/hapi/chart" +import hapi_chart3 "k8s.io/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 0dd4b8f3b..dac4868b2 100644 --- a/pkg/proto/hapi/services/tiller.pb.go +++ b/pkg/proto/hapi/services/tiller.pb.go @@ -28,10 +28,10 @@ package services import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -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 hapi_chart3 "k8s.io/helm/pkg/proto/hapi/chart" +import hapi_chart "k8s.io/helm/pkg/proto/hapi/chart" +import hapi_release2 "k8s.io/helm/pkg/proto/hapi/release" +import hapi_release1 "k8s.io/helm/pkg/proto/hapi/release" import ( context "golang.org/x/net/context" diff --git a/pkg/repo/index.go b/pkg/repo/index.go index 99b764e34..f1467c633 100644 --- a/pkg/repo/index.go +++ b/pkg/repo/index.go @@ -7,7 +7,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/kubernetes/helm/pkg/chart" + "k8s.io/helm/pkg/chart" ) var indexPath = "index.yaml" diff --git a/pkg/repo/local.go b/pkg/repo/local.go index 2dbdb98e5..72282e5ea 100644 --- a/pkg/repo/local.go +++ b/pkg/repo/local.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/kubernetes/helm/pkg/chart" + "k8s.io/helm/pkg/chart" ) var localRepoPath string diff --git a/pkg/repo/repo.go b/pkg/repo/repo.go index 74a400577..290f069cc 100644 --- a/pkg/repo/repo.go +++ b/pkg/repo/repo.go @@ -13,7 +13,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/kubernetes/helm/pkg/chart" + "k8s.io/helm/pkg/chart" ) // ChartRepository represents a chart repository diff --git a/pkg/storage/memory.go b/pkg/storage/memory.go index d9c1ac3b5..a761cd150 100644 --- a/pkg/storage/memory.go +++ b/pkg/storage/memory.go @@ -4,7 +4,7 @@ import ( "errors" "sync" - "github.com/kubernetes/helm/pkg/proto/hapi/release" + "k8s.io/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 da95010b3..a1d121491 100644 --- a/pkg/storage/memory_test.go +++ b/pkg/storage/memory_test.go @@ -3,7 +3,7 @@ package storage import ( "testing" - "github.com/kubernetes/helm/pkg/proto/hapi/release" + "k8s.io/helm/pkg/proto/hapi/release" ) func TestCreate(t *testing.T) { diff --git a/versioning.mk b/versioning.mk index e04b99822..3b8645392 100644 --- a/versioning.mk +++ b/versioning.mk @@ -14,7 +14,7 @@ BINARY_VERSION ?= ${GIT_TAG}+${GIT_SHA} IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${DOCKER_VERSION} MUTABLE_IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_VERSION} -LDFLAGS += -X github.com/kubernetes/helm/pkg/version.Version=${BINARY_VERSION} +LDFLAGS += -X k8s.io/helm/pkg/version.Version=${BINARY_VERSION} DOCKER_PUSH = docker push ifeq ($(DOCKER_REGISTRY),gcr.io)