From 4e3abd596aca769513c01e8176859c2cdf6241e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=B0=B8=E6=99=96?=
 <33149983+yanyhui@users.noreply.github.com>
Date: Thu, 11 Nov 2021 18:25:13 +0800
Subject: [PATCH] The import package sort adjustment in the go file under the
 openyurt/pkg/node-servant (#575)

---
 pkg/node-servant/components/yurthub.go | 6 +++---
 pkg/node-servant/convert/options.go    | 4 ++--
 pkg/node-servant/job.go                | 3 ++-
 pkg/node-servant/revert/options.go     | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkg/node-servant/components/yurthub.go b/pkg/node-servant/components/yurthub.go
index 4607a82ea11..4fa0341466e 100644
--- a/pkg/node-servant/components/yurthub.go
+++ b/pkg/node-servant/components/yurthub.go
@@ -26,13 +26,13 @@ import (
 	"strings"
 	"time"
 
+	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/klog"
+
 	enutil "github.com/openyurtio/openyurt/pkg/yurtctl/util/edgenode"
 	"github.com/openyurtio/openyurt/pkg/yurthub/certificate/hubself"
 	"github.com/openyurtio/openyurt/pkg/yurthub/storage/disk"
 	"github.com/openyurtio/openyurt/pkg/yurthub/util"
-
-	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/klog"
 )
 
 const (
diff --git a/pkg/node-servant/convert/options.go b/pkg/node-servant/convert/options.go
index 511be154835..7c3ec302705 100644
--- a/pkg/node-servant/convert/options.go
+++ b/pkg/node-servant/convert/options.go
@@ -21,10 +21,10 @@ import (
 	"os"
 	"time"
 
+	"github.com/spf13/pflag"
+
 	enutil "github.com/openyurtio/openyurt/pkg/yurtctl/util/edgenode"
 	"github.com/openyurtio/openyurt/pkg/yurthub/util"
-
-	"github.com/spf13/pflag"
 )
 
 // Options has the information that required by convert operation
diff --git a/pkg/node-servant/job.go b/pkg/node-servant/job.go
index 73274efa073..e8a40489656 100644
--- a/pkg/node-servant/job.go
+++ b/pkg/node-servant/job.go
@@ -19,11 +19,12 @@ package node_servant
 import (
 	"fmt"
 
-	tmplutil "github.com/openyurtio/openyurt/pkg/yurtctl/util/templates"
 	batchv1 "k8s.io/api/batch/v1"
 	k8sruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/client-go/kubernetes/scheme"
+
+	tmplutil "github.com/openyurtio/openyurt/pkg/yurtctl/util/templates"
 )
 
 // RenderNodeServantJob return k8s job
diff --git a/pkg/node-servant/revert/options.go b/pkg/node-servant/revert/options.go
index 07dde436aeb..9be60c1bbd9 100644
--- a/pkg/node-servant/revert/options.go
+++ b/pkg/node-servant/revert/options.go
@@ -19,9 +19,9 @@ package revert
 import (
 	"os"
 
-	enutil "github.com/openyurtio/openyurt/pkg/yurtctl/util/edgenode"
-
 	"github.com/spf13/pflag"
+
+	enutil "github.com/openyurtio/openyurt/pkg/yurtctl/util/edgenode"
 )
 
 // Options has the information that required by revert operation