diff --git a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go
index d0046e7768..964ad95e15 100644
--- a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go
@@ -21,10 +21,11 @@ limitations under the License.
 package v1alpha1
 
 import (
+	reflect "reflect"
+
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	reflect "reflect"
 )
 
 func init() {
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
index a7ac140ac0..e65eddfab6 100644
--- a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
+++ b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
@@ -21,10 +21,11 @@ limitations under the License.
 package v1alpha2
 
 import (
+	reflect "reflect"
+
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	reflect "reflect"
 )
 
 func init() {
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go
index 01bcb1dc2b..eb21222720 100644
--- a/pkg/apis/kops/zz_generated.deepcopy.go
+++ b/pkg/apis/kops/zz_generated.deepcopy.go
@@ -21,10 +21,11 @@ limitations under the License.
 package kops
 
 import (
+	reflect "reflect"
+
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	reflect "reflect"
 )
 
 func init() {
diff --git a/pkg/client/clientset_generated/clientset/scheme/register.go b/pkg/client/clientset_generated/clientset/scheme/register.go
index 0c46a3329c..3284ad953b 100644
--- a/pkg/client/clientset_generated/clientset/scheme/register.go
+++ b/pkg/client/clientset_generated/clientset/scheme/register.go
@@ -17,6 +17,8 @@ limitations under the License.
 package scheme
 
 import (
+	os "os"
+
 	announced "k8s.io/apimachinery/pkg/apimachinery/announced"
 	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -24,7 +26,6 @@ import (
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	kops "k8s.io/kops/pkg/apis/kops/install"
-	os "os"
 )
 
 var Scheme = runtime.NewScheme()
diff --git a/pkg/client/clientset_generated/internalclientset/scheme/register.go b/pkg/client/clientset_generated/internalclientset/scheme/register.go
index 0c46a3329c..3284ad953b 100644
--- a/pkg/client/clientset_generated/internalclientset/scheme/register.go
+++ b/pkg/client/clientset_generated/internalclientset/scheme/register.go
@@ -17,6 +17,8 @@ limitations under the License.
 package scheme
 
 import (
+	os "os"
+
 	announced "k8s.io/apimachinery/pkg/apimachinery/announced"
 	registered "k8s.io/apimachinery/pkg/apimachinery/registered"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -24,7 +26,6 @@ import (
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	kops "k8s.io/kops/pkg/apis/kops/install"
-	os "os"
 )
 
 var Scheme = runtime.NewScheme()
diff --git a/pkg/model/bastion.go b/pkg/model/bastion.go
index 4de117b276..5d6f4dd75c 100644
--- a/pkg/model/bastion.go
+++ b/pkg/model/bastion.go
@@ -17,11 +17,12 @@ limitations under the License.
 package model
 
 import (
+	"time"
+
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awstasks"
-	"time"
 )
 
 const BastionELBSecurityGroupPrefix = "bastion"
diff --git a/pkg/pki/csr.go b/pkg/pki/csr.go
index b3a8f3027a..5bf31198d5 100644
--- a/pkg/pki/csr.go
+++ b/pkg/pki/csr.go
@@ -21,9 +21,10 @@ import (
 	"crypto/rsa"
 	"crypto/x509"
 	"fmt"
-	"github.com/golang/glog"
 	"math/big"
 	"time"
+
+	"github.com/golang/glog"
 )
 
 // BuildPKISerial produces a serial number for certs that is vanishingly unlikely to collide
diff --git a/protokube/pkg/gossip/dns/dns.go b/protokube/pkg/gossip/dns/dns.go
index e880b29932..35dd3e0aa2 100644
--- a/protokube/pkg/gossip/dns/dns.go
+++ b/protokube/pkg/gossip/dns/dns.go
@@ -18,11 +18,12 @@ package dns
 
 import (
 	"fmt"
-	"github.com/golang/glog"
-	"k8s.io/kops/protokube/pkg/gossip"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/golang/glog"
+	"k8s.io/kops/protokube/pkg/gossip"
 )
 
 // We don't really support multiple zone ids, but we could
diff --git a/upup/pkg/fi/cloudup/gcetasks/targetpool.go b/upup/pkg/fi/cloudup/gcetasks/targetpool.go
index a888959874..c912f286f5 100644
--- a/upup/pkg/fi/cloudup/gcetasks/targetpool.go
+++ b/upup/pkg/fi/cloudup/gcetasks/targetpool.go
@@ -18,6 +18,7 @@ package gcetasks
 
 import (
 	"fmt"
+
 	"github.com/golang/glog"
 	compute "google.golang.org/api/compute/v0.beta"
 	"k8s.io/kops/upup/pkg/fi"
diff --git a/upup/pkg/fi/k8sapi/k8s_keystore.go b/upup/pkg/fi/k8sapi/k8s_keystore.go
index 26947005eb..294bae4e04 100644
--- a/upup/pkg/fi/k8sapi/k8s_keystore.go
+++ b/upup/pkg/fi/k8sapi/k8s_keystore.go
@@ -19,6 +19,9 @@ package k8sapi
 import (
 	"crypto/x509"
 	"fmt"
+	"math/big"
+	"time"
+
 	"github.com/golang/glog"
 	"k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -27,8 +30,6 @@ import (
 	"k8s.io/kops/pkg/pki"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/util/pkg/vfs"
-	"math/big"
-	"time"
 )
 
 type KubernetesKeystore struct {