Merge pull request #3947 from chrislovecnm/goimports

Automatic merge from submit-queue.

updating goimports

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() {

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() {

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() {

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()

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()

upup/pkg/fi/fitasks/keypair_test.go

@@ -17,9 +17,10 @@ limitations under the License.
 package fitasks
 
 import (
-	"k8s.io/kops/upup/pkg/fi"
 	"strings"
 	"testing"
+
+	"k8s.io/kops/upup/pkg/fi"
 )
 
 func TestKeypairDeps(t *testing.T) {