Merge pull request #1434 from kadisi/keadm_dir

change keadm cmd dir

20 files changed, 26 insertions, 26 deletions

diff --git a/keadm/Makefile b/keadm/Makefile
index b9c9b3a4a..e695f2efc 100644
--- a/keadm/Makefile
+++ b/keadm/Makefile
@@ -3,7 +3,7 @@ GO_LDFLAGS=-ldflags '$(shell ../hack/lib/version.sh)'
 # make keadm
 .PHONY: default keadm
 keadm: verify 
-	go build $(GO_LDFLAGS) -o keadm keadm.go
+	go build $(GO_LDFLAGS) -o keadm cmd/keadm/keadm.go
 
 .PHONY: verify
 verify:
diff --git a/keadm/app/cmd/cloud/init.go b/keadm/cmd/keadm/app/cmd/cloud/init.go
index 9df719e34..238845bf1 100644
--- a/keadm/app/cmd/cloud/init.go
+++ b/keadm/cmd/keadm/app/cmd/cloud/init.go
@@ -22,8 +22,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	types "github.com/kubeedge/kubeedge/keadm/app/cmd/common"
-	"github.com/kubeedge/kubeedge/keadm/app/cmd/util"
+	types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
+	"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/util"
 )
 
 var (
diff --git a/keadm/app/cmd/cmd.go b/keadm/cmd/keadm/app/cmd/cmd.go
index f5323eac5..5caa0c4d5 100644
--- a/keadm/app/cmd/cmd.go
+++ b/keadm/cmd/keadm/app/cmd/cmd.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	cloud "github.com/kubeedge/kubeedge/keadm/app/cmd/cloud"
-	edge "github.com/kubeedge/kubeedge/keadm/app/cmd/edge"
+	cloud "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/cloud"
+	edge "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/edge"
 )
 
 var (
diff --git a/keadm/app/cmd/common/config.go b/keadm/cmd/keadm/app/cmd/common/config.go
index 91d52a31e..91d52a31e 100644
--- a/keadm/app/cmd/common/config.go
+++ b/keadm/cmd/keadm/app/cmd/common/config.go
diff --git a/keadm/app/cmd/common/constant.go b/keadm/cmd/keadm/app/cmd/common/constant.go
index 76f8c70dd..76f8c70dd 100644
--- a/keadm/app/cmd/common/constant.go
+++ b/keadm/cmd/keadm/app/cmd/common/constant.go
diff --git a/keadm/app/cmd/common/types.go b/keadm/cmd/keadm/app/cmd/common/types.go
index 0dffaf851..0dffaf851 100644
--- a/keadm/app/cmd/common/types.go
+++ b/keadm/cmd/keadm/app/cmd/common/types.go
diff --git a/keadm/app/cmd/edge/join.go b/keadm/cmd/keadm/app/cmd/edge/join.go
index 5b71ae8d1..9838eb025 100644
--- a/keadm/app/cmd/edge/join.go
+++ b/keadm/cmd/keadm/app/cmd/edge/join.go
@@ -22,8 +22,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	types "github.com/kubeedge/kubeedge/keadm/app/cmd/common"
-	"github.com/kubeedge/kubeedge/keadm/app/cmd/util"
+	types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
+	"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/util"
 )
 
 var (
diff --git a/keadm/app/cmd/reset.go b/keadm/cmd/keadm/app/cmd/reset.go
index 32b82bfea..5a697efe1 100644
--- a/keadm/app/cmd/reset.go
+++ b/keadm/cmd/keadm/app/cmd/reset.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	types "github.com/kubeedge/kubeedge/keadm/app/cmd/common"
-	"github.com/kubeedge/kubeedge/keadm/app/cmd/util"
+	types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
+	"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/util"
 )
 
 var (
diff --git a/keadm/app/cmd/util/centosinstaller.go b/keadm/cmd/keadm/app/cmd/util/centosinstaller.go
index b92f4cf2d..f2b5e96c2 100644
--- a/keadm/app/cmd/util/centosinstaller.go
+++ b/keadm/cmd/keadm/app/cmd/util/centosinstaller.go
@@ -20,17 +20,17 @@ import (
 	"fmt"
 	"os/exec"
 
-	types "github.com/kubeedge/kubeedge/keadm/app/cmd/common"
+	types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
 )
 
 //CentOS struct objects shall have information of the tools version to be installed
 //on Hosts having Ubuntu OS.
 //It implements OSTypeInstaller interface
 type CentOS struct {
-	DockerVersion     string
-	KubernetesVersion string
-	KubeEdgeVersion   string
-	IsEdgeNode        bool //True - Edgenode False - Cloudnode
+	DockerVersion      string
+	KubernetesVersion  string
+	KubeEdgeVersion    string
+	IsEdgeNode         bool //True - Edgenode False - Cloudnode
 	K8SImageRepository string
 	K8SPodNetworkCidr  string
 }
diff --git a/keadm/app/cmd/util/cloudconfig.go b/keadm/cmd/keadm/app/cmd/util/cloudconfig.go
index dc0fa47b4..dc0fa47b4 100644
--- a/keadm/app/cmd/util/cloudconfig.go
+++ b/keadm/cmd/keadm/app/cmd/util/cloudconfig.go
diff --git a/keadm/app/cmd/util/cloudinstaller.go b/keadm/cmd/keadm/app/cmd/util/cloudinstaller.go
index 9a6c7aa7b..d9981c853 100644
--- a/keadm/app/cmd/util/cloudinstaller.go
+++ b/keadm/cmd/keadm/app/cmd/util/cloudinstaller.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kubeedge/kubeedge/keadm/app/cmd/common"
+	"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
 )
 
 //KubeCloudInstTool embedes Common struct
diff --git a/keadm/app/cmd/util/common.go b/keadm/cmd/keadm/app/cmd/util/common.go
index e8577743c..d5a005edd 100644
--- a/keadm/app/cmd/util/common.go
+++ b/keadm/cmd/keadm/app/cmd/util/common.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/spf13/pflag"
 
-	types "github.com/kubeedge/kubeedge/keadm/app/cmd/common"
+	types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
 )
 
 //Constants used by installers
diff --git a/keadm/app/cmd/util/dockerinstaller.go b/keadm/cmd/keadm/app/cmd/util/dockerinstaller.go
index 1d85d9bd7..becd368dd 100644
--- a/keadm/app/cmd/util/dockerinstaller.go
+++ b/keadm/cmd/keadm/app/cmd/util/dockerinstaller.go
@@ -19,7 +19,7 @@ package util
 import (
 	"fmt"
 
-	types "github.com/kubeedge/kubeedge/keadm/app/cmd/common"
+	types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
 )
 
 //DockerInstTool embedes Common struct and contains the default docker version
diff --git a/keadm/app/cmd/util/edgecoreinstaller.go b/keadm/cmd/keadm/app/cmd/util/edgecoreinstaller.go
index b901ce317..18dd4dc22 100644
--- a/keadm/app/cmd/util/edgecoreinstaller.go
+++ b/keadm/cmd/keadm/app/cmd/util/edgecoreinstaller.go
@@ -30,7 +30,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	types "github.com/kubeedge/kubeedge/keadm/app/cmd/common"
+	types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
 )
 
 //KubeEdgeInstTool embedes Common struct and contains cloud node ip:port information
diff --git a/keadm/app/cmd/util/k8sinstaller.go b/keadm/cmd/keadm/app/cmd/util/k8sinstaller.go
index 51983bddb..3057cdd6f 100644
--- a/keadm/app/cmd/util/k8sinstaller.go
+++ b/keadm/cmd/keadm/app/cmd/util/k8sinstaller.go
@@ -19,7 +19,7 @@ package util
 import (
 	"fmt"
 
-	types "github.com/kubeedge/kubeedge/keadm/app/cmd/common"
+	types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
 )
 
 //K8SInstTool embedes Common struct and contains the default K8S version and
diff --git a/keadm/app/cmd/util/mqttinstaller.go b/keadm/cmd/keadm/app/cmd/util/mqttinstaller.go
index 82a54bb07..82a54bb07 100644
--- a/keadm/app/cmd/util/mqttinstaller.go
+++ b/keadm/cmd/keadm/app/cmd/util/mqttinstaller.go
diff --git a/keadm/app/cmd/util/ubuntuinstaller.go b/keadm/cmd/keadm/app/cmd/util/ubuntuinstaller.go
index af3cb5857..e6b51cd13 100644
--- a/keadm/app/cmd/util/ubuntuinstaller.go
+++ b/keadm/cmd/keadm/app/cmd/util/ubuntuinstaller.go
@@ -22,7 +22,7 @@ import (
 	"os/exec"
 	"strings"
 
-	types "github.com/kubeedge/kubeedge/keadm/app/cmd/common"
+	types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
 )
 
 const downloadRetryTimes int = 3
@@ -37,10 +37,10 @@ const (
 //on Hosts having Ubuntu OS.
 //It implements OSTypeInstaller interface
 type UbuntuOS struct {
-	DockerVersion     string
-	KubernetesVersion string
-	KubeEdgeVersion   string
-	IsEdgeNode        bool //True - Edgenode False - Cloudnode
+	DockerVersion      string
+	KubernetesVersion  string
+	KubeEdgeVersion    string
+	IsEdgeNode         bool //True - Edgenode False - Cloudnode
 	K8SImageRepository string
 	K8SPodNetworkCidr  string
 }
diff --git a/keadm/app/cmd/version.go b/keadm/cmd/keadm/app/cmd/version.go
index 64282d678..64282d678 100644
--- a/keadm/app/cmd/version.go
+++ b/keadm/cmd/keadm/app/cmd/version.go
diff --git a/keadm/app/keadm.go b/keadm/cmd/keadm/app/keadm.go
index 04d789f42..992ef3dcb 100644
--- a/keadm/app/keadm.go
+++ b/keadm/cmd/keadm/app/keadm.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/spf13/pflag"
 
-	"github.com/kubeedge/kubeedge/keadm/app/cmd"
+	"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd"
 )
 
 //Run executes the keadm command
diff --git a/keadm/keadm.go b/keadm/cmd/keadm/keadm.go
index 416b056ed..76e71eb02 100644
--- a/keadm/keadm.go
+++ b/keadm/cmd/keadm/keadm.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/kubeedge/kubeedge/keadm/app"
+	"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app"
 )
 
 func main() {