The import package sort adjustment in the go file under the openyurt/…

…pkg/yurtctl (#582)
openyurtio · Nov 12, 2021 · 3e3e462 · 3e3e462
1 parent cee6b42
commit 3e3e462
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 29 deletions.
diff --git a/pkg/yurtctl/cmd/cmd.go b/pkg/yurtctl/cmd/cmd.go
@@ -21,6 +21,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/spf13/cobra"
+	flag "github.com/spf13/pflag"
 	"k8s.io/klog"
 
 	"github.com/openyurtio/openyurt/pkg/projectinfo"
@@ -31,8 +33,6 @@ import (
 	"github.com/openyurtio/openyurt/pkg/yurtctl/cmd/reset"
 	"github.com/openyurtio/openyurt/pkg/yurtctl/cmd/revert"
 	"github.com/openyurtio/openyurt/pkg/yurtctl/cmd/yurtinit"
-	"github.com/spf13/cobra"
-	flag "github.com/spf13/pflag"
 )
 
 // NewYurtctlCommand creates a new yurtctl command

diff --git a/pkg/yurtctl/cmd/join/join.go b/pkg/yurtctl/cmd/join/join.go
@@ -22,6 +22,10 @@ import (
 	"io"
 	"os"
 
+	"github.com/lithammer/dedent"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+	flag "github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/util/sets"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
@@ -40,11 +44,7 @@ import (
 	configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config"
 	kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
 
-	"github.com/lithammer/dedent"
 	yurtphase "github.com/openyurtio/openyurt/pkg/yurtctl/cmd/join/phases"
-	"github.com/pkg/errors"
-	"github.com/spf13/cobra"
-	flag "github.com/spf13/pflag"
 )
 
 var (

diff --git a/pkg/yurtctl/cmd/join/phases/join-cloud-node.go b/pkg/yurtctl/cmd/join/phases/join-cloud-node.go
@@ -22,6 +22,8 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/lithammer/dedent"
+	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -39,9 +41,7 @@ import (
 	"k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient"
 	kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
 
-	"github.com/lithammer/dedent"
 	"github.com/openyurtio/openyurt/pkg/yurtctl/constants"
-	"github.com/pkg/errors"
 )
 
 var (

diff --git a/pkg/yurtctl/cmd/reset/reset.go b/pkg/yurtctl/cmd/reset/reset.go
@@ -22,6 +22,9 @@ import (
 	"io"
 	"os"
 
+	"github.com/lithammer/dedent"
+	"github.com/spf13/cobra"
+	flag "github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/util/sets"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/klog"
@@ -38,10 +41,7 @@ import (
 	kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
 	utilruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime"
 
-	"github.com/lithammer/dedent"
 	yurtphases "github.com/openyurtio/openyurt/pkg/yurtctl/cmd/reset/phases"
-	"github.com/spf13/cobra"
-	flag "github.com/spf13/pflag"
 )
 
 var (

diff --git a/pkg/yurtctl/cmd/revert/cloudnode.go b/pkg/yurtctl/cmd/revert/cloudnode.go
@@ -17,14 +17,13 @@ limitations under the License.
 package revert
 
 import (
-	"github.com/spf13/pflag"
-
-	"github.com/openyurtio/openyurt/pkg/yurthub/util"
-
 	"strings"
 
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 	"k8s.io/klog"
+
+	"github.com/openyurtio/openyurt/pkg/yurthub/util"
 )
 
 // RevertCloudNodeOptions has the information required by sub command revert cloudnode

diff --git a/pkg/yurtctl/cmd/revert/edgenode.go b/pkg/yurtctl/cmd/revert/edgenode.go
@@ -17,14 +17,13 @@ limitations under the License.
 package revert
 
 import (
-	"github.com/spf13/pflag"
-
-	"github.com/openyurtio/openyurt/pkg/yurthub/util"
-
 	"strings"
 
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 	"k8s.io/klog"
+
+	"github.com/openyurtio/openyurt/pkg/yurthub/util"
 )
 
 // RevertEdgeNodeOptions has the information required by sub command revert edgenode

diff --git a/pkg/yurtctl/cmd/yurtinit/init.go b/pkg/yurtctl/cmd/yurtinit/init.go
@@ -27,6 +27,10 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/lithammer/dedent"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+	flag "github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/util/sets"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
@@ -48,11 +52,7 @@ import (
 	kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
 	"k8s.io/kubernetes/cmd/kubeadm/app/util/pubkeypin"
 
-	"github.com/lithammer/dedent"
 	yurtphase "github.com/openyurtio/openyurt/pkg/yurtctl/cmd/yurtinit/phases"
-	"github.com/pkg/errors"
-	"github.com/spf13/cobra"
-	flag "github.com/spf13/pflag"
 )
 
 var (

diff --git a/pkg/yurtctl/lock/lock.go b/pkg/yurtctl/lock/lock.go
@@ -22,12 +22,13 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/openyurtio/openyurt/pkg/yurtctl/constants"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/klog"
+
+	"github.com/openyurtio/openyurt/pkg/yurtctl/constants"
 )
 
 const (

diff --git a/pkg/yurtctl/util/edgenode/util.go b/pkg/yurtctl/util/edgenode/util.go
@@ -25,12 +25,11 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/spf13/pflag"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/util/homedir"
 	"k8s.io/klog"
-
-	"github.com/spf13/pflag"
 )
 
 // FileExists determines whether the file exists

diff --git a/pkg/yurtctl/util/system/util.go b/pkg/yurtctl/util/system/util.go
@@ -21,9 +21,9 @@ import (
 	"io/ioutil"
 	"os/exec"
 
+	"github.com/opencontainers/selinux/go-selinux"
 	"k8s.io/klog"
 
-	"github.com/opencontainers/selinux/go-selinux"
 	"github.com/openyurtio/openyurt/pkg/yurtctl/constants"
 	"github.com/openyurtio/openyurt/pkg/yurtctl/util/edgenode"
 )

diff --git a/pkg/yurtctl/util/util.go b/pkg/yurtctl/util/util.go
@@ -27,9 +27,8 @@ import (
 	"strconv"
 	"time"
 
-	"k8s.io/klog"
-
 	pb "gopkg.in/cheggaaa/pb.v1"
+	"k8s.io/klog"
 )
 
 // DownloadFile try to download file from URL and save to savePath multiple times.