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

…cmd/yurt-controller-manager (#627)
openyurtio · Nov 24, 2021 · 2fbebab · 2fbebab
1 parent ee2ff31
commit 2fbebab
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/cmd/yurt-controller-manager/app/config/config.go b/cmd/yurt-controller-manager/app/config/config.go
@@ -18,10 +18,11 @@ limitations under the License.
 package config
 
 import (
-	yurtctrlmgrconfig "github.com/openyurtio/openyurt/pkg/controller/apis/config"
 	clientset "k8s.io/client-go/kubernetes"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/record"
+
+	yurtctrlmgrconfig "github.com/openyurtio/openyurt/pkg/controller/apis/config"
 )
 
 // Config is the main context object for the controller manager.

diff --git a/cmd/yurt-controller-manager/app/controllermanager.go b/cmd/yurt-controller-manager/app/controllermanager.go
@@ -30,12 +30,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/openyurtio/openyurt/cmd/yurt-controller-manager/app/config"
-	"github.com/openyurtio/openyurt/cmd/yurt-controller-manager/app/options"
-	yurtctrlmgrconfig "github.com/openyurtio/openyurt/pkg/controller/apis/config"
-	"github.com/openyurtio/openyurt/pkg/projectinfo"
 	"github.com/spf13/cobra"
-
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -54,6 +49,11 @@ import (
 	genericcontrollermanager "k8s.io/kubernetes/cmd/controller-manager/app"
 	"k8s.io/kubernetes/pkg/controller"
 	utilflag "k8s.io/kubernetes/pkg/util/flag"
+
+	"github.com/openyurtio/openyurt/cmd/yurt-controller-manager/app/config"
+	"github.com/openyurtio/openyurt/cmd/yurt-controller-manager/app/options"
+	yurtctrlmgrconfig "github.com/openyurtio/openyurt/pkg/controller/apis/config"
+	"github.com/openyurtio/openyurt/pkg/projectinfo"
 )
 
 const (

diff --git a/cmd/yurt-controller-manager/app/options/debugging.go b/cmd/yurt-controller-manager/app/options/debugging.go
@@ -18,7 +18,6 @@ package options
 
 import (
 	"github.com/spf13/pflag"
-
 	componentbaseconfig "k8s.io/component-base/config"
 )
 

diff --git a/cmd/yurt-controller-manager/app/options/nodelifecyclecontroller.go b/cmd/yurt-controller-manager/app/options/nodelifecyclecontroller.go
@@ -18,7 +18,6 @@ package options
 
 import (
 	"github.com/spf13/pflag"
-
 	nodelifecycleconfig "k8s.io/kubernetes/pkg/controller/nodelifecycle/config"
 )
 

diff --git a/cmd/yurt-controller-manager/controller-manager.go b/cmd/yurt-controller-manager/controller-manager.go
@@ -26,10 +26,13 @@ import (
 	"os"
 	"time"
 
-	"github.com/openyurtio/openyurt/cmd/yurt-controller-manager/app"
 	"k8s.io/component-base/logs"
-	_ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugin
-	_ "k8s.io/component-base/metrics/prometheus/version"  // for version metric registration
+	// load all the prometheus client-go plugin
+	_ "k8s.io/component-base/metrics/prometheus/clientgo"
+	// for version metric registration
+	_ "k8s.io/component-base/metrics/prometheus/version"
+
+	"github.com/openyurtio/openyurt/cmd/yurt-controller-manager/app"
 )
 
 func main() {

diff --git a/cmd/yurt-node-servant/revert/revert.go b/cmd/yurt-node-servant/revert/revert.go
@@ -17,9 +17,10 @@ limitations under the License.
 package revert
 
 import (
-	"github.com/openyurtio/openyurt/pkg/node-servant/revert"
 	"github.com/spf13/cobra"
 	"k8s.io/klog"
+
+	"github.com/openyurtio/openyurt/pkg/node-servant/revert"
 )
 
 // NewRevertCmd generates a new revert command
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,6 @@ package options @@
     import (
     	"github.com/spf13/pflag"
     	componentbaseconfig "k8s.io/component-base/config"
     )
@@ Expand Down @@