add goimports format action (#3630)

Signed-off-by: Jeff <jeffzhang@yunify.com>
2021-03-30 13:44:24 +08:00
parent 40e3751e43
commit ac275b6e98
561 changed files with 1713 additions and 863 deletions
--- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/clientset.go
+++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/clientset.go
@@ -24,6 +24,7 @@ import (
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"
+
 	crdcalicov3 "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3"
 )

--- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/clientset_generated.go
+++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/clientset_generated.go
@@ -24,6 +24,7 @@ import (
 	"k8s.io/client-go/discovery"
 	fakediscovery "k8s.io/client-go/discovery/fake"
 	"k8s.io/client-go/testing"
+
 	clientset "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned"
 	crdcalicov3 "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3"
 	fakecrdcalicov3 "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake"
--- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/register.go
+++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/fake/register.go
@@ -24,6 +24,7 @@ import (
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+
 	crdcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 )

--- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme/register.go
+++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme/register.go
@@ -24,6 +24,7 @@ import (
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+
 	crdcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 )

--- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/blockaffinity.go
+++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/blockaffinity.go
@@ -26,6 +26,7 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	rest "k8s.io/client-go/rest"
+
 	calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 	scheme "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme"
 )
--- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_blockaffinity.go
+++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_blockaffinity.go
@@ -27,6 +27,7 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	testing "k8s.io/client-go/testing"
+
 	calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 )

--- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ipamblock.go
+++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ipamblock.go
@@ -27,6 +27,7 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	testing "k8s.io/client-go/testing"
+
 	calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 )

--- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ippool.go
+++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_ippool.go
@@ -27,6 +27,7 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	testing "k8s.io/client-go/testing"
+
 	calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 )

--- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_network_client.go
+++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/fake/fake_network_client.go
@@ -21,6 +21,7 @@ package fake
 import (
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
+
 	calicov3 "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3"
 )

--- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ipamblock.go
+++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ipamblock.go
@@ -26,6 +26,7 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	rest "k8s.io/client-go/rest"
+
 	calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 	scheme "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme"
 )
--- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ippool.go
+++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/ippool.go
@@ -26,6 +26,7 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	rest "k8s.io/client-go/rest"
+
 	calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 	scheme "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme"
 )
--- a/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/network_client.go
+++ b/pkg/simple/client/network/ippool/calico/client/clientset/versioned/typed/network/calicov3/network_client.go
@@ -20,6 +20,7 @@ package calicov3

 import (
 	rest "k8s.io/client-go/rest"
+
 	calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 	"kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned/scheme"
 )
--- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/factory.go
+++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/factory.go
@@ -27,6 +27,7 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
+
 	versioned "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned"
 	internalinterfaces "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces"
 	network "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network"
--- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/generic.go
+++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/generic.go
@@ -23,6 +23,7 @@ import (

 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
+
 	calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 )

--- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces/factory_interfaces.go
+++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces/factory_interfaces.go
@@ -24,6 +24,7 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	cache "k8s.io/client-go/tools/cache"
+
 	versioned "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned"
 )

--- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/blockaffinity.go
+++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/blockaffinity.go
@@ -26,6 +26,7 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	cache "k8s.io/client-go/tools/cache"
+
 	networkcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 	versioned "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned"
 	internalinterfaces "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces"
--- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ipamblock.go
+++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ipamblock.go
@@ -26,6 +26,7 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	cache "k8s.io/client-go/tools/cache"
+
 	networkcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 	versioned "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned"
 	internalinterfaces "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces"
--- a/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ippool.go
+++ b/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3/ippool.go
@@ -26,6 +26,7 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	cache "k8s.io/client-go/tools/cache"
+
 	networkcalicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 	versioned "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned"
 	internalinterfaces "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/internalinterfaces"
--- a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/blockaffinity.go
+++ b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/blockaffinity.go
@@ -22,6 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
+
 	calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 )

--- a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ipamblock.go
+++ b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ipamblock.go
@@ -22,6 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
+
 	calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 )

--- a/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ippool.go
+++ b/pkg/simple/client/network/ippool/calico/client/listers/network/calicov3/ippool.go
@@ -22,6 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
+
 	calicov3 "kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 )

--- a/pkg/simple/client/network/ippool/calico/provider.go
+++ b/pkg/simple/client/network/ippool/calico/provider.go
@@ -21,10 +21,11 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	k8sinformers "k8s.io/client-go/informers"
 	"net"
 	"time"

+	k8sinformers "k8s.io/client-go/informers"
+
 	v3 "github.com/projectcalico/libcalico-go/lib/apis/v3"
 	"github.com/projectcalico/libcalico-go/lib/backend/model"
 	cnet "github.com/projectcalico/libcalico-go/lib/net"
@@ -41,6 +42,8 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
 	"kubesphere.io/kubesphere/pkg/apis/network/calicov3"
 	"kubesphere.io/kubesphere/pkg/apis/network/v1alpha1"
 	kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned"
@@ -50,7 +53,6 @@ import (
 	calicoset "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/clientset/versioned"
 	calicoInformer "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions"
 	blockInformer "kubesphere.io/kubesphere/pkg/simple/client/network/ippool/calico/client/informers/externalversions/network/calicov3"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )

 const (
--- a/pkg/simple/client/network/ippool/calico/provider_test.go
+++ b/pkg/simple/client/network/ippool/calico/provider_test.go
@@ -18,13 +18,15 @@ package calico

 import (
 	"flag"
-	tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
 	"testing"

+	tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog"
+
 	"kubesphere.io/kubesphere/pkg/apis/network/v1alpha1"
 	ksfake "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake"
 	"kubesphere.io/kubesphere/pkg/constants"
--- a/pkg/simple/client/network/ippool/ipam/interface.go
+++ b/pkg/simple/client/network/ippool/ipam/interface.go
@@ -18,6 +18,7 @@ package ipam

 import (
 	"github.com/containernetworking/cni/pkg/types/current"
+
 	"kubesphere.io/kubesphere/pkg/apis/network/v1alpha1"
 )

--- a/pkg/simple/client/network/ippool/ipam/ipam.go
+++ b/pkg/simple/client/network/ippool/ipam/ipam.go
@@ -33,11 +33,12 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/klog"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+
 	"kubesphere.io/kubesphere/pkg/apis/network/v1alpha1"
 	kubesphere "kubesphere.io/kubesphere/pkg/client/clientset/versioned"
 	"kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme"
 	"kubesphere.io/kubesphere/pkg/simple/client/network/utils"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )

 const (
--- a/pkg/simple/client/network/ippool/ipam/ipam_test.go
+++ b/pkg/simple/client/network/ippool/ipam/ipam_test.go
@@ -20,13 +20,15 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"testing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog"
+
 	"kubesphere.io/kubesphere/pkg/apis/network/v1alpha1"
 	ksfake "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake"
-	"testing"
 )

 func TestIPAM_blockGenerator(t *testing.T) {
--- a/pkg/simple/client/network/ippool/provider.go
+++ b/pkg/simple/client/network/ippool/provider.go
@@ -22,6 +22,7 @@ import (
 	k8sinformers "k8s.io/client-go/informers"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/util/workqueue"
+
 	networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1"
 	kubesphereclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned"
 	"kubesphere.io/kubesphere/pkg/simple/client/k8s"
--- a/pkg/simple/client/network/ippool/provider_test.go
+++ b/pkg/simple/client/network/ippool/provider_test.go
@@ -21,6 +21,7 @@ import (
 	"testing"

 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	"kubesphere.io/kubesphere/pkg/apis/network/v1alpha1"
 	fakeks "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake"
 	"kubesphere.io/kubesphere/pkg/simple/client/network/ippool/ipam"