Merge branch 'labring:main' into mv-7

.github/sync_docs.yml

@@ -5,6 +5,8 @@ fanux/sealos-site:
   - source: docs/4.0/i18n/zh-Hans/
     dest: i18n/zh-Hans/docusaurus-plugin-content-docs/current/
     deleteOrphaned: true
+  - source: docs/4.0/i18n/zh-Hans/current.json
+    dest: i18n/zh-Hans/docusaurus-plugin-content-docs/current.json
   - source: docs/4.0/img/
     dest: static/docs/4.0/img/
     deleteOrphaned: true

CHANGELOG/CHANGELOG-4.3.5.md

@@ -0,0 +1,19 @@
+Welcome to the v4.3.5 release of Sealos!🎉🎉!
+
+
+
+## Changelog
+### Bug fixes
+* 715a648081df2aa150d88baf1b8a44d40d1df12f: fix: scp files (#4041) (#4042) (#4043) (@sealos-ci-robot)
+* 7ad66b4e8055eaf7ad14acf60de605e8af987a47: fix: sync cert failed on non default port (#4034) (@cuisongliu)
+### Other work
+* ba3d7c932e5461528c292126205a3cbc35cb4e5f: feature(main): using sreg 0.1.4 build image (#4023) (#4028) (#4029) (@sealos-ci-robot)
+* 881c10cbb35d03950f4de03c12f5c4e2df33d453: fix(4.3): revert cert feature (#4053) (@cuisongliu)
+
+**Full Changelog**: https://github.com/labring/sealos/compare/v4.3.4...v4.3.5
+
+See [the CHANGELOG](https://github.com/labring/sealos/blob/main/CHANGELOG/CHANGELOG.md) for more details.
+
+Your patronage towards Sealos is greatly appreciated 🎉🎉.
+
+If you encounter any problems during its usage, please create an issue in the [GitHub repository](https://github.com/labring/sealos), we're committed to resolving your problem as soon as possible.

CHANGELOG/CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 - [CHANGELOG-5.0.0-alpha1.md](./CHANGELOG-5.0.0-alpha1.md)
 - [CHANGELOG-4.4.0-alpha3.md](./CHANGELOG-4.4.0-alpha3.md)
 - [CHANGELOG-4.4.0-alpha1.md](./CHANGELOG-4.4.0-alpha1.md)
+- [CHANGELOG-4.3.5.md](./CHANGELOG-4.3.5.md)
 - [CHANGELOG-4.3.4.md](./CHANGELOG-4.3.4.md)
 - [CHANGELOG-4.3.3.md](./CHANGELOG-4.3.3.md)
 - [CHANGELOG-4.3.2.md](./CHANGELOG-4.3.2.md)

controllers/app/api/v1/template_types.go

@@ -65,6 +65,7 @@ type TemplateData struct {
 	Readme       string       `json:"readme,omitempty"`
 	Icon         string       `json:"icon,omitempty"`
 	TemplateType TemplateType `json:"templateType"`
+	Draft        bool         `json:"draft,omitempty"`
 	Defaults     Defaults     `json:"defaults,omitempty"`
 	Inputs       Inputs       `json:"inputs,omitempty"`
 }

controllers/app/config/crd/bases/app.sealos.io_instances.yaml

@@ -50,6 +50,8 @@ spec:
                 type: object
               description:
                 type: string
+              draft:
+                type: boolean
               gitRepo:
                 type: string
               icon:

controllers/app/config/crd/bases/app.sealos.io_templates.yaml

@@ -50,6 +50,8 @@ spec:
                 type: object
               description:
                 type: string
+              draft:
+                type: boolean
               gitRepo:
                 type: string
               icon:

controllers/app/deploy/manifests/deploy.yaml

@@ -169,6 +169,8 @@ spec:
                 type: object
               description:
                 type: string
+              draft:
+                type: boolean
               gitRepo:
                 type: string
               icon:
@@ -263,6 +265,8 @@ spec:
                 type: object
               description:
                 type: string
+              draft:
+                type: boolean
               gitRepo:
                 type: string
               icon:

controllers/licenseissuer/preset/main.go

@@ -48,7 +48,7 @@ func main() {
 
 const (
 	// pre-defined user name and password
-	defaultUser     = "root"
+	defaultUser     = "admin"
 	defaultPassword = "sealos2023"
 
 	// kubernetes default user cr is admin

deploy/cloud/README.md

@@ -34,7 +34,7 @@ Other dns api please read: https://github.com/acmesh-official/acme.sh/wiki/dnsap
 We provide a self-signed cert for you to test by default if you didn't provide a cert. You can replace it with your own cert.
 
 ### Kubernetes Setup
-Please read sealos doc to create a kubernetes cluster: https://sealos.io/docs/lifecycle-management/quick-start/installation
+Please read sealos doc to create a kubernetes cluster: https://sealos.io/docs/self-hosting/lifecycle-management/quick-start/deploy-kubernetes
 
 ```shell
 sealos gen labring/kubernetes:v1.25.6\

docs/4.0/docs/Community.md

@@ -1,3 +1,5 @@
+# Community
+
 Sealos is an open source project that is driven by the participation of users and contributors. If you have questions or suggestions about using the product while reading this documentation, please try the following ways to seek support. Our team and community will do their best to help you.
 
 + 💬 Join our [Discord server](https://discord.gg/qzBmGGZGk7) is to chat with Sealos developers and other Sealos users. This is a good place to learn about Sealos and Kubernetes, ask questions, and share your experiences.

docs/4.0/i18n/zh-Hans/quick-start/installation/online-installation.md → docs/4.0/docs/self-hosting/installation.md

@@ -2,7 +2,7 @@
 sidebar_position: 1
 ---
 
-# Sealos 集群在线安装指南
+# 安装 Sealos 集群
 
 ## 准备工作
 
@@ -34,5 +34,5 @@ Sealos 需要使用证书来保证通信安全，默认在您不提供证书的
 执行命令，并根据提示输入参数：
 
 ```bash 
-curl -sfL https://raw.githubusercontent.com/labring/sealos/main/scripts/cloud/install.sh | sudo bash -s
+curl -sfL https://raw.githubusercontent.com/labring/sealos/main/scripts/cloud/install.sh -o /tmp/install.sh && bash /tmp/install.sh 
 ```

docs/4.0/docs/lifecycle-management/lifecycle-management.md → docs/4.0/docs/self-hosting/lifecycle-management/lifecycle-management.md

@@ -62,7 +62,7 @@ $ sealos run labring/redis-operator:3.1.4
 
 For cluster images not available in the Sealos ecosystem, users can easily build and customize their own cluster images. For example:
 
-[Building an Ingress Cluster Image](https://docs.sealos.io/docs/lifecycle-management/quick-start/build-ingress-cluster-image)
+[Building an Ingress Cluster Image](/self-hosting/lifecycle-management/quick-start/build-ingress-cluster-image.md)
 
 You can also customize your own Kubernetes cluster:
 

docs/4.0/docs/lifecycle-management/quick-start/quick-start.md → docs/4.0/docs/self-hosting/lifecycle-management/quick-start/deploy-kubernetes.md

@@ -2,7 +2,7 @@
 sidebar_position: 2
 ---
 
-# Quick Start
+# Install Kubernetes
 
 ## Prerequisites
 
@@ -114,7 +114,7 @@ $ sealos load -i kubernetes.tar
 The remaining installation steps are the same as the online installation.
 ```shell
 $ sealos images # check if the cluster images are successfully imported
-$ sealos run kubernetes:v1.25.0  # Single-node installation, similar for cluster installation
+$ sealos run labring/kubernetes:v1.25.0  # Single-node installation, similar for cluster installation
 ```
 
 ### Quick Start with Cluster Image

docs/4.0/docs/lifecycle-management/quick-start/installation.md → docs/4.0/docs/self-hosting/lifecycle-management/quick-start/install-cli.md

@@ -5,7 +5,7 @@ sidebar_position: 1
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# Installing Sealos
+# Download Sealos CLI
 
 You can get the list of versions by running:
 

docs/4.0/docs/lifecycle-management/reference/sealos/commands/apply.md → docs/4.0/docs/self-hosting/lifecycle-management/reference/sealos/commands/apply.md

@@ -80,6 +80,6 @@ sealos apply -f Clusterfile --values values.yaml
 
 This command will apply the `Clusterfile` based on the values in the `values.yaml` file.
 
-**For more examples, please refer to the [Run Cluster](https://docs.sealos.io/docs/lifecycle-management/operations/run-cluster/) section.**
+**For more examples, please refer to the [Run Cluster](/self-hosting/lifecycle-management/operations/run-cluster/.md) section.**
 
 That's it for the usage guide of the `sealos apply` command. We hope this helps you. If you have any questions or encounter any issues during the process, feel free to ask us.

docs/4.0/docs/lifecycle-management/reference/sealos/commands/build.md → docs/4.0/docs/self-hosting/lifecycle-management/reference/sealos/commands/build.md

@@ -58,12 +58,12 @@ Overall, the `--save-image` option provides a convenient way for Sealos to handl
 
 Here are some detailed examples:
 
-- [Build with Image Manifests](https://docs.sealos.io/docs/lifecycle-management/operations/build-image/build-image-image_list)
-- [Build with Deploy Manifests](https://docs.sealos.io/docs/lifecycle-management/operations/build-image/build-image-manifests)
-- [Build with Helm Charts](https://docs.sealos.io/docs/lifecycle-management/operations/build-image/build-image-helm_charts)
-- [Build with Binary](https://docs.sealos.io/docs/lifecycle-management/operations/build-image/build-image-binary)
-- [Build with go-template](https://docs.sealos.io/docs/lifecycle-management/operations/build-image/build-image-go_template)
-- [Build with exec and scp](https://docs.sealos.io/docs/lifecycle-management/operations/build-image/build-image-scp_exec)
+- [Build with Image Manifests](/self-hosting/lifecycle-management/operations/build-image/build-image-image_list.md)
+- [Build with Deploy Manifests](/self-hosting/lifecycle-management/operations/build-image/build-image-manifests.md)
+- [Build with Helm Charts](/self-hosting/lifecycle-management/operations/build-image/build-image-helm_charts.md)
+- [Build with Binary](/self-hosting/lifecycle-management/operations/build-image/build-image-binary.md)
+- [Build with go-template](/self-hosting/lifecycle-management/operations/build-image/build-image-go_template.md)
+- [Build with exec and scp](/self-hosting/lifecycle-management/operations/build-image/build-image-scp_exec.md)
 
 With the `build` command in Sealos, you can build OCI images based on various instruction files to provide the required images for Sealos. This process includes handling various instructions in Dockerfiles or other instruction files, such as `FROM`, `RUN`, `ADD`, etc., as well as managing image layers, labels, and more. The build process also involves pulling base images, running commands, saving the results, and more. Each step can be finely controlled and customized using the options mentioned above to accommodate different build requirements.
 

docs/4.0/docs/lifecycle-management/reference/sealos/commands/commands.md → docs/4.0/docs/self-hosting/lifecycle-management/reference/sealos/commands/commands.md

@@ -53,4 +53,4 @@ sidebar_position: 0
 
 The `--debug` flag in Sealos is a global flag used to enable debug mode for more detailed information about the system's operation when issues occur.
 
-For installation instructions, please refer to the [Sealos Installation Guide](https://docs.sealos.io/docs/lifecycle-management/quick-start/installation); for a quick start guide, please refer to the [Quick Start Guide](https://docs.sealos.io/docs/lifecycle-management/quick-start/).
+For installation instructions, please refer to the [Sealos Installation Guide](/self-hosting/lifecycle-management/quick-start/installation); for a quick start guide, please refer to the [Quick Start Guide](/self-hosting/lifecycle-management/quick-start/.md).

docs/4.0/docs/lifecycle-management/reference/sealos/commands/gen.md → docs/4.0/docs/self-hosting/lifecycle-management/reference/sealos/commands/gen.md

@@ -44,6 +44,6 @@ After the Clusterfile is generated, users can modify this file according to thei
 
 Example explanations:
 
-- [Custom Configuration Installation](https://docs.sealos.io/docs/lifecycle-management/operations/run-cluster/gen-apply-cluster)
+- [Custom Configuration Installation](/self-hosting/lifecycle-management/operations/run-cluster/gen-apply-cluster.md)
 
 That's the usage guide for the `sealos gen` command, and we hope it has been helpful. If you encounter any problems during usage, feel free to ask us.

docs/4.0/docs/lifecycle-management/reference/sealos/commands/manifest.md → docs/4.0/docs/self-hosting/lifecycle-management/reference/sealos/commands/manifest.md

@@ -17,4 +17,4 @@ Here are some of the major `manifest` subcommands:
 
 With the `sealos manifest` command, you can flexibly manage manifest lists or image indexes, providing support for multi-architecture Docker or OCI images. Users can create custom manifest lists according to their needs, making it convenient to deploy and run Docker images on different hardware architectures.
 
-Users who want to build multi-architecture images through the manifest command can refer to the document [Building Cluster Images that Support Multiple Architectures](https://docs.sealos.io/docs/lifecycle-management/operations/build-image/build-multi-arch-image).
+Users who want to build multi-architecture images through the manifest command can refer to the document [Building Cluster Images that Support Multiple Architectures](/self-hosting/lifecycle-management/operations/build-image/build-multi-arch-image.md).

docs/4.0/docs/lifecycle-management/reference/sealos/commands/run.md → docs/4.0/docs/self-hosting/lifecycle-management/reference/sealos/commands/run.md

@@ -81,4 +81,4 @@ sealos run -e DashBoardPort=8443 mydashboard:latest  --masters 192.168.0.2,192.1
 
 These examples demonstrate the power and flexibility of the `sealos run` command, which can be customized and adjusted according to your needs.
 
-For more examples, please refer to [Run Cluster](https://docs.sealos.io/docs/lifecycle-management/operations/run-cluster).
+For more examples, please refer to [Run Cluster](/self-hosting/lifecycle-management/operations/run-cluster.md).

docs/4.0/docs/lifecycle-management/reference/sealos/sealos.md → docs/4.0/docs/self-hosting/lifecycle-management/reference/sealos/sealos.md

@@ -8,7 +8,7 @@ Sealos is a unified cloud operating system designed to manage cloud-native appli
 
 This chapter provides a user guide for using Sealos, as well as information related to cluster images.
 
-- Sealos User Guide: For detailed information about each command, including all supported parameters and subcommands, please refer to the [sealos](https://docs.sealos.io/docs/lifecycle-management/reference/sealos/commands) reference documentation.
+- Sealos User Guide: For detailed information about each command, including all supported parameters and subcommands, please refer to the [sealos](/self-hosting/lifecycle-management/reference/sealos/commands.md) reference documentation.
 - Cluster Images:
-  - [Rootfs Cluster Images](https://docs.sealos.io/docs/lifecycle-management/reference/sealos/kubernetes-cluster-image)
-  - [Application Cluster Images](https://docs.sealos.io/docs/lifecycle-management/reference/sealos/app-cluster-image)
+  - [Rootfs Cluster Images](/self-hosting/lifecycle-management/reference/sealos/kubernetes-cluster-image.md)
+  - [Application Cluster Images](/self-hosting/lifecycle-management/reference/sealos/app-cluster-image.md)

docs/4.0/i18n/zh-Hans/Community.md

@@ -1,3 +1,5 @@
+# 社区
+
 Sealos 是一个由用户和贡献者参与推动的开源项目，如果您对产品使用存在疑问和建议，可尝试以下方式寻求支持。我们的团队与社区会竭尽所能为您提供帮助。
 
 + 📱 扫码加入社区微信交流群👇

docs/4.0/i18n/zh-Hans/current.json

@@ -23,6 +23,10 @@
     "message": "平台组件",
     "description": "The label for category Platform Components in sidebar docSidebar"
   },
+  "sidebar.docSidebar.category.Self Hosting": {
+    "message": "私有化部署",
+    "description": "The label for the doc item Self Hosting in sidebar docSidebar, linking to the doc Community"
+  },
   "sidebar.docSidebar.category.Cluster Lifecycle Management": {
     "message": "集群生命周期管理",
     "description": "The label for category Cluster Lifecycle Management in sidebar docSidebar"

docs/4.0/i18n/zh-Hans/self-hosting/installation.md

@@ -0,0 +1,43 @@
+---
+sidebar_position: 1
+---
+
+# 安装 Sealos 集群
+
+## 准备工作
+
+### 服务器
+奇数台的master服务器及任意的node服务器，推荐使用ubuntu 22.04 LTS linux发行版，操作系统内核在5.4以上；
+
+配置推荐4c8g，存储100g以上，i.e. 最少一台的服务器配置如下：
+
+|           | cpu | memory | disk |
+|-----------|-----|--------|------|
+| recommend | 4   | 8G     | 100G |
+| minimum   | 2   | 4G     | 60G  |
+
+### 网络
+服务器之间的网络互通，其中`master0`（执行sealos cli的master节点）可以通过ssh免密登陆到其他节点；所有节点间可以互相通信。
+
+### 域名
+你需要一个域名，用于访问 Sealos 及你将部署的各种服务。如果您没有域名，可以使用`nip.io`提供的免费域名服务。
+
+### 证书
+Sealos 需要使用证书来保证通信安全，默认在您不提供证书的情况下我们会使用 [cert-manager](https://cert-manager.io/docs/) 来自动签发证书。
+
+如果您能提供证书，证书需要解析下列域名（假设您提供的域名为：cloud.example.io）：
+- `*.cloud.example.io`
+- `cloud.example.io`
+
+## 安装步骤
+
+执行命令，并根据提示输入参数：
+
+```bash 
+curl -sfL https://raw.githubusercontent.com/labring/sealos/main/scripts/cloud/install.sh -o /tmp/install.sh && bash /tmp/install.sh 
+```
+
+默认的用户名密码：
+
++ 用户名：`root`
++ 密码：`sealos2023`

docs/4.0/i18n/zh-Hans/lifecycle-management/lifecycle-management.md → docs/4.0/i18n/zh-Hans/self-hosting/lifecycle-management/lifecycle-management.md

@@ -62,7 +62,7 @@ $ sealos run labring/redis-operator:3.1.4
 
 对于 Sealos 生态没有的集群镜像，用户可以方便地自己构建和定制属于自己的集群镜像。例如：
 
-[构建一个 ingress 集群镜像](https://docs.sealos.io/docs/lifecycle-management/quick-start/build-ingress-cluster-image)
+[构建一个 ingress 集群镜像](/self-hosting/lifecycle-management/quick-start/build-ingress-cluster-image.md)
 
 您还可以定制一个完全属于自己的 Kubernetes：
 
@@ -82,11 +82,11 @@ sealos run my-kuberentes:v1.25.0 ...
 
 ## 常见问题
 
-**sealos 是 Kubernetes 安装工具吗？**
+**Sealos 是 Kubernetes 安装工具吗？**
 
-安装部署是 Sealos 的一个基本功能，如同单机操作系统有 boot 模块一样，Sealos 的 boot 模块可以很好地管理 Kubernetes 在任何场景下的生命周期。
+安装部署只是 Sealos 的一个基本功能，如同单机操作系统有 Boot 模块一样，Sealos 的 Boot 模块可以很好地管理 Kubernetes 在任何场景下的生命周期。
 
-**sealos 和 rancher、kubesphere 有什么区别？**
+**Sealos 和 Rancher、KubeSphere 有什么区别？**
 
 Sealos 的设计理念是 "化整为零，自由组装，大道至简"。Sealos 利用 Kubernetes 的能力，以简单的方式提供给用户真正需要的东西。用户需要的不一定是 Kubernetes，用户需要的是具体的能力。
 

docs/4.0/i18n/zh-Hans/lifecycle-management/quick-start/quick-start.md → docs/4.0/i18n/zh-Hans/self-hosting/lifecycle-management/quick-start/deploy-kubernetes.md

@@ -2,7 +2,7 @@
 sidebar_position: 2
 ---
 
-# 快速开始
+# 安装 Kubernetes 集群
 
 ## 先决条件 
 
@@ -115,7 +115,7 @@ $ sealos load -i kubernetes.tar
 剩下的安装方式与在线安装一致。
 ```shell
 $ sealos images # 查看集群镜像是否导入成功
-$ sealos run kuberentes:v1.25.0  # 单机安装，集群安装同理
+$ sealos run labring/kuberentes:v1.25.0  # 单机安装，集群安装同理
 ```
 
 ### 快速启动集群

docs/4.0/i18n/zh-Hans/lifecycle-management/quick-start/installation.md → docs/4.0/i18n/zh-Hans/self-hosting/lifecycle-management/quick-start/install-cli.md

@@ -5,7 +5,7 @@ sidebar_position: 1
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# 安装sealos
+# 下载 Sealos 命令行工具
 
 你可以通过运行命令来获取版本列表:
 

docs/4.0/i18n/zh-Hans/lifecycle-management/reference/sealos/commands/apply.md → docs/4.0/i18n/zh-Hans/self-hosting/lifecycle-management/reference/sealos/commands/apply.md

@@ -79,6 +79,6 @@ sealos apply -f Clusterfile --values values.yaml
 
 这条命令会根据 `values.yaml` 文件中的值应用 `Clusterfile`。
 
-**更多示例请参考[启动镜像](https://docs.sealos.io/docs/lifecycle-management/operations/run-cluster/)**
+**更多示例请参考[启动镜像](/self-hosting/lifecycle-management/operations/run-cluster/)**
 
 以上就是 `sealos apply` 命令的使用指南，希望对你有所帮助。如果你在使用过程中遇到任何问题，欢迎向我们提问。