From eccb041c0ffa19f76f7fd2d5178372700ffefa5a Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Mon, 12 Jun 2017 10:30:21 -0700 Subject: [PATCH] ref(tiller): cleanup goimports --- pkg/tiller/environment/environment.go | 5 +++-- pkg/tiller/environment/environment_test.go | 5 +++-- pkg/tiller/release_content.go | 1 + pkg/tiller/release_content_test.go | 3 ++- pkg/tiller/release_install.go | 1 + pkg/tiller/release_list.go | 3 ++- pkg/tiller/release_rollback.go | 1 + pkg/tiller/release_rollback_test.go | 5 +++-- pkg/tiller/release_status.go | 2 ++ pkg/tiller/release_status_test.go | 3 ++- pkg/tiller/release_testing_test.go | 3 ++- pkg/tiller/release_uninstall.go | 1 + pkg/tiller/release_uninstall_test.go | 5 +++-- pkg/tiller/release_update.go | 1 + pkg/tiller/release_update_test.go | 5 +++-- pkg/tiller/release_version.go | 1 + 16 files changed, 31 insertions(+), 14 deletions(-) diff --git a/pkg/tiller/environment/environment.go b/pkg/tiller/environment/environment.go index de0dbe33d..caff3f55a 100644 --- a/pkg/tiller/environment/environment.go +++ b/pkg/tiller/environment/environment.go @@ -26,14 +26,15 @@ import ( "io" "time" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/helm/pkg/chartutil" "k8s.io/helm/pkg/engine" "k8s.io/helm/pkg/kube" "k8s.io/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/storage" "k8s.io/helm/pkg/storage/driver" - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/kubectl/resource" ) // TillerNamespaceEnvVar is the environment variable name for the tiller diff --git a/pkg/tiller/environment/environment_test.go b/pkg/tiller/environment/environment_test.go index 916ff602f..2b4b28212 100644 --- a/pkg/tiller/environment/environment_test.go +++ b/pkg/tiller/environment/environment_test.go @@ -22,11 +22,12 @@ import ( "testing" "time" + "k8s.io/kubernetes/pkg/api" + "k8s.io/kubernetes/pkg/kubectl/resource" + "k8s.io/helm/pkg/chartutil" "k8s.io/helm/pkg/kube" "k8s.io/helm/pkg/proto/hapi/chart" - "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/kubectl/resource" ) type mockEngine struct { diff --git a/pkg/tiller/release_content.go b/pkg/tiller/release_content.go index 7586eb2d8..e9f6f05c9 100644 --- a/pkg/tiller/release_content.go +++ b/pkg/tiller/release_content.go @@ -18,6 +18,7 @@ package tiller import ( ctx "golang.org/x/net/context" + "k8s.io/helm/pkg/proto/hapi/services" ) diff --git a/pkg/tiller/release_content_test.go b/pkg/tiller/release_content_test.go index 9a81f1e3f..7c003f709 100644 --- a/pkg/tiller/release_content_test.go +++ b/pkg/tiller/release_content_test.go @@ -17,9 +17,10 @@ limitations under the License. package tiller import ( + "testing" + "k8s.io/helm/pkg/helm" "k8s.io/helm/pkg/proto/hapi/services" - "testing" ) func TestGetReleaseContent(t *testing.T) { diff --git a/pkg/tiller/release_install.go b/pkg/tiller/release_install.go index 79b7b6354..979218840 100644 --- a/pkg/tiller/release_install.go +++ b/pkg/tiller/release_install.go @@ -21,6 +21,7 @@ import ( "strings" ctx "golang.org/x/net/context" + "k8s.io/helm/pkg/chartutil" "k8s.io/helm/pkg/hooks" "k8s.io/helm/pkg/proto/hapi/release" diff --git a/pkg/tiller/release_list.go b/pkg/tiller/release_list.go index 14d5c0d38..9ccc8a686 100644 --- a/pkg/tiller/release_list.go +++ b/pkg/tiller/release_list.go @@ -18,10 +18,11 @@ package tiller import ( "fmt" + "regexp" + "k8s.io/helm/pkg/proto/hapi/release" "k8s.io/helm/pkg/proto/hapi/services" relutil "k8s.io/helm/pkg/releaseutil" - "regexp" ) // ListReleases lists the releases found by the server. diff --git a/pkg/tiller/release_rollback.go b/pkg/tiller/release_rollback.go index 43e06a6b6..9a313ead5 100644 --- a/pkg/tiller/release_rollback.go +++ b/pkg/tiller/release_rollback.go @@ -20,6 +20,7 @@ import ( "fmt" ctx "golang.org/x/net/context" + "k8s.io/helm/pkg/hooks" "k8s.io/helm/pkg/proto/hapi/release" "k8s.io/helm/pkg/proto/hapi/services" diff --git a/pkg/tiller/release_rollback_test.go b/pkg/tiller/release_rollback_test.go index 11ba9d7e2..aa3a764f6 100644 --- a/pkg/tiller/release_rollback_test.go +++ b/pkg/tiller/release_rollback_test.go @@ -17,11 +17,12 @@ limitations under the License. package tiller import ( + "strings" + "testing" + "k8s.io/helm/pkg/helm" "k8s.io/helm/pkg/proto/hapi/release" "k8s.io/helm/pkg/proto/hapi/services" - "strings" - "testing" ) func TestRollbackRelease(t *testing.T) { diff --git a/pkg/tiller/release_status.go b/pkg/tiller/release_status.go index 41eba1174..b39bdab98 100644 --- a/pkg/tiller/release_status.go +++ b/pkg/tiller/release_status.go @@ -19,7 +19,9 @@ package tiller import ( "errors" "fmt" + ctx "golang.org/x/net/context" + "k8s.io/helm/pkg/proto/hapi/release" "k8s.io/helm/pkg/proto/hapi/services" ) diff --git a/pkg/tiller/release_status_test.go b/pkg/tiller/release_status_test.go index 9128b43a1..4ba0f6cd5 100644 --- a/pkg/tiller/release_status_test.go +++ b/pkg/tiller/release_status_test.go @@ -17,10 +17,11 @@ limitations under the License. package tiller import ( + "testing" + "k8s.io/helm/pkg/helm" "k8s.io/helm/pkg/proto/hapi/release" "k8s.io/helm/pkg/proto/hapi/services" - "testing" ) func TestGetReleaseStatus(t *testing.T) { diff --git a/pkg/tiller/release_testing_test.go b/pkg/tiller/release_testing_test.go index 0b3b7768e..f8d92ebcc 100644 --- a/pkg/tiller/release_testing_test.go +++ b/pkg/tiller/release_testing_test.go @@ -17,9 +17,10 @@ limitations under the License. package tiller import ( + "testing" + "k8s.io/helm/pkg/proto/hapi/release" "k8s.io/helm/pkg/proto/hapi/services" - "testing" ) func TestRunReleaseTest(t *testing.T) { diff --git a/pkg/tiller/release_uninstall.go b/pkg/tiller/release_uninstall.go index 54971ee6e..e98488425 100644 --- a/pkg/tiller/release_uninstall.go +++ b/pkg/tiller/release_uninstall.go @@ -21,6 +21,7 @@ import ( "strings" ctx "golang.org/x/net/context" + "k8s.io/helm/pkg/hooks" "k8s.io/helm/pkg/proto/hapi/release" "k8s.io/helm/pkg/proto/hapi/services" diff --git a/pkg/tiller/release_uninstall_test.go b/pkg/tiller/release_uninstall_test.go index ef3afb444..20bfd2486 100644 --- a/pkg/tiller/release_uninstall_test.go +++ b/pkg/tiller/release_uninstall_test.go @@ -17,11 +17,12 @@ limitations under the License. package tiller import ( + "strings" + "testing" + "k8s.io/helm/pkg/helm" "k8s.io/helm/pkg/proto/hapi/release" "k8s.io/helm/pkg/proto/hapi/services" - "strings" - "testing" ) func TestUninstallRelease(t *testing.T) { diff --git a/pkg/tiller/release_update.go b/pkg/tiller/release_update.go index fb30d1661..b9aaa17c5 100644 --- a/pkg/tiller/release_update.go +++ b/pkg/tiller/release_update.go @@ -20,6 +20,7 @@ import ( "fmt" ctx "golang.org/x/net/context" + "k8s.io/helm/pkg/chartutil" "k8s.io/helm/pkg/hooks" "k8s.io/helm/pkg/proto/hapi/release" diff --git a/pkg/tiller/release_update_test.go b/pkg/tiller/release_update_test.go index cba07e11e..7b1618b20 100644 --- a/pkg/tiller/release_update_test.go +++ b/pkg/tiller/release_update_test.go @@ -17,12 +17,13 @@ limitations under the License. package tiller import ( + "strings" + "testing" + "k8s.io/helm/pkg/helm" "k8s.io/helm/pkg/proto/hapi/chart" "k8s.io/helm/pkg/proto/hapi/release" "k8s.io/helm/pkg/proto/hapi/services" - "strings" - "testing" ) func TestUpdateRelease(t *testing.T) { diff --git a/pkg/tiller/release_version.go b/pkg/tiller/release_version.go index 5cf3ff828..66b7137bb 100644 --- a/pkg/tiller/release_version.go +++ b/pkg/tiller/release_version.go @@ -18,6 +18,7 @@ package tiller import ( ctx "golang.org/x/net/context" + "k8s.io/helm/pkg/proto/hapi/services" "k8s.io/helm/pkg/version" )