Merge pull request #3947 from chrislovecnm/goimports

Automatic merge from submit-queue.

updating goimports
This commit is contained in:
Kubernetes Submit Queue 2017-12-13 19:25:43 -08:00 committed by GitHub
commit 0d837bcea8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 6 deletions

View File

@ -21,10 +21,11 @@ limitations under the License.
package v1alpha1 package v1alpha1
import ( import (
reflect "reflect"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
reflect "reflect"
) )
func init() { func init() {

View File

@ -21,10 +21,11 @@ limitations under the License.
package v1alpha2 package v1alpha2
import ( import (
reflect "reflect"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
reflect "reflect"
) )
func init() { func init() {

View File

@ -21,10 +21,11 @@ limitations under the License.
package kops package kops
import ( import (
reflect "reflect"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
reflect "reflect"
) )
func init() { func init() {

View File

@ -17,6 +17,8 @@ limitations under the License.
package scheme package scheme
import ( import (
os "os"
announced "k8s.io/apimachinery/pkg/apimachinery/announced" announced "k8s.io/apimachinery/pkg/apimachinery/announced"
registered "k8s.io/apimachinery/pkg/apimachinery/registered" registered "k8s.io/apimachinery/pkg/apimachinery/registered"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -24,7 +26,6 @@ import (
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer" serializer "k8s.io/apimachinery/pkg/runtime/serializer"
kops "k8s.io/kops/pkg/apis/kops/install" kops "k8s.io/kops/pkg/apis/kops/install"
os "os"
) )
var Scheme = runtime.NewScheme() var Scheme = runtime.NewScheme()

View File

@ -17,6 +17,8 @@ limitations under the License.
package scheme package scheme
import ( import (
os "os"
announced "k8s.io/apimachinery/pkg/apimachinery/announced" announced "k8s.io/apimachinery/pkg/apimachinery/announced"
registered "k8s.io/apimachinery/pkg/apimachinery/registered" registered "k8s.io/apimachinery/pkg/apimachinery/registered"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -24,7 +26,6 @@ import (
schema "k8s.io/apimachinery/pkg/runtime/schema" schema "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer" serializer "k8s.io/apimachinery/pkg/runtime/serializer"
kops "k8s.io/kops/pkg/apis/kops/install" kops "k8s.io/kops/pkg/apis/kops/install"
os "os"
) )
var Scheme = runtime.NewScheme() var Scheme = runtime.NewScheme()

View File

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