From 78f66fed6c295b1a3d187677c37d9bfc978d0d40 Mon Sep 17 00:00:00 2001 From: cuisongliu Date: Wed, 29 Dec 2021 11:55:39 +0800 Subject: [PATCH] merge code to dev (#779) * refactor(dev): fix docs site (#773) (cherry picked from commit 66b7568cc70c2f2a22ff49cd87b93011146fecfa) * refactor(master): cloud,app feature close (#774) * refactor(master): cloud,app feature close (cherry picked from commit 791cbfde6defc8609833448e5542fdb22c63f16a) * refactor(master): cloud,app feature close (#774) * refactor(master): cloud,app feature close (cherry picked from commit 791cbfde6defc8609833448e5542fdb22c63f16a) --- .gitignore | 1 + README.md | 4 +--- cmd/delete.go | 3 +++ cmd/install.go | 2 ++ docs/{v3.0-playbook.md => v2.0.md} | 0 5 files changed, 7 insertions(+), 3 deletions(-) rename docs/{v3.0-playbook.md => v2.0.md} (100%) diff --git a/.gitignore b/.gitignore index ccfe442c60e..a92e38f7306 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ dist test/Note.md .ossutil_checkpoint bin +.run diff --git a/README.md b/README.md index 5d67b1f36e9..80b338abae1 100755 --- a/README.md +++ b/README.md @@ -28,14 +28,12 @@ --- -**文档: _[官方文档](https://www.sealyun.com/instructions), [博客](https://fuckcloudnative.io)_** +**文档: _[官方文档](https://www.sealyun.com/instructions), [英文文档](/README_en.md), [博客](https://fuckcloudnative.io)_** **加入组织: _钉钉群(35371178), [Telegram](https://t.me/gsealyun)_** ![](docs/images/arch.png) -[English Docs](/README_en.md) - # ✨ 支持的环境 ## Linux 发行版, CPU架构 diff --git a/cmd/delete.go b/cmd/delete.go index c3ed7abc1e1..375c83f7a5f 100644 --- a/cmd/delete.go +++ b/cmd/delete.go @@ -17,6 +17,8 @@ package cmd import ( "os" + "github.com/fanux/sealos/pkg/utils/logger" + v1 "github.com/fanux/sealos/pkg/types/v1alpha1" install "github.com/fanux/sealos/pkg/install" @@ -51,6 +53,7 @@ var deleteCmd = &cobra.Command{ _ = appmanager.DeleteApp(cfg, cfgFile) }, PreRun: func(cmd *cobra.Command, args []string) { + logger.Fatal("the delete app feature not support") if install.ExitDeleteCase(AppURL) { _ = cmd.Help() os.Exit(install.ErrorExitOSCase) diff --git a/cmd/install.go b/cmd/install.go index 9abe8e020f0..2f2f4d4aff4 100644 --- a/cmd/install.go +++ b/cmd/install.go @@ -19,6 +19,7 @@ import ( v1 "github.com/fanux/sealos/pkg/types/v1alpha1" "github.com/fanux/sealos/pkg/utils" + "github.com/fanux/sealos/pkg/utils/logger" install "github.com/fanux/sealos/pkg/install" @@ -54,6 +55,7 @@ var installCmd = &cobra.Command{ _ = appmanager.InstallApp(cfg, cfgFile) }, PreRun: func(cmd *cobra.Command, args []string) { + logger.Fatal("the install app feature not support") if install.ExitInstallCase(AppURL) { _ = cmd.Help() os.Exit(install.ErrorExitOSCase) diff --git a/docs/v3.0-playbook.md b/docs/v2.0.md similarity index 100% rename from docs/v3.0-playbook.md rename to docs/v2.0.md