Merge pull request helm#2570 from adamreese/ref/goimports

ref(tiller): cleanup goimports
blakebarnett · Jun 13, 2017 · 72cd146 · 72cd146
2 parents dece57e + eccb041
commit 72cd146
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ package tiller @@
     import (
     	ctx "golang.org/x/net/context"
     	"k8s.io/helm/pkg/proto/hapi/services"
     )
@@ Expand Down @@