From 01828bd2b9ab0bd50b0ffaa34c71914ed8d9c588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CForest-L?= Date: Mon, 24 Aug 2020 10:45:07 +0800 Subject: [PATCH] update add nodes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “Forest-L --- README.md | 2 +- README_zh-CN.md | 2 +- cmd/add.go | 13 +++++++++++++ cmd/{scale.go => add_node.go} | 20 ++++++++++---------- cmd/version.go | 2 +- pkg/{scale/scale.go => add/add.go} | 8 ++++---- pkg/upgrade/upgrade.go | 4 ++-- 7 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 cmd/add.go rename cmd/{scale.go => add_node.go} (53%) rename pkg/{scale/scale.go => add/add.go} (92%) diff --git a/README.md b/README.md index f7cfed59..e6f7d4de 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ You can enable any of them according to your demands. It is highly recommended t Add new node's information to the cluster config file, then apply the changes. ```shell script -./kk scale -f config-sample.yaml +./kk add nodes -f config-sample.yaml ``` ### Delete Nodes diff --git a/README_zh-CN.md b/README_zh-CN.md index 2e00c604..a3aef8ab 100644 --- a/README_zh-CN.md +++ b/README_zh-CN.md @@ -173,7 +173,7 @@ KubeSphere 有多个可插拔功能组件，功能组件的介绍可参考 [配 将新节点的信息添加到群集配置文件，然后应用更改。 ```shell script -./kk scale -f config-sample.yaml +./kk add nodes -f config-sample.yaml ``` ### 删除节点 diff --git a/cmd/add.go b/cmd/add.go new file mode 100644 index 00000000..a726366d --- /dev/null +++ b/cmd/add.go @@ -0,0 +1,13 @@ +package cmd + +import "github.com/spf13/cobra" + +// addCmd represents the add command +var addCmd = &cobra.Command{ + Use: "add", + Short: "Add nodes to kubernetes cluster", +} + +func init() { + rootCmd.AddCommand(addCmd) +} diff --git a/cmd/scale.go b/cmd/add_node.go similarity index 53% rename from cmd/scale.go rename to cmd/add_node.go index 9bfa2134..5b4b6d53 100644 --- a/cmd/scale.go +++ b/cmd/add_node.go @@ -16,24 +16,24 @@ limitations under the License. package cmd import ( - "github.com/kubesphere/kubekey/pkg/scale" + "github.com/kubesphere/kubekey/pkg/add" "github.com/kubesphere/kubekey/pkg/util" "github.com/spf13/cobra" ) -// scaleCmd represents the scale command -var scaleCmd = &cobra.Command{ - Use: "scale", - Short: "Scale a cluster according to the new nodes information from the specified configuration file", +// addNodeCmd represents the nodes command +var addNodesCmd = &cobra.Command{ + Use: "nodes", + Short: "Add a cluster according to the new nodes information from the specified configuration file", RunE: func(cmd *cobra.Command, args []string) error { logger := util.InitLogger(opt.Verbose) - return scale.ScaleCluster(opt.ClusterCfgFile, "", "", logger, false, opt.Verbose, opt.SkipCheck, opt.SkipPullImages) + return add.AddNodes(opt.ClusterCfgFile, "", "", logger, false, opt.Verbose, opt.SkipCheck, opt.SkipPullImages) }, } func init() { - rootCmd.AddCommand(scaleCmd) - scaleCmd.Flags().StringVarP(&opt.ClusterCfgFile, "file", "f", "", "Path to a configuration file") - scaleCmd.Flags().BoolVarP(&opt.SkipCheck, "yes", "y", false, "Skip pre-check of the installation") - scaleCmd.Flags().BoolVarP(&opt.SkipPullImages, "skip-pull-images", "", false, "Skip pre pull images") + addCmd.AddCommand(addNodesCmd) + addNodesCmd.Flags().StringVarP(&opt.ClusterCfgFile, "file", "f", "", "Path to a configuration file") + addNodesCmd.Flags().BoolVarP(&opt.SkipCheck, "yes", "y", false, "Skip pre-check of the installation") + addNodesCmd.Flags().BoolVarP(&opt.SkipPullImages, "skip-pull-images", "", false, "Skip pre pull images") } diff --git a/cmd/version.go b/cmd/version.go index 2b57d590..542d9fb7 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -24,7 +24,7 @@ import ( var shortVersion bool -// versionCmd represents the scale command +// versionCmd represents the add command var versionCmd = &cobra.Command{ Use: "version", Short: "print the client version information", diff --git a/pkg/scale/scale.go b/pkg/add/add.go similarity index 92% rename from pkg/scale/scale.go rename to pkg/add/add.go index f24f4918..9898d47a 100644 --- a/pkg/scale/scale.go +++ b/pkg/add/add.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package scale +package add import ( "fmt" @@ -32,7 +32,7 @@ import ( "path/filepath" ) -func ScaleCluster(clusterCfgFile, k8sVersion, ksVersion string, logger *log.Logger, ksEnabled, verbose, skipCheck, skipPullImages bool) error { +func AddNodes(clusterCfgFile, k8sVersion, ksVersion string, logger *log.Logger, ksEnabled, verbose, skipCheck, skipPullImages bool) error { currentDir, err := filepath.Abs(filepath.Dir(os.Args[0])) if err != nil { return errors.Wrap(err, "Faild to get current dir") @@ -50,7 +50,7 @@ func ScaleCluster(clusterCfgFile, k8sVersion, ksVersion string, logger *log.Logg } func ExecTasks(mgr *manager.Manager) error { - scaleTasks := []manager.Task{ + addNodeTasks := []manager.Task{ {Task: preinstall.Precheck, ErrMsg: "Failed to precheck"}, {Task: preinstall.DownloadBinaries, ErrMsg: "Failed to download kube binaries"}, {Task: preinstall.InitOS, ErrMsg: "Failed to init OS"}, @@ -66,7 +66,7 @@ func ExecTasks(mgr *manager.Manager) error { {Task: kubernetes.JoinNodesToCluster, ErrMsg: "Failed to join node"}, } - for _, step := range scaleTasks { + for _, step := range addNodeTasks { if err := step.Run(mgr); err != nil { return errors.Wrap(err, step.ErrMsg) } diff --git a/pkg/upgrade/upgrade.go b/pkg/upgrade/upgrade.go index 60924403..fd905fa2 100644 --- a/pkg/upgrade/upgrade.go +++ b/pkg/upgrade/upgrade.go @@ -48,7 +48,7 @@ func UpgradeCluster(clusterCfgFile, k8sVersion, ksVersion string, logger *log.Lo } func ExecTasks(mgr *manager.Manager) error { - scaleTasks := []manager.Task{ + upgradeTasks := []manager.Task{ {Task: GetClusterInfo, ErrMsg: "Failed to get cluster info"}, {Task: GetCurrentVersions, ErrMsg: "Failed to get current version"}, {Task: preinstall.InitOS, ErrMsg: "Failed to download kube binaries"}, @@ -58,7 +58,7 @@ func ExecTasks(mgr *manager.Manager) error { {Task: kubesphere.DeployKubeSphere, ErrMsg: "Failed to upgrade kubesphere"}, } - for _, step := range scaleTasks { + for _, step := range upgradeTasks { if err := step.Run(mgr); err != nil { return errors.Wrap(err, step.ErrMsg) }