diff --git a/cmd/helm/create.go b/cmd/helm/create.go index a4a09113e..c91dbeff7 100644 --- a/cmd/helm/create.go +++ b/cmd/helm/create.go @@ -24,8 +24,8 @@ import ( "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/pkg/chartutil" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/proto/hapi/chart" ) diff --git a/cmd/helm/dependency_build.go b/cmd/helm/dependency_build.go index 9be3674a2..0a1a3c271 100644 --- a/cmd/helm/dependency_build.go +++ b/cmd/helm/dependency_build.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/pkg/downloader" + "k8s.io/helm/pkg/helmpath" ) const dependencyBuildDesc = ` diff --git a/cmd/helm/dependency_build_test.go b/cmd/helm/dependency_build_test.go index 361d3ed6c..1c79c3b00 100644 --- a/cmd/helm/dependency_build_test.go +++ b/cmd/helm/dependency_build_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/provenance" "k8s.io/helm/pkg/repo" "k8s.io/helm/pkg/repo/repotest" diff --git a/cmd/helm/dependency_update.go b/cmd/helm/dependency_update.go index 794905444..ccc3aefaf 100644 --- a/cmd/helm/dependency_update.go +++ b/cmd/helm/dependency_update.go @@ -20,8 +20,8 @@ import ( "path/filepath" "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/pkg/downloader" + "k8s.io/helm/pkg/helmpath" ) const dependencyUpDesc = ` diff --git a/cmd/helm/dependency_update_test.go b/cmd/helm/dependency_update_test.go index d64601d49..327f9c13b 100644 --- a/cmd/helm/dependency_update_test.go +++ b/cmd/helm/dependency_update_test.go @@ -25,8 +25,8 @@ import ( "github.com/ghodss/yaml" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/pkg/chartutil" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/provenance" "k8s.io/helm/pkg/repo" diff --git a/cmd/helm/fetch.go b/cmd/helm/fetch.go index b4fd83142..fe5c3012d 100644 --- a/cmd/helm/fetch.go +++ b/cmd/helm/fetch.go @@ -24,9 +24,9 @@ import ( "path/filepath" "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/pkg/chartutil" "k8s.io/helm/pkg/downloader" + "k8s.io/helm/pkg/helmpath" ) const fetchDesc = ` diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go index 260821db1..ae577b663 100644 --- a/cmd/helm/helm.go +++ b/cmd/helm/helm.go @@ -32,8 +32,8 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/restclient" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/pkg/helm/portforwarder" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/kube" "k8s.io/helm/pkg/tiller/environment" ) diff --git a/cmd/helm/helm_test.go b/cmd/helm/helm_test.go index b0a5075a7..a681c25f1 100644 --- a/cmd/helm/helm_test.go +++ b/cmd/helm/helm_test.go @@ -29,8 +29,8 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/pkg/helm" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/proto/hapi/release" rls "k8s.io/helm/pkg/proto/hapi/services" diff --git a/cmd/helm/home.go b/cmd/helm/home.go index 59344f075..9f402c917 100644 --- a/cmd/helm/home.go +++ b/cmd/helm/home.go @@ -21,7 +21,7 @@ import ( "io" "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" ) var longHomeHelp = ` diff --git a/cmd/helm/init.go b/cmd/helm/init.go index dd6b949e3..33e4eb0cc 100644 --- a/cmd/helm/init.go +++ b/cmd/helm/init.go @@ -26,8 +26,8 @@ import ( kerrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/cmd/helm/installer" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/repo" ) diff --git a/cmd/helm/init_test.go b/cmd/helm/init_test.go index 00870e23b..07d2471d8 100644 --- a/cmd/helm/init_test.go +++ b/cmd/helm/init_test.go @@ -32,7 +32,7 @@ import ( testcore "k8s.io/kubernetes/pkg/client/testing/core" "k8s.io/kubernetes/pkg/runtime" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" ) func TestInitCmd(t *testing.T) { diff --git a/cmd/helm/install.go b/cmd/helm/install.go index 2e41a7972..c1ce3a5ef 100644 --- a/cmd/helm/install.go +++ b/cmd/helm/install.go @@ -32,11 +32,11 @@ import ( "github.com/ghodss/yaml" "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/cmd/helm/strvals" "k8s.io/helm/pkg/chartutil" "k8s.io/helm/pkg/downloader" "k8s.io/helm/pkg/helm" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/kube" "k8s.io/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/proto/hapi/release" diff --git a/cmd/helm/package.go b/cmd/helm/package.go index d88fcf214..43ca98c9d 100644 --- a/cmd/helm/package.go +++ b/cmd/helm/package.go @@ -29,8 +29,8 @@ import ( "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/pkg/chartutil" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/provenance" "k8s.io/helm/pkg/repo" diff --git a/cmd/helm/package_test.go b/cmd/helm/package_test.go index f72b1d25c..0ce7e97e4 100644 --- a/cmd/helm/package_test.go +++ b/cmd/helm/package_test.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/proto/hapi/chart" ) diff --git a/cmd/helm/plugins.go b/cmd/helm/plugins.go index 6e308aed6..4525d9b94 100644 --- a/cmd/helm/plugins.go +++ b/cmd/helm/plugins.go @@ -25,7 +25,7 @@ import ( "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/plugin" ) diff --git a/cmd/helm/plugins_test.go b/cmd/helm/plugins_test.go index f7cd17848..f4c27651d 100644 --- a/cmd/helm/plugins_test.go +++ b/cmd/helm/plugins_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "github.com/spf13/cobra" ) diff --git a/cmd/helm/repo_add.go b/cmd/helm/repo_add.go index ec764ada9..9abaae96e 100644 --- a/cmd/helm/repo_add.go +++ b/cmd/helm/repo_add.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/repo" ) diff --git a/cmd/helm/repo_add_test.go b/cmd/helm/repo_add_test.go index 7c5342177..9eee738db 100644 --- a/cmd/helm/repo_add_test.go +++ b/cmd/helm/repo_add_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/repo" "k8s.io/helm/pkg/repo/repotest" ) diff --git a/cmd/helm/repo_list.go b/cmd/helm/repo_list.go index a3816facd..8670124a0 100644 --- a/cmd/helm/repo_list.go +++ b/cmd/helm/repo_list.go @@ -24,7 +24,7 @@ import ( "github.com/gosuri/uitable" "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/repo" ) diff --git a/cmd/helm/repo_remove.go b/cmd/helm/repo_remove.go index f7671cab0..144427b58 100644 --- a/cmd/helm/repo_remove.go +++ b/cmd/helm/repo_remove.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/repo" ) diff --git a/cmd/helm/repo_remove_test.go b/cmd/helm/repo_remove_test.go index 12f534972..102691ea0 100644 --- a/cmd/helm/repo_remove_test.go +++ b/cmd/helm/repo_remove_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/repo" "k8s.io/helm/pkg/repo/repotest" ) diff --git a/cmd/helm/repo_update.go b/cmd/helm/repo_update.go index 8e564c98b..c1c86e01c 100644 --- a/cmd/helm/repo_update.go +++ b/cmd/helm/repo_update.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/repo" ) diff --git a/cmd/helm/repo_update_test.go b/cmd/helm/repo_update_test.go index e32e92fbb..6b9e849d9 100644 --- a/cmd/helm/repo_update_test.go +++ b/cmd/helm/repo_update_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/repo" "k8s.io/helm/pkg/repo/repotest" ) diff --git a/cmd/helm/reset.go b/cmd/helm/reset.go index a6c5d42bb..a3193d20b 100644 --- a/cmd/helm/reset.go +++ b/cmd/helm/reset.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/cmd/helm/installer" "k8s.io/helm/pkg/helm" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/kube" "k8s.io/helm/pkg/proto/hapi/release" ) diff --git a/cmd/helm/reset_test.go b/cmd/helm/reset_test.go index 42b7aebce..1833216df 100644 --- a/cmd/helm/reset_test.go +++ b/cmd/helm/reset_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/proto/hapi/release" ) diff --git a/cmd/helm/search.go b/cmd/helm/search.go index a1d57adb0..0fc11b2f0 100644 --- a/cmd/helm/search.go +++ b/cmd/helm/search.go @@ -24,8 +24,8 @@ import ( "github.com/gosuri/uitable" "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/cmd/helm/search" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/repo" ) diff --git a/cmd/helm/serve.go b/cmd/helm/serve.go index 559b987b3..e9ab7cc0c 100644 --- a/cmd/helm/serve.go +++ b/cmd/helm/serve.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/repo" ) diff --git a/pkg/downloader/chart_downloader.go b/pkg/downloader/chart_downloader.go index f5ca166a0..c1b4cccdb 100644 --- a/pkg/downloader/chart_downloader.go +++ b/pkg/downloader/chart_downloader.go @@ -27,7 +27,7 @@ import ( "path/filepath" "strings" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/provenance" "k8s.io/helm/pkg/repo" "k8s.io/helm/pkg/urlutil" diff --git a/pkg/downloader/chart_downloader_test.go b/pkg/downloader/chart_downloader_test.go index e91035d54..df563a763 100644 --- a/pkg/downloader/chart_downloader_test.go +++ b/pkg/downloader/chart_downloader_test.go @@ -25,7 +25,7 @@ import ( "path/filepath" "testing" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/repo" "k8s.io/helm/pkg/repo/repotest" ) diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go index a31895a0b..0abbc73d3 100644 --- a/pkg/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -30,11 +30,8 @@ import ( "github.com/Masterminds/semver" "github.com/ghodss/yaml" - // FIXME: This violates the package rules. A `cmd` should not be imported by - // something in 'pkg' - "k8s.io/helm/cmd/helm/helmpath" - "k8s.io/helm/pkg/chartutil" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/repo" "k8s.io/helm/pkg/resolver" diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go index 4b15e6e09..1c1ecd328 100644 --- a/pkg/downloader/manager_test.go +++ b/pkg/downloader/manager_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/pkg/chartutil" + "k8s.io/helm/pkg/helmpath" ) func TestVersionEquals(t *testing.T) { diff --git a/cmd/helm/helmpath/helmhome.go b/pkg/helmpath/helmhome.go similarity index 100% rename from cmd/helm/helmpath/helmhome.go rename to pkg/helmpath/helmhome.go diff --git a/cmd/helm/helmpath/helmhome_unix_test.go b/pkg/helmpath/helmhome_unix_test.go similarity index 100% rename from cmd/helm/helmpath/helmhome_unix_test.go rename to pkg/helmpath/helmhome_unix_test.go diff --git a/cmd/helm/helmpath/helmhome_windows_test.go b/pkg/helmpath/helmhome_windows_test.go similarity index 100% rename from cmd/helm/helmpath/helmhome_windows_test.go rename to pkg/helmpath/helmhome_windows_test.go diff --git a/pkg/repo/repotest/server.go b/pkg/repo/repotest/server.go index 4bb1f57a9..b0d6ffb5a 100644 --- a/pkg/repo/repotest/server.go +++ b/pkg/repo/repotest/server.go @@ -24,7 +24,7 @@ import ( "github.com/ghodss/yaml" - "k8s.io/helm/cmd/helm/helmpath" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/repo" ) diff --git a/pkg/resolver/resolver.go b/pkg/resolver/resolver.go index b6654a8ac..f6d6291f8 100644 --- a/pkg/resolver/resolver.go +++ b/pkg/resolver/resolver.go @@ -26,8 +26,8 @@ import ( "github.com/Masterminds/semver" - "k8s.io/helm/cmd/helm/helmpath" "k8s.io/helm/pkg/chartutil" + "k8s.io/helm/pkg/helmpath" "k8s.io/helm/pkg/provenance" "k8s.io/helm/pkg/repo" )