From 509b8e285f10e819c53268c09dfecc35906fa6cd Mon Sep 17 00:00:00 2001 From: chrislovecnm Date: Sun, 17 Dec 2017 15:42:37 -0700 Subject: [PATCH] fixing goimports formatting --- dnsprovider/pkg/dnsprovider/providers/coredns/coredns.go | 7 ++++--- .../pkg/dnsprovider/providers/coredns/coredns_test.go | 3 +-- dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go | 3 ++- dnsprovider/pkg/dnsprovider/providers/coredns/zones.go | 1 + protokube/pkg/protokube/gce_volume.go | 2 +- protokube/pkg/protokube/vsphere_volume.go | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/coredns.go b/dnsprovider/pkg/dnsprovider/providers/coredns/coredns.go index 6748dcc657..ddf4a6b47e 100644 --- a/dnsprovider/pkg/dnsprovider/providers/coredns/coredns.go +++ b/dnsprovider/pkg/dnsprovider/providers/coredns/coredns.go @@ -19,13 +19,14 @@ package coredns import ( "fmt" + "io" + "strconv" + "strings" + etcdc "github.com/coreos/etcd/client" "github.com/golang/glog" "gopkg.in/gcfg.v1" - "io" "k8s.io/kops/dnsprovider/pkg/dnsprovider" - "strconv" - "strings" ) // "coredns" should be used to use this DNS provider diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/coredns_test.go b/dnsprovider/pkg/dnsprovider/providers/coredns/coredns_test.go index c6a121cae4..2d8dc4129d 100644 --- a/dnsprovider/pkg/dnsprovider/providers/coredns/coredns_test.go +++ b/dnsprovider/pkg/dnsprovider/providers/coredns/coredns_test.go @@ -21,14 +21,13 @@ import ( "fmt" "os" "strconv" + "strings" "testing" "k8s.io/kops/dnsprovider/pkg/dnsprovider" corednstesting "k8s.io/kops/dnsprovider/pkg/dnsprovider/providers/coredns/stubs" "k8s.io/kops/dnsprovider/pkg/dnsprovider/rrstype" - "k8s.io/kops/dnsprovider/pkg/dnsprovider/tests" - "strings" ) func newTestInterface() (dnsprovider.Interface, error) { diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go b/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go index 2594ab4183..63f13587a0 100644 --- a/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go +++ b/dnsprovider/pkg/dnsprovider/providers/coredns/rrsets.go @@ -19,13 +19,14 @@ package coredns import ( "encoding/json" "fmt" + "net" + etcdc "github.com/coreos/etcd/client" "github.com/golang/glog" dnsmsg "github.com/miekg/coredns/middleware/etcd/msg" "golang.org/x/net/context" "k8s.io/kops/dnsprovider/pkg/dnsprovider" "k8s.io/kops/dnsprovider/pkg/dnsprovider/rrstype" - "net" ) // Compile time check for interface adherence diff --git a/dnsprovider/pkg/dnsprovider/providers/coredns/zones.go b/dnsprovider/pkg/dnsprovider/providers/coredns/zones.go index 5c2d079813..ded8b07460 100644 --- a/dnsprovider/pkg/dnsprovider/providers/coredns/zones.go +++ b/dnsprovider/pkg/dnsprovider/providers/coredns/zones.go @@ -18,6 +18,7 @@ package coredns import ( "fmt" + "k8s.io/kops/dnsprovider/pkg/dnsprovider" ) diff --git a/protokube/pkg/protokube/gce_volume.go b/protokube/pkg/protokube/gce_volume.go index 1e1fb73452..2ac2893ed5 100644 --- a/protokube/pkg/protokube/gce_volume.go +++ b/protokube/pkg/protokube/gce_volume.go @@ -19,6 +19,7 @@ package protokube import ( "fmt" "net" + "os" "strings" "cloud.google.com/go/compute/metadata" @@ -30,7 +31,6 @@ import ( "k8s.io/kops/protokube/pkg/gossip" gossipgce "k8s.io/kops/protokube/pkg/gossip/gce" "k8s.io/kops/upup/pkg/fi/cloudup/gce" - "os" ) // GCEVolumes is the Volumes implementation for GCE diff --git a/protokube/pkg/protokube/vsphere_volume.go b/protokube/pkg/protokube/vsphere_volume.go index 71c59e356f..74e92bdb65 100644 --- a/protokube/pkg/protokube/vsphere_volume.go +++ b/protokube/pkg/protokube/vsphere_volume.go @@ -23,6 +23,7 @@ import ( "fmt" "io/ioutil" "net" + "os" "os/exec" "runtime" "strings" @@ -30,7 +31,6 @@ import ( "github.com/golang/glog" etcdmanager "k8s.io/kops/protokube/pkg/etcd" "k8s.io/kops/upup/pkg/fi/cloudup/vsphere" - "os" ) const VolumeMetaDataFile = "/vol-metadata/metadata.json"