diff --git a/content/zh/_ks_components/code/codeEnd.adoc b/content/zh/_ks_components/code/codeEnd.adoc new file mode 100644 index 000000000..87d43697f --- /dev/null +++ b/content/zh/_ks_components/code/codeEnd.adoc @@ -0,0 +1 @@ +---- diff --git a/content/zh/docs/_custom/clusterManagement/clusterManagement-prer-requiredPermission_clusterandproject.adoc b/content/zh/docs/_custom/clusterManagement/clusterManagement-prer-requiredPermission_clusterandproject.adoc index e8c842b36..e9fa4305b 100644 --- a/content/zh/docs/_custom/clusterManagement/clusterManagement-prer-requiredPermission_clusterandproject.adoc +++ b/content/zh/docs/_custom/clusterManagement/clusterManagement-prer-requiredPermission_clusterandproject.adoc @@ -1,2 +1,2 @@ // :ks_include_id: f3341457c4584e59b799240a35ca496d -您需要加入一个集群或项目，并在集群或项目中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:07-cluster-management/09-cluster-settings/04-cluster-roles/[集群角色]和xref:09-project-management/06-project-settings/02-project-roles/[项目角色]。 \ No newline at end of file +您需要加入一个集群或项目，并在集群或项目中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:07-cluster-management/09-cluster-settings/04-cluster-roles/[集群角色]和xref:09-project-management/06-project-settings/02-project-roles/[项目角色]。 diff --git a/content/zh/docs/_custom/clusterManagement/podIpPools/podIpPools-prer-enablePodIpPool.adoc b/content/zh/docs/_custom/clusterManagement/podIpPools/podIpPools-prer-enablePodIpPool.adoc index 4d4a4f20f..404300e09 100644 --- a/content/zh/docs/_custom/clusterManagement/podIpPools/podIpPools-prer-enablePodIpPool.adoc +++ b/content/zh/docs/_custom/clusterManagement/podIpPools/podIpPools-prer-enablePodIpPool.adoc @@ -1,9 +1,17 @@ // :ks_include_id: 07a04c60e8c342db9bc6ec8108be9412 ifeval::["{file_output_type}" == "html"] * {ks_product_right}平台需要启用容器组 IP 池扩展组件。 +<<<<<<< HEAD 有关更多信息，请参阅 xref:04-platform-management/01-extension-management/[启用可插拔组件]。 endif::[] ifeval::["{file_output_type}" == "pdf"] 有关更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。 +======= +有关更多信息，请参阅 xref:04-platform-management/01-extension-management/_index.adoc[启用可插拔组件]。 +endif::[] + +ifeval::["{file_output_type}" == "pdf"] +有关更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 endif::[] \ No newline at end of file diff --git a/content/zh/docs/_custom/clusterManagement/ruleGroups/ruleGroups-prer-creationPrerequisites.adoc b/content/zh/docs/_custom/clusterManagement/ruleGroups/ruleGroups-prer-creationPrerequisites.adoc index fe2c837df..15a7c1a33 100644 --- a/content/zh/docs/_custom/clusterManagement/ruleGroups/ruleGroups-prer-creationPrerequisites.adoc +++ b/content/zh/docs/_custom/clusterManagement/ruleGroups/ruleGroups-prer-creationPrerequisites.adoc @@ -7,6 +7,10 @@ endif::[] ifeval::["{file_output_type}" == "pdf"] +<<<<<<< HEAD * {ks_product_right}平台需要启用告警系统扩展组件。关于更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。 +======= +* {ks_product_right}平台需要启用告警系统扩展组件。关于更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 endif::[] diff --git a/content/zh/docs/_custom/clusterManagement/workloads/createWorkload/workloads-desc-enableLogCollectionCluster.adoc b/content/zh/docs/_custom/clusterManagement/workloads/createWorkload/workloads-desc-enableLogCollectionCluster.adoc index 48def8236..1e8ab3b94 100644 --- a/content/zh/docs/_custom/clusterManagement/workloads/createWorkload/workloads-desc-enableLogCollectionCluster.adoc +++ b/content/zh/docs/_custom/clusterManagement/workloads/createWorkload/workloads-desc-enableLogCollectionCluster.adoc @@ -1,6 +1,10 @@ // :ks_include_id: 01792eb26cce4187b5a1f964404e6037 ifeval::["{file_output_type}" == "pdf"] +<<<<<<< HEAD 有关如何在项目中启用**收集卷上的日志**，请参阅《{ks_product_right}项目管理指南》的“日志收集”章节。 +======= +有关如何在项目中启用**收集卷上的日志**，请参阅《{ks_product_full_right}项目管理指南》的“日志收集”章节。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 endif::[] diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-addNodes.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-addNodes.adoc index da4923c01..f801fde59 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-addNodes.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-addNodes.adoc @@ -1,8 +1,16 @@ // :ks_include_id: 6963bdcc859e4b46817de17172bb750a // Bash +<<<<<<< HEAD [,bash] ----  ./kk add nodes -f config-sample.yaml ---- -//  ./kk add nodes -f config-sample.yaml -a kubekey-artifact.tar.gz \ No newline at end of file +//  ./kk add nodes -f config-sample.yaml -a kubekey-artifact.tar.gz +======= +include::../../../_ks_components/code/bash.adoc[] + + ./kk add nodes -f config-sample.yaml -a kubekey-artifact.tar.gz + +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-initializeRegistry.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-initializeRegistry.adoc index 8f8c59156..137ac0864 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-initializeRegistry.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-initializeRegistry.adoc @@ -4,4 +4,8 @@ include::../../../_ks_components/code/bash.adoc[]  ./kk init registry -f config-sample.yaml -a kubekey-artifact.tar.gz +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-privateRegistry.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-privateRegistry.adoc index 7d8a0e4ca..204044044 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-privateRegistry.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-privateRegistry.adoc @@ -7,4 +7,8 @@ include::../../../_ks_components/code/yaml.adoc[] insecureRegistries: [] privateRegistry: dockerhub.kubekey.local +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-startUpgradeOffline.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-startUpgradeOffline.adoc index d797c7be6..733d9bcd2 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-startUpgradeOffline.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-code-startUpgradeOffline.adoc @@ -4,4 +4,8 @@ include::../../../_ks_components/code/bash.adoc[]  ./kk upgrade --with-kubernetes --with-kubesphere -f config-sample.yaml -a kubekey-artifact.tar.gz +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-desc-installationSuccessOutput.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-desc-installationSuccessOutput.adoc index adf8f3dc6..92bec3909 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-desc-installationSuccessOutput.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-desc-installationSuccessOutput.adoc @@ -24,4 +24,8 @@ NOTES: https://kubesphere.io             20xx-xx-xx xx:xx:xx ##################################################### +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-checkInstallationLog.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-checkInstallationLog.adoc index be76d98fa..c9825d51d 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-checkInstallationLog.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-checkInstallationLog.adoc @@ -7,5 +7,9 @@ include::../../../_ks_components/code/bash.adoc[] kubectl logs -n kubesphere-system $(kubectl get pod -n kubesphere-system -l app=ks-installer -o jsonpath='{.items[0].metadata.name}') -f +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage.adoc index 565e43170..61bad75e8 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage.adoc @@ -10,14 +10,22 @@ include::../../../_ks_components/code/bash.adoc[] tar -zxvf +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // Bash include::../../../_ks_components/code/bash.adoc[] cd +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令为 KubeKey 二进制文件 **kk** 添加执行权限： @@ -28,5 +36,9 @@ include::../../../_ks_components/code/bash.adoc[] sudo chmod +x kk +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage_new.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage_new.adoc index 943ec83e3..a5a1fc404 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage_new.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage_new.adoc @@ -10,14 +10,22 @@ include::../../../_ks_components/code/bash.adoc[] tar -zxvf +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // Bash include::../../../_ks_components/code/bash.adoc[] cd +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令为 KubeKey 二进制文件 **kk** 添加执行权限： @@ -28,5 +36,9 @@ include::../../../_ks_components/code/bash.adoc[] sudo chmod +x kk +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-downloadKubekey.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-downloadKubekey.adoc index 29cf8133d..1caa3fb55 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-downloadKubekey.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-downloadKubekey.adoc @@ -4,37 +4,74 @@ + -- // Bash +<<<<<<< HEAD [,bash] ---- export KKZONE=cn ---- -- +======= +include::../../../_ks_components/code/bash.adoc[] + +export KKZONE=cn + +include::../../../_ks_components/code/codeEnd.adoc[] +-- + + +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 . 执行以下命令下载 KubeKey 最新版本： + -- // Bash +<<<<<<< HEAD [,bash] ---- curl -sfL https://get-kk.kubesphere.io | sh - ---- +======= +include::../../../_ks_components/code/bash.adoc[] + +curl -sfL https://get-kk.kubesphere.io | sh - + +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 下载完成后当前目录下将生成 KubeKey 二进制文件 **kk**。 // Note +<<<<<<< HEAD // include::../../../_ks_components/admonitions/note.adoc[] // 如果用于执行本节操作的集群节点无法连接互联网，您可以从互联网连接正常的设备手动link:https://github.com/kubesphere/kubekey/releases[下载 KubeKey] 然后将其传输到用于执行本节操作的集群节点。 // include::../../../_ks_components/admonitions/admonEnd.adoc[] -- +======= +include::../../../_ks_components/admonitions/note.adoc[] + +如果用于执行本节操作的集群节点无法连接互联网，您可以从互联网连接正常的设备手动link:https://github.com/kubesphere/kubekey/releases[下载 KubeKey] 然后将其传输到用于执行本节操作的集群节点。 + +include::../../../_ks_components/admonitions/admonEnd.adoc[] +-- +// end::download-kubekey[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 . 执行以下命令为 KubeKey 二进制文件 **kk** 添加执行权限： + -- // Bash +<<<<<<< HEAD [,bash] ---- sudo chmod +x kk ---- +======= +include::../../../_ks_components/code/bash.adoc[] + +sudo chmod +x kk + +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editCcKsInstaller.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editCcKsInstaller.adoc index ab3fea258..e3188309b 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editCcKsInstaller.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editCcKsInstaller.adoc @@ -9,14 +9,22 @@ include::../../../_ks_components/code/bash.adoc[] curl -L -O https://github.com/kubesphere/ks-installer/releases/download/{ks_product_ver}/kubesphere-installer.yaml +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // Bash include::../../../_ks_components/code/bash.adoc[] curl -L -O https://github.com/kubesphere/ks-installer/releases/download/{ks_product_ver}/cluster-configuration.yaml +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // Note include::../../../_ks_components/admonitions/note.adoc[] @@ -34,7 +42,11 @@ include::../../../_ks_components/code/bash.adoc[] sed -i "s#^\s*image: kubesphere.*/ks-installer:.*#        image: dockerhub.kubekey.local/kubesphere/ks-installer:v3.3.0#" kubesphere-installer.yaml +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 如果您的集群节点无法连接互联网，执行以下命令编辑 **cluster-configuration.yaml** 配置文件： diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editCcKsInstaller_new.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editCcKsInstaller_new.adoc index 29ec3b8b3..a77236b47 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editCcKsInstaller_new.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editCcKsInstaller_new.adoc @@ -9,14 +9,22 @@ include::../../../_ks_components/code/bash.adoc[] curl -L -O https://github.com/kubesphere/ks-installer/releases/download/v3.5.0/kubesphere-installer.yaml +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // Bash include::../../../_ks_components/code/bash.adoc[] curl -L -O https://github.com/kubesphere/ks-installer/releases/download/v3.5.0/cluster-configuration.yaml +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // Note include::../../../_ks_components/admonitions/note.adoc[] @@ -35,7 +43,11 @@ include::../../../_ks_components/code/bash.adoc[] sed -i "s#^\s*image: kubesphere.*/ks-installer:.*# image: dockerhub.kubekey.local/kubesphere/ks-installer:v3.5.0#" kubesphere-installer.yaml +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 如果您的集群节点无法连接互联网，执行以下命令编辑 **cluster-configuration.yaml** 配置文件： diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editHosts.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editHosts.adoc index 3ea4644b0..f5faca9ab 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editHosts.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editHosts.adoc @@ -7,7 +7,11 @@ include::../../../_ks_components/code/bash.adoc[] vi /etc/hosts +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 在 **/etc/hosts** 文件中添加以下信息，从而为集群节点配置私有镜像服务的域名解析规则（将 替换成私有镜像服务的实际 IP 地址），然后保存文件： @@ -16,5 +20,9 @@ include::../../../_ks_components/code/bash.adoc[] dockerhub.kubekey.local +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editHosts_v4.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editHosts_v4.adoc index e2a4847d5..5e55cc757 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editHosts_v4.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-editHosts_v4.adoc @@ -7,7 +7,11 @@ include::../../../_ks_components/code/bash.adoc[] vi /etc/hosts +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 在 **/etc/hosts** 文件中添加以下信息，从而为集群节点配置私有镜像服务的域名解析规则（将 替换成私有镜像服务的实际 IP 地址，将私有镜像服务的默认地址 **dockerhub.kubekey.local** 替换为您的实际镜像仓库地址），然后保存文件： @@ -16,5 +20,9 @@ include::../../../_ks_components/code/bash.adoc[] dockerhub.kubekey.local +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-initializeRegistry.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-initializeRegistry.adoc index f66bce8b9..f14832022 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-initializeRegistry.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-oper-initializeRegistry.adoc @@ -7,7 +7,11 @@ include::../../../_ks_components/code/bash.adoc[] vi config-sample.yaml +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 以下为部分示例配置文件，如需了解完整示例，请参阅link:https://github.com/kubesphere/kubekey/blob/master/docs/config-example.md[此文件]。 @@ -62,7 +66,11 @@ spec: insecureRegistries: [] addons: [] +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 在 **spec:hosts** 参数下设置用于创建私有镜像服务的服务器的信息。 @@ -77,7 +85,11 @@ include::../../../_ks_components/code/yaml.adoc[] registry: - +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 将 **spec:registry:privateRegistry** 参数设置为私有镜像服务的地址 **dockerhub.kubekey.local**，然后保存文件。 @@ -89,7 +101,11 @@ include::../../../_ks_components/code/yaml.adoc[] insecureRegistries: [] privateRegistry: dockerhub.kubekey.local +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令初始化私有镜像服务： @@ -100,7 +116,11 @@ include::../../../_ks_components/code/bash.adoc[]  ./kk init registry -f config-sample.yaml -a kubekey-artifact.tar.gz +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 include::installationAndUpgrade-note-initializeRegistry.adoc[] -- \ No newline at end of file diff --git a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-startInstallationOffline.adoc b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-startInstallationOffline.adoc index 99fa5e214..3a5a52e6a 100644 --- a/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-startInstallationOffline.adoc +++ b/content/zh/docs/_custom/installationAndUpgrade/installationAndUpgrade-startInstallationOffline.adoc @@ -4,4 +4,8 @@ include::../../../_ks_components/code/bash.adoc[]  ./kk create cluster -f config-sample.yaml -a kubekey-artifact.tar.gz +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/platformManagement/appStoreManagement/appTemplates/appTemplates-para-templateCategories.adoc b/content/zh/docs/_custom/platformManagement/appStoreManagement/appTemplates/appTemplates-para-templateCategories.adoc index ae9645abf..04a39c304 100644 --- a/content/zh/docs/_custom/platformManagement/appStoreManagement/appTemplates/appTemplates-para-templateCategories.adoc +++ b/content/zh/docs/_custom/platformManagement/appStoreManagement/appTemplates/appTemplates-para-templateCategories.adoc @@ -1,3 +1,7 @@ // :ks_include_id: 7f602e6e82414c39b2434c3a6ef39aa0 |分类 +<<<<<<< HEAD |应用模板所属的分类。您可以将应用模板分配到一个分类中以便于管理。有关更多信息，请参阅xref:04-platform-management/05-app-store-management/02-app-categories/[应用分类]。 +======= +|应用模板所属的分类。您可以将应用模板分配到一个分类中以便于管理。有关更多信息，请参阅xref:04-platform-management/05-app-store-management/02-app-categories/_index.adoc[应用分类]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-deleteStatusEs.adoc b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-deleteStatusEs.adoc index 995ff0382..bd701490c 100644 --- a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-deleteStatusEs.adoc +++ b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-deleteStatusEs.adoc @@ -9,4 +9,8 @@ status: enabledTime: 2022-08-11T06:22:01UTC status: enabled +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-disableOberservabilityCenter.adoc b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-disableOberservabilityCenter.adoc index 6c0b93388..926d4a3d6 100644 --- a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-disableOberservabilityCenter.adoc +++ b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-disableOberservabilityCenter.adoc @@ -18,5 +18,9 @@ status: enabledTime: XXXX-XX-XXXXX:XX:XXXXX status: enabled #删除 monitoring:status:enabled +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- diff --git a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-editCC.adoc b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-editCC.adoc index ef4b62bc2..a24de58b4 100644 --- a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-editCC.adoc +++ b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-editCC.adoc @@ -7,5 +7,9 @@ include::../../../../_ks_components/code/bash.adoc[] kubectl edit cc ks-installer -n kubesphere-system +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- diff --git a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-setExternalElasticsearch.adoc b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-setExternalElasticsearch.adoc index 73d0e023c..e68015006 100644 --- a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-setExternalElasticsearch.adoc +++ b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-oper-setExternalElasticsearch.adoc @@ -11,7 +11,11 @@ spec: externalElasticsearchHost: "" externalElasticsearchPort: "" +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // Note include::../../../../_ks_components/admonitions/note.adoc[] diff --git a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-prer-platformAdmin.adoc b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-prer-platformAdmin.adoc index 63de59631..1bf91c035 100644 --- a/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-prer-platformAdmin.adoc +++ b/content/zh/docs/_custom/platformManagement/extensionManagement/extensionManagement-prer-platformAdmin.adoc @@ -1,2 +1,6 @@ // :ks_include_id: 533e874085874479aae0d8bb598443f2 +<<<<<<< HEAD 您需要在{ks_product_both}平台具有 **platform-admin** 角色。有关更多信息，请参阅xref:04-platform-management/04-access-control/02-users/[用户]和xref:04-platform-management/04-access-control/03-platform-roles/[平台角色]。 +======= +您需要在{ks_product_both}平台具有 **platform-admin** 角色。有关更多信息，请参阅xref:04-platform-management/04-access-control/02-users/_index.adoc[用户]和xref:04-platform-management/04-access-control/03-platform-roles/_index.adoc[平台角色]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/platformManagement/multiclusterManagement/clusters/clusters-prer-obtainJwtsecret.adoc b/content/zh/docs/_custom/platformManagement/multiclusterManagement/clusters/clusters-prer-obtainJwtsecret.adoc index 2c7df93ba..01888dff7 100644 --- a/content/zh/docs/_custom/platformManagement/multiclusterManagement/clusters/clusters-prer-obtainJwtsecret.adoc +++ b/content/zh/docs/_custom/platformManagement/multiclusterManagement/clusters/clusters-prer-obtainJwtsecret.adoc @@ -7,5 +7,9 @@ include::../../../../../_ks_components/code/bash.adoc[] kubectl -n kubesphere-system get cm kubesphere-config -o yaml | grep -v "apiVersion" | grep jwtSecret +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- diff --git a/content/zh/docs/_custom/platformManagement/multiclusterManagement/clusters/clusters-prer-platformAdminHostMemeber.adoc b/content/zh/docs/_custom/platformManagement/multiclusterManagement/clusters/clusters-prer-platformAdminHostMemeber.adoc index 1bf29d32a..3dd58c7f2 100644 --- a/content/zh/docs/_custom/platformManagement/multiclusterManagement/clusters/clusters-prer-platformAdminHostMemeber.adoc +++ b/content/zh/docs/_custom/platformManagement/multiclusterManagement/clusters/clusters-prer-platformAdminHostMemeber.adoc @@ -1,2 +1,6 @@ // :ks_include_id: dea142b7ab3e4c6292a968da83aa19c0 +<<<<<<< HEAD * 您需要在主集群和成员集群中都具有 **platform-admin** 角色。有关更多信息，请参阅xref:04-platform-management/04-access-control/02-users/[用户]和xref:04-platform-management/04-access-control/03-platform-roles/[平台角色]。 +======= +* 您需要在主集群和成员集群中都具有 **platform-admin** 角色。有关更多信息，请参阅xref:04-platform-management/04-access-control/02-users/_index.adoc[用户]和xref:04-platform-management/04-access-control/03-platform-roles/_index.adoc[平台角色]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/platformManagement/platformManagement-prer-requiredPermission.adoc b/content/zh/docs/_custom/platformManagement/platformManagement-prer-requiredPermission.adoc index 55c687d9f..796a9cd6e 100644 --- a/content/zh/docs/_custom/platformManagement/platformManagement-prer-requiredPermission.adoc +++ b/content/zh/docs/_custom/platformManagement/platformManagement-prer-requiredPermission.adoc @@ -1,2 +1,6 @@ // :ks_include_id: 95e415bcbafa45ed8545cb7700801b09 +<<<<<<< HEAD 您需要在{ks_product_both}平台具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:04-platform-management/04-access-control/02-users/[用户]和xref:04-platform-management/04-access-control/03-platform-roles/[平台角色]。 +======= +您需要在{ks_product_both}平台具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:04-platform-management/04-access-control/02-users/_index.adoc[用户]和xref:04-platform-management/04-access-control/03-platform-roles/_index.adoc[平台角色]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/platformManagement/platformManagement-prer-requiredPermission_v4.adoc b/content/zh/docs/_custom/platformManagement/platformManagement-prer-requiredPermission_v4.adoc index 072183001..0b0bdc4d5 100644 --- a/content/zh/docs/_custom/platformManagement/platformManagement-prer-requiredPermission_v4.adoc +++ b/content/zh/docs/_custom/platformManagement/platformManagement-prer-requiredPermission_v4.adoc @@ -1,2 +1,6 @@ // :ks_include_id: 95e415bcbafa45ed8545cb7700801b09 +<<<<<<< HEAD 您需要在{ks_product_both}平台具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅“用户”和“平台角色”。 +======= +您需要在{ks_product_both}平台具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:05-users-and-roles/01-users/_index.adoc[用户]和xref:05-users-and-roles/02-platform-roles/_index.adoc[平台角色]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/pluggable-component-management/view-component-installation-log.adoc b/content/zh/docs/_custom/pluggable-component-management/view-component-installation-log.adoc index 4751c15a9..dcf35cf54 100644 --- a/content/zh/docs/_custom/pluggable-component-management/view-component-installation-log.adoc +++ b/content/zh/docs/_custom/pluggable-component-management/view-component-installation-log.adoc @@ -8,5 +8,9 @@ include::../../../_ks_components/code/bash.adoc[] kubectl logs -n kubesphere-system $(kubectl get pod -n kubesphere-system -l app=ks-install -o jsonpath='{.items[0].metadata.name}') -f +<<<<<<< HEAD ---- +======= +include::../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- \ No newline at end of file diff --git a/content/zh/docs/_custom/projectManagement/grayscaleRelease/grayscaleRelease-prer-enableApplicationGovernance.adoc b/content/zh/docs/_custom/projectManagement/grayscaleRelease/grayscaleRelease-prer-enableApplicationGovernance.adoc index 4d8e85012..f4b97dda5 100644 --- a/content/zh/docs/_custom/projectManagement/grayscaleRelease/grayscaleRelease-prer-enableApplicationGovernance.adoc +++ b/content/zh/docs/_custom/projectManagement/grayscaleRelease/grayscaleRelease-prer-enableApplicationGovernance.adoc @@ -7,6 +7,10 @@ endif::[] ifeval::["{file_output_type}" == "pdf"] +<<<<<<< HEAD * {ks_product_right}平台需要启用应用治理扩展组件。有关更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。 +======= +* {ks_product_right}平台需要启用应用治理扩展组件。有关更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 endif::[] diff --git a/content/zh/docs/_custom/projectManagement/microservices/microservices-prer-enableSpringCloud.adoc b/content/zh/docs/_custom/projectManagement/microservices/microservices-prer-enableSpringCloud.adoc index 886583689..cf2f1bc55 100644 --- a/content/zh/docs/_custom/projectManagement/microservices/microservices-prer-enableSpringCloud.adoc +++ b/content/zh/docs/_custom/projectManagement/microservices/microservices-prer-enableSpringCloud.adoc @@ -3,5 +3,9 @@ ifeval::["{file_output_type}" == "html"] * {ks_product_right}平台需要启用 Spring Cloud 扩展组件。 endif::[] ifeval::["{file_output_type}" == "pdf"] +<<<<<<< HEAD * {ks_product_right}平台需要启用 Spring Cloud 扩展组件。有关更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。 +======= +* {ks_product_right}平台需要启用 Spring Cloud 扩展组件。有关更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 endif::[] \ No newline at end of file diff --git a/content/zh/docs/_custom/projectManagement/projectManagement-prer-requiredPermission.adoc b/content/zh/docs/_custom/projectManagement/projectManagement-prer-requiredPermission.adoc index a47805702..5a8fc877a 100644 --- a/content/zh/docs/_custom/projectManagement/projectManagement-prer-requiredPermission.adoc +++ b/content/zh/docs/_custom/projectManagement/projectManagement-prer-requiredPermission.adoc @@ -1,2 +1,6 @@ // :ks_include_id: 6579f3ef4c70439ca10c8e8de94ce9fb +<<<<<<< HEAD 您需要加入一个项目并在项目中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:07-project-management/10-project-settings/04-project-members/[项目成员]和xref:07-project-management/10-project-settings/03-project-roles/02-view-a-project-role-list.adoc[项目角色]。 +======= +您需要加入一个项目并在项目中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:07-project-management/10-project-settings/04-project-members/_index.adoc[项目成员]和xref:07-project-management/10-project-settings/03-project-roles/02-view-a-project-role-list.adoc[项目角色]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/projectManagement/projectManagement-prer-requiredPermission_new.adoc b/content/zh/docs/_custom/projectManagement/projectManagement-prer-requiredPermission_new.adoc index 0ef9a87f0..e2db1b383 100644 --- a/content/zh/docs/_custom/projectManagement/projectManagement-prer-requiredPermission_new.adoc +++ b/content/zh/docs/_custom/projectManagement/projectManagement-prer-requiredPermission_new.adoc @@ -1,2 +1,6 @@ // :ks_include_id: 6579f3ef4c70439ca10c8e8de94ce9fb +<<<<<<< HEAD 您需要加入一个项目并在项目中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅“项目成员”和“项目角色”。 +======= +您需要加入一个项目并在项目中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:09-project-management/06-project-settings/03-project-members/_index.adoc[项目成员]和xref:09-project-management/06-project-settings/02-project-roles/_index.adoc[项目角色]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/projectManagement/services/services-desc-seeImageBuilder.adoc b/content/zh/docs/_custom/projectManagement/services/services-desc-seeImageBuilder.adoc index 5b7d6f828..cfe476b31 100644 --- a/content/zh/docs/_custom/projectManagement/services/services-desc-seeImageBuilder.adoc +++ b/content/zh/docs/_custom/projectManagement/services/services-desc-seeImageBuilder.adoc @@ -1,2 +1,6 @@ // :ks_include_id: 6113bcafa9264e92892a1889dbfe7330 +<<<<<<< HEAD 有关镜像构建器的更多信息，请参阅xref:07-project-management/08-image-builder/[镜像构建器]。 +======= +有关镜像构建器的更多信息，请参阅xref:07-project-management/08-image-builder/_index.adoc[镜像构建器]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/projectManagement/workloads/workloads-desc-enableLogCollectionMulticlusterProject.adoc b/content/zh/docs/_custom/projectManagement/workloads/workloads-desc-enableLogCollectionMulticlusterProject.adoc index 8f08db07c..85b3de6ea 100644 --- a/content/zh/docs/_custom/projectManagement/workloads/workloads-desc-enableLogCollectionMulticlusterProject.adoc +++ b/content/zh/docs/_custom/projectManagement/workloads/workloads-desc-enableLogCollectionMulticlusterProject.adoc @@ -1,2 +1,6 @@ // :ks_include_id: 716996e4cfe04beaa6a39a03ae610b86 -有关如何在项目中启用**收集卷上的日志**，请参阅link:/Users/keke/works/pitrix/repo/ks-qkcp-docs/ks-qkcp/docs-zh/@ks-qkcp/docs-zh/08-multi-cluster-project-management/06-project-settings/04-log-collection/[日志收集]。 \ No newline at end of file +<<<<<<< HEAD +有关如何在项目中启用**收集卷上的日志**，请参阅link:/Users/keke/works/pitrix/repo/ks-qkcp-docs/ks-qkcp/docs-zh/@ks-qkcp/docs-zh/08-multi-cluster-project-management/06-project-settings/04-log-collection/[日志收集]。 +======= +有关如何在项目中启用**收集卷上的日志**，请参阅link:/Users/keke/works/pitrix/repo/ks-qkcp-docs/ks-qkcp/docs-zh/@ks-qkcp/docs-zh/08-multi-cluster-project-management/06-project-settings/04-log-collection/_index.adoc[日志收集]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/projectManagement/workloads/workloads-desc-enableLogCollectionProject.adoc b/content/zh/docs/_custom/projectManagement/workloads/workloads-desc-enableLogCollectionProject.adoc index 8310f05a7..5a5c633e6 100644 --- a/content/zh/docs/_custom/projectManagement/workloads/workloads-desc-enableLogCollectionProject.adoc +++ b/content/zh/docs/_custom/projectManagement/workloads/workloads-desc-enableLogCollectionProject.adoc @@ -1,2 +1,6 @@ // :ks_include_id: 7318136ea443449a9e862e964a41299f +<<<<<<< HEAD 有关如何在项目中启用**收集卷上的日志**，请参阅xref:07-project-management/10-project-settings/06-log-collection/[日志收集]。 +======= +有关如何在项目中启用**收集卷上的日志**，请参阅xref:07-project-management/10-project-settings/06-log-collection/_index.adoc[日志收集]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/radondb/radondb-prer-enableDmp.adoc b/content/zh/docs/_custom/radondb/radondb-prer-enableDmp.adoc index b336729ed..cc01c13a6 100644 --- a/content/zh/docs/_custom/radondb/radondb-prer-enableDmp.adoc +++ b/content/zh/docs/_custom/radondb/radondb-prer-enableDmp.adoc @@ -3,5 +3,9 @@ ifeval::["{file_output_type}" == "html"] * {ks_product_right}平台需要启用数据库管理平台扩展组件。 endif::[] ifeval::["{file_output_type}" == "pdf"] +<<<<<<< HEAD * {ks_product_right}平台需要启用数据库管理平台扩展组件。有关更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。 +======= +* {ks_product_right}平台需要启用数据库管理平台扩展组件。有关更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 endif::[] diff --git a/content/zh/docs/_custom/workspaceManagement/appTemplates/appTemplates-prer-enableAppManagment.adoc b/content/zh/docs/_custom/workspaceManagement/appTemplates/appTemplates-prer-enableAppManagment.adoc index d4a089095..32ab1a9c5 100644 --- a/content/zh/docs/_custom/workspaceManagement/appTemplates/appTemplates-prer-enableAppManagment.adoc +++ b/content/zh/docs/_custom/workspaceManagement/appTemplates/appTemplates-prer-enableAppManagment.adoc @@ -7,6 +7,10 @@ endif::[] ifeval::["{file_output_type}" == "pdf"] +<<<<<<< HEAD * {ks_product_right}平台需要启用应用管理扩展组件。有关更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。 +======= +* {ks_product_right}平台需要启用应用管理扩展组件。有关更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 endif::[] diff --git a/content/zh/docs/_custom/workspaceManagement/devopsProjects/devopsProject-prer-enableDevops.adoc b/content/zh/docs/_custom/workspaceManagement/devopsProjects/devopsProject-prer-enableDevops.adoc index d0a2326c3..9aa33ba49 100644 --- a/content/zh/docs/_custom/workspaceManagement/devopsProjects/devopsProject-prer-enableDevops.adoc +++ b/content/zh/docs/_custom/workspaceManagement/devopsProjects/devopsProject-prer-enableDevops.adoc @@ -7,6 +7,10 @@ endif::[] ifeval::["{file_output_type}" == "pdf"] +<<<<<<< HEAD * {ks_product_right}平台需要启用 DevOps 扩展组件。有关更多信息，请参阅《{ks_product_right}平台管理指南》的“扩展组件管理”章节。 +======= +* {ks_product_right}平台需要启用 DevOps 扩展组件。有关更多信息，请参阅《{ks_product_full_right}平台管理指南》的“扩展组件管理”章节。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 endif::[] diff --git a/content/zh/docs/_custom/workspaceManagement/toolBox/toolBox-prer-useLogQueryTools.adoc b/content/zh/docs/_custom/workspaceManagement/toolBox/toolBox-prer-useLogQueryTools.adoc index 9fc247a98..e70ae06bd 100644 --- a/content/zh/docs/_custom/workspaceManagement/toolBox/toolBox-prer-useLogQueryTools.adoc +++ b/content/zh/docs/_custom/workspaceManagement/toolBox/toolBox-prer-useLogQueryTools.adoc @@ -11,8 +11,14 @@ endif::[] ifeval::["{file_output_type}" == "pdf"] +<<<<<<< HEAD * {ks_product_right}平台需要启用日志、事件和审计扩展组件。有关更多信息，请参阅《{ks_product_both}平台管理指南》的“扩展组件管理”章节。 * {ks_product_right}集群需要添加 Elasticsearch 日志接收器。有关更多信息，请参阅《{ks_product_right}集群管理指南》的“添加日志接收器”章节。 +======= +* {ks_product_right}平台需要启用日志、事件和审计扩展组件。有关更多信息，请参阅《{ks_product_full_both}平台管理指南》的“扩展组件管理”章节。 + +* {ks_product_right}集群需要添加 Elasticsearch 日志接收器。有关更多信息，请参阅《{ks_product_full_right}集群管理指南》的“添加日志接收器”章节。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 endif::[] diff --git a/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission.adoc b/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission.adoc index f7f3ce9d9..9eb7dce81 100644 --- a/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission.adoc +++ b/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission.adoc @@ -1,2 +1,6 @@ // :ks_include_id: 05d7ebe027f04cc589e8baa04343e651 +<<<<<<< HEAD 您需要加入一个企业空间并在企业空间中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:06-workspace-management/06-workspace-settings/03-workspace-members/[企业空间成员]、xref:06-workspace-management/06-workspace-settings/04-workspace-roles/[企业空间角色]和xref:06-workspace-management/06-workspace-settings/05-departments/[部门]。 +======= +您需要加入一个企业空间并在企业空间中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:06-workspace-management/06-workspace-settings/03-workspace-members/_index.adoc[企业空间成员]、xref:06-workspace-management/06-workspace-settings/04-workspace-roles/_index.adoc[企业空间角色]和xref:06-workspace-management/06-workspace-settings/05-departments/_index.adoc[部门]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission_new.adoc b/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission_new.adoc index 7dd982ef7..e4561db5a 100644 --- a/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission_new.adoc +++ b/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission_new.adoc @@ -1,2 +1,6 @@ // :ks_include_id: 05d7ebe027f04cc589e8baa04343e651 +<<<<<<< HEAD 您需要加入一个企业空间并在企业空间中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:08-workspace-management/05-workspace-settings/03-workspace-members/[企业空间成员]和xref:08-workspace-management/05-workspace-settings/04-workspace-roles/[企业空间角色]。 +======= +您需要加入一个企业空间并在企业空间中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:08-workspace-management/05-workspace-settings/03-workspace-members/_index.adoc[企业空间成员]和xref:08-workspace-management/05-workspace-settings/04-workspace-roles/_index.adoc[企业空间角色]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc b/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc index 211c56c0c..c6d742c66 100644 --- a/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc +++ b/content/zh/docs/_custom/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc @@ -1,2 +1,6 @@ // :ks_include_id: 05d7ebe027f04cc589e8baa04343e651 +<<<<<<< HEAD 您需要加入一个企业空间并在企业空间中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅“企业空间成员”和“企业空间角色”。 +======= +您需要加入一个企业空间并在企业空间中具有pass:a,q[{ks_permission}]权限。有关更多信息，请参阅xref:08-workspace-management/06-workspace-settings/03-workspace-members/_index.adoc[企业空间成员]和xref:08-workspace-management/06-workspace-settings/04-workspace-roles/_index.adoc[企业空间角色]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/01-supported-k8s.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/01-supported-k8s.adoc index 488818ebb..2cebd849a 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/01-supported-k8s.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/01-supported-k8s.adoc @@ -1,8 +1,13 @@ --- title: "环境要求" +<<<<<<< HEAD linkTitle: "环境要求" keywords: "Kubernetes, KubeSphere, 组件,支持矩阵" description: "介绍 KubeSphere 的环境要求。" +======= +keywords: "Kubernetes, {ks_product}, 组件,支持矩阵" +description: "介绍{ks_product_both}的环境要求。" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 weight: 01 --- @@ -198,6 +203,7 @@ weight: 01 |N/A |=== +<<<<<<< HEAD // == 组件支持矩阵 // {ks_product_right} v4.1 默认支持 Kubernetes v1.21~1.28。本节详细介绍{ks_product_both}各组件支持的 Kubernetes 版本。为避免使用过程中出现兼容性问题，请使用支持的 Kubernetes 版本。 @@ -339,4 +345,222 @@ weight: 01 // |1.0.x // |1.21~1.28 // |amd64、arm64 -// |=== \ No newline at end of file +// |=== +======= +== 组件支持矩阵 + +{ks_product_right} v4.1.0 默认支持 Kubernetes v1.21~1.28。本节详细介绍{ks_product_both}各组件支持的 Kubernetes 版本。为避免使用过程中出现兼容性问题，请使用支持的 Kubernetes 版本。 + +[%header,cols="2a,3a,5a"] +|=== +|组件 |组件版本 |支持的 Kubernetes 版本 + +|ks-core +|4.1.x +|1.21~1.28 + +|DevOps +|4.1.0 +|1.21~1.28 + +|Storage-utils +|1.0.x +|1.21~1.28 + +|Vector +|1.0.0 +|1.21~1.28 + +|OpenSearch +|2.11.1 +|1.21~1.28 + +|Monitoring +|1.0.0 +|1.21~1.28 + +|Logging +|1.0.0 +|1.21~1.28 + +|Auditing +|1.0.0 +|1.21~1.28 + +|Events +|1.0.0 +|1.21~1.28 + +|Alerting +|1.0.0 +|1.21~1.28 + +|WhizardTelemetry 平台服务 +|1.0.0 +|1.21~1.28 + +|WhizardTelemetry 事件告警 +|1.0.0 +|1.21~1.28 + +|Notification +|2.5.1 +|1.21~1.28 + +|MetricServer +|0.7.0 +|1.21~1.28 + +|Tower +|1.0.x +|1.21~1.28 + +|OpenPitrix +|2.0.0 +|1.21~1.28 + +|KubeFed +|1.0.x +|1.21~1.28 + +|Gateway +|1.0.x +|1.22~1.25 + +|ServiceMesh +|1.0.x +|1.22~1.25 + +|KubeEdge +|1.31.1 +|1.21-1.23 + +|RadonDB DMP +|2.1.0 +| +* DMP 管理平台: 1.21~1.28 +* MySQL: 1.21~1.28 +* PostgreSQL: 1.21~1.28 +* Redis Cluster: 1.21~1.28 +* Redis Sentinel: 1.21~1.28 +* MongoDB: 1.21~1.28 +* OpenSearch: 1.21~1.28 +* Kafka: 1.21~1.28 +* RabbitMQ: 1.21~1.28 + +|SpringCloud +|1.0.x +|1.21~1.28 + +|Gatekeeper +|1.0.x +|1.21~1.28 + +|Network +|1.0.0 +|1.21~1.28 +|=== + +== 组件架构支持矩阵 + +[%header,cols="2a,3a,5a"] +|=== +|组件 |组件版本 |支持的架构 + +|ks-core +|4.1.x +|amd64、arm64 + +|DevOps +|4.1.0 +|amd64、arm64 + +|Storage-utils +|1.0.x +|amd64、arm64 + +|Vector +|1.0.0 +|amd64、arm64 + +|OpenSearch +|2.11.1 +|amd64、arm64 + +|Monitoring +|1.0.0 +|amd64、arm64 + +|Logging +|1.0.0 +|amd64、arm64 + +|Auditing +|1.0.0 +|amd64、arm64 + +|Events +|1.0.0 +|amd64、arm64 + +|Alerting +|1.0.0 +|amd64、arm64 + +|WhizardTelemetry 平台服务 +|1.0.0 +|amd64、arm64 + +|WhizardTelemetry 事件告警 +|1.0.0 +|amd64、arm64 + +|Notification +|2.5.1 +|amd64、arm64 + +|MetricServer +|0.7.0 +|amd64、arm64 + +|Tower +|1.0.x +|amd64、arm64 + +|OpenPitrix +|2.0.0 +|amd64、arm64 + +|KubeFed +|1.0.x +|amd64、arm64 + +|Gateway +|1.0.x +|amd64、arm64 + +|ServiceMesh +|1.0.x +|amd64、arm64 + +|KubeEdge +|1.31.1 +|amd64、arm64 + +|RadonDB DMP +|2.1.0 +|amd64 + +|SpringCloud +|1.0.x +|amd64、arm64 + +|Gatekeeper +|1.0.x +|amd64、arm64 + +|Network +|1.0.0 +|amd64、arm64 +|=== +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/03-configure-high-availability.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/03-configure-high-availability.adoc index a64b87ec6..e15ee0507 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/03-configure-high-availability.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/03-configure-high-availability.adoc @@ -1,8 +1,13 @@ --- title: "配置高可用性" +<<<<<<< HEAD linkTitle: "配置高可用性" keywords: "Kubernetes, KubeSphere, 安装, 准备, 高可用" description: "介绍如何在生产环境中为 KubeSphere 集群配置多个控制平面节点，以防止单个控制平面节点故障时集群服务中断，从而实现高可用性。" +======= +keywords: "Kubernetes, {ks_product}, 安装, 准备, 高可用" +description: "介绍如何在生产环境中为{ks_product_both}集群配置多个控制平面节点，以防止单个控制平面节点故障时集群服务中断，从而实现高可用性。" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 weight: 03 --- @@ -38,9 +43,15 @@ spec: address: "" port: 6443 +<<<<<<< HEAD ---- KubeKey 将自动在工作节点上安装 HAProxy 并完成高可用配置，您无需进行其他操作。有关更多信息请参阅link:../../02-install-kubesphere/02-install-kubernetes-and-kubesphere/[安装 Kubernetes 和 KubeSphere]。 +======= +include::../../../../_ks_components/code/codeEnd.adoc[] + +KubeKey 将自动在工作节点上安装 HAProxy 并完成高可用配置，您无需进行其他操作。有关更多信息请参阅link:../../02-install-kubesphere/02-install-kubernetes-and-kubesphere/[安装 Kubernetes 和 KubeSphere 企业版]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 == 使用专用负载均衡器 如需使用云环境提供的专用负载均衡器实现高可用性，您需要在云环境中进行以下操作： @@ -74,7 +85,11 @@ include::../../../../_ks_components/code/bash.adoc[] apt install keepalived haproxy psmisc -y +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令编辑 HAProxy 的配置文件： @@ -85,7 +100,11 @@ include::../../../../_ks_components/code/bash.adoc[] vi /etc/haproxy/haproxy.cfg +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 在 HAProxy 的配置文件中添加以下信息并保存文件（将 替换为{ks_product_both}集群各控制平面节点的私网 IP 地址）： @@ -129,7 +148,11 @@ backend kube-apiserver server kube-apiserver-2 :6443 check server kube-apiserver-3 :6443 check +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令重启 HAProxy： @@ -140,7 +163,11 @@ include::../../../../_ks_components/code/bash.adoc[] systemctl restart haproxy +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令设置 HAProxy 开机后自动运行： @@ -151,7 +178,11 @@ include::../../../../_ks_components/code/bash.adoc[] systemctl enable haproxy +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令编辑 Keepalived 的配置文件： @@ -162,7 +193,11 @@ include::../../../../_ks_components/code/bash.adoc[] vi /etc/keepalived/keepalived.conf +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 在 Keepalived 的配置文件中添加以下信息并保存文件： @@ -210,7 +245,11 @@ vrrp_instance haproxy-vip { } } +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 将以下参数替换为实际值： @@ -240,7 +279,11 @@ include::../../../../_ks_components/code/bash.adoc[] systemctl restart keepalived +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令设置 Keepalived 开机后自动运行： @@ -251,7 +294,11 @@ include::../../../../_ks_components/code/bash.adoc[] systemctl enable keepalived +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 重复以上步骤在另一台负载均衡器服务器上安装、配置 HAProxy 和 Keepalived。 @@ -269,7 +316,11 @@ include::../../../../_ks_components/code/bash.adoc[] ip a s +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 如果系统高可用性正常，命令回显中将显示已配置的浮动 IP 地址。例如，在以下命令回显中，**inet 172.16.0.10/24 scope global secondary eth0** 表明浮动 IP 地址已与 eth0 网卡绑定： @@ -291,7 +342,11 @@ include::../../../../_ks_components/code/bash.adoc[] inet6 fe80::510e:f96:98b2:af40/64 scope link noprefixroute valid_lft forever preferred_lft forever +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令模拟当前负载均衡器服务器故障： @@ -302,7 +357,11 @@ include::../../../../_ks_components/code/bash.adoc[] systemctl stop haproxy +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令再次检查浮动 IP 地址： @@ -313,7 +372,11 @@ include::../../../../_ks_components/code/bash.adoc[] ip a s +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 如果系统高可用性正常，命令回显中将不再显示浮动 IP 地址，如以下命令回显所示： @@ -333,7 +396,11 @@ include::../../../../_ks_components/code/bash.adoc[] inet6 fe80::510e:f96:98b2:af40/64 scope link noprefixroute valid_lft forever preferred_lft forever +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 登录另一台负载均衡器服务器，执行以下命令查看浮动 IP 地址： @@ -344,7 +411,11 @@ include::../../../../_ks_components/code/bash.adoc[] ip a s +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 如果系统高可用性正常，命令回显中将显示已配置的浮动 IP 地址。例如，在以下命令回显中，**inet 172.16.0.10/24 scope global secondary eth0** 表明浮动 IP 地址已与 eth0 网卡绑定： @@ -366,7 +437,11 @@ include::../../../../_ks_components/code/bash.adoc[] inet6 fe80::f67c:bd4f:d6d5:1d9b/64 scope link noprefixroute valid_lft forever preferred_lft forever +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 在第一台负载均衡器服务器上执行以下命令恢复运行 HAProxy： @@ -377,5 +452,9 @@ include::../../../../_ks_components/code/bash.adoc[] systemctl start haproxy +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/01-configure-storage-devices-on-cloud.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/01-configure-storage-devices-on-cloud.adoc index b0f817667..e30a0859b 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/01-configure-storage-devices-on-cloud.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/01-configure-storage-devices-on-cloud.adoc @@ -1,8 +1,13 @@ --- title: "配置云上存储设备" +<<<<<<< HEAD linkTitle: "配置云上存储设备" keywords: "Kubernetes, KubeSphere, 安装, 准备, 持久化存储, 云上存储设备" description: "介绍如何在生产环境中为 KubeSphere 集群配置云上存储设备。" +======= +keywords: "Kubernetes, {ks_product}, 安装, 准备, 持久化存储, 云上存储设备" +description: "介绍如何在生产环境中为{ks_product_both}集群配置云上存储设备。" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 weight: 01 --- @@ -46,7 +51,11 @@ include::../../../../../_ks_components/code/bash.adoc[] vi csi-qingcloud.yaml +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 将以下信息添加到配置文件中，并保存文件供后续安装{ks_product_both}时使用： @@ -62,7 +71,11 @@ config: sc: isDefaultClass: true +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 将以下参数替换为实际值： diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/04-configure-neosan-csi.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/04-configure-neosan-csi.adoc index e45f27a27..afffe157a 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/04-configure-neosan-csi.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/04-configure-neosan-csi.adoc @@ -1,8 +1,13 @@ --- title: "配置 NeonSAN CSI" +<<<<<<< HEAD linkTitle: "配置 NeonSAN CSI" keywords: "Kubernetes, KubeSphere, 安装, 准备, 持久化存储, 网络文件系统, NeonSAN CSI" description: "介绍如何在生产环境中为 KubeSphere 集群配置 NeonSAN CSI。" +======= +keywords: "Kubernetes, {ks_product}, 安装, 准备, 持久化存储, 网络文件系统, NeonSAN CSI" +description: "介绍如何在生产环境中为{ks_product_both}集群配置 NeonSAN CSI。" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 weight: 04 --- @@ -15,7 +20,11 @@ NeonSAN 是青云的一款企业级分布式块存储系统，NeonSAN CSI 是 Ne == 前提条件 +<<<<<<< HEAD - 您已经成功部署 NeonSAN v2.2.0 及以上版本，且容器集群的每个节点都已安装 QBD 与 NeonSAN 连通。具体操作请咨询 KubeSphere 技术支持人员。 +======= +- 您已经成功部署 NeonSAN v2.2.0 及以上版本，且容器集群的每个节点都已安装 QBD 与 NeonSAN 连通。具体操作请咨询 KubeSphere 企业版技术支持人员。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 - 您已经安装 Kubernetes v1.16 及其以上版本。 - 您已经在容器集群的 master 节点安装了 Helm。本节以 Helm 3 为例。 @@ -36,7 +45,11 @@ include::../../../../../_ks_components/code/bash.adoc[] $ helm repo add ks-test https://charts.kubesphere.io/test "ks-test" has been added to your repositories +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令查看仓库是否添加成功。 @@ -49,7 +62,11 @@ $ helm repo list NAME        URL ks-test     https://charts.kubesphere.io/test +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令更新仓库的 Chart 列表。 @@ -60,7 +77,11 @@ include::../../../../../_ks_components/code/bash.adoc[] $ helm repo update +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令在仓库中查找 NeonSAN CSI 的安装包。 @@ -73,7 +94,11 @@ $ helm search repo neonsan NAME                CHART VERSION   APP VERSION DESCRIPTION ks-test/csi-neonsan 1.2.2           1.2.0       A Helm chart for NeonSAN CSI Driver +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 查看 Master 节点上安装的 qbd 版本。 @@ -88,7 +113,11 @@ Loaded Module Version: 2.2.0-336092c-202209010306-testlangchaor01n01 NeonSAN Static Library Version: 3.0.0-092498bf NeonSAN Protocol Version: 1 +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令安装 NeonSAN CSI。根据 Master 节点操作系统上安装的 qbd 版本，设置参数 **driver.repository**，例如如果查询到的 qbd 版本为 2.2.0，则命令里的参数为 **driver.repository="csiplugin/csi-neonsan-qbd2.2.0"**。 @@ -105,7 +134,11 @@ STATUS: deployed REVISION: 1 TEST SUITE: None +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令检查 NeonSAN CSI 是否安装成功。 @@ -118,7 +151,11 @@ $ helm list -n kube-system NAME                    NAMESPACE   REVISION    UPDATED                                 STATUS      CHART                           APP VERSION csi-neonsan             kube-system 1           2020-11-20 10:28:32.240990384 +0800 CST deployed    csi-neonsan-1.2.2               1.2.0 +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 检查 pod 是否在 Running 状态。 @@ -133,7 +170,11 @@ $ kubectl get pod -n kube-system | grep csi-neonsan kube-system                    csi-neonsan-node-dxk2z                                 2/2     Running     0          38s kube-system                    csi-neonsan-node-mp2b2                                 2/2     Running     0          38s +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 检查是否所有 NeonSAN CSI 组件运行正常。 @@ -149,7 +190,11 @@ $ kubectl -n kube-system get deployments.apps  csi-neonsan-controller NAME                     READY   UP-TO-DATE   AVAILABLE   AGE csi-neonsan-controller   1/1     1            1           66m +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- * 当 **DESIRED** 取值等于 **READY** 和 **AVAILABLE** 取值时，csi-neonsan-node 正常。 @@ -162,7 +207,11 @@ $ kubectl -n kube-system get daemonsets.apps csi-neonsan-node NAME               DESIRED   CURRENT   READY   UP-TO-DATE   AVAILABLE   NODE SELECTOR   AGE csi-neonsan-node   3         3         3       3            3                     66m +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- ==== @@ -176,7 +225,11 @@ $ kubectl get storageclass NAME              PROVISIONER                            RECLAIMPOLICY   VOLUMEBINDINGMODE      ALLOWVOLUMEEXPANSION   AGE csi-neonsan       neonsan.csi.qingstor.com               Delete          Immediate              true                   2m56s +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 查看存储类所使用的存储池。此存储池必须在 NeonSAN 中存在, 否则无法使用此存储类创建存储卷。 @@ -188,7 +241,11 @@ include::../../../../../_ks_components/code/bash.adoc[] $ kubectl get storageclass csi-neonsan -o yaml | grep pool_name pool_name: kube +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 登陆 NeonSAN 服务器, 查看存储类所使用的存储池是否存在，如不存在，请使用 **neonsan create_pool** 命令创建存储池。 @@ -205,7 +262,11 @@ Pool Count:  1 | 33554432 | kube | 2020-08-07T14:53:52+08:00 | +----------+------+---------------------------+ +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- @@ -226,7 +287,11 @@ $ helm pull ks-test/csi-neonsan $ ls -l csi-neonsan*.tgz -rw-r--r--. 1 root root 5196 Nov 20 13:13 csi-neonsan-1.2.2.tgz +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令查看 NeonSAN CSI 所需要的所有镜像文件。 @@ -259,7 +324,11 @@ registrar: repository: csiplugin/csi-node-driver-registrar tag: v1.2.0 +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 使用 Docker 将所有镜像下载到本地并打包，或上传至内网仓库（如 harbor）中。 @@ -276,7 +345,11 @@ docker pull csiplugin/csi-resizer:v0.4.0 docker pull csiplugin/csi-snapshotter:v2.0.1 docker pull csiplugin/csi-node-driver-registrar:v1.2.0 +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- + -- @@ -292,7 +365,11 @@ docker save csiplugin/csi-neonsan:v1.2.0 \ csiplugin/csi-node-driver-registrar:v1.2.0 \ -o neonsan-csi-images.tar +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令将镜像包上传至集群所有节点的目录，如 **/tmp** 目录下，解压并安装。 @@ -304,14 +381,22 @@ include::../../../../../_ks_components/code/bash.adoc[] $ scp neonsan-csi-images.tar user@node1:/tmp/ scp neonsan-csi-images.tar user@node2:/tmp/ ... +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // Bash include::../../../../../_ks_components/code/bash.adoc[] $ tar -xvf /tmp/neonsan-csi-images.tar -C / +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令检查安装是否完成。如果您看到所有的 NeonSAN CSI 镜像已经在列表中，那么说明安装成功。 @@ -322,11 +407,20 @@ include::../../../../../_ks_components/code/bash.adoc[] $ docker images +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 参考link:#_在线安装_neonsan_csi[在线安装]中步骤 8 - 12 执行安装后检查。 + -- +<<<<<<< HEAD NeonSAN CSI 安装成功后，您可以在 KubeSphere 控制台上的**存储**区域查看。 -- +======= +NeonSAN CSI 安装成功后，您可以在 KubeSphere 企业版控制台上的**存储**区域查看。 +-- +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/05-configure-nfs.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/05-configure-nfs.adoc index 51f5caa2d..6244ce699 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/05-configure-nfs.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/05-configure-nfs.adoc @@ -1,8 +1,13 @@ --- title: "配置 NFS" +<<<<<<< HEAD linkTitle: "配置 NFS" keywords: "Kubernetes, KubeSphere, 安装, 准备, 持久化存储, 网络文件系统, NFS" description: "介绍如何在生产环境中为 KubeSphere 集群配置网络文件系统（NFS）。" +======= +keywords: "Kubernetes, {ks_product}, 安装, 准备, 持久化存储, 网络文件系统, NFS" +description: "介绍如何在生产环境中为{ks_product_both}集群配置网络文件系统（NFS）。" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 weight: 05 --- @@ -36,14 +41,22 @@ include::../../../../../_ks_components/code/bash.adoc[] sudo apt update +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // Bash include::../../../../../_ks_components/code/bash.adoc[] sudo apt install nfs-kernel-server +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令创建供{ks_product_both}使用的目录（将 替换为实际的目录路径，例如 **/mnt/demo**）： @@ -54,7 +67,11 @@ include::../../../../../_ks_components/code/bash.adoc[] sudo mkdir -p +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令移除目录的访问限制（将 替换为实际的目录路径，例如 **/mnt/demo**）： @@ -65,14 +82,22 @@ include::../../../../../_ks_components/code/bash.adoc[] sudo chown nobody:nogroup +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // Bash include::../../../../../_ks_components/code/bash.adoc[] sudo chmod 777 +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令编辑 NFS Kernel Server 的配置文件： @@ -83,7 +108,11 @@ include::../../../../../_ks_components/code/bash.adoc[] sudo vi /etc/exports +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 将{ks_product_both}集群节点的信息添加到文件中从而允许服务器访问 NFS 服务端，并保存文件： @@ -94,7 +123,11 @@ include::../../../../../_ks_components/code/bash.adoc[] (rw,sync,no_subtree_check) +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 将以下参数替换为实际值： @@ -120,7 +153,11 @@ include::../../../../../_ks_components/code/bash.adoc[] sudo exportfs -a +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令重启 NFS 服务端使配置生效： @@ -131,7 +168,11 @@ include::../../../../../_ks_components/code/bash.adoc[] sudo systemctl restart nfs-kernel-server +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- == 配置{ks_product_both}集群节点 @@ -154,14 +195,22 @@ include::../../../../../_ks_components/code/bash.adoc[] sudo apt update +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // Bash include::../../../../../_ks_components/code/bash.adoc[] sudo apt install nfs-common +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 登录用于执行{ks_product_both}安装操作的集群节点，执行以下命令创建 NFS 存储插件配置文件： @@ -173,7 +222,11 @@ include::../../../../../_ks_components/code/bash.adoc[] vi nfs-client.yaml +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 将以下信息添加到配置文件中，并保存文件供后续安装{ks_product_both}时使用： @@ -188,7 +241,11 @@ nfs: storageClass: defaultClass: true +<<<<<<< HEAD ---- +======= +include::../../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 将以下参数替换为实际值： diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/_index.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/_index.adoc index d585e0f4d..0e8ea9136 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/_index.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/04-configure-external-persistent-storage/_index.adoc @@ -1,9 +1,14 @@ --- title: "配置外部持久化存储" +<<<<<<< HEAD linkTitle: "配置外部持久化存储" keywords: "Kubernetes, KubeSphere, 安装, 准备, 持久化存储" description: "介绍如何在生产环境中为 KubeSphere 集群配置外部持久化存储系统。" layout: "second" +======= +keywords: "Kubernetes, {ks_product}, 安装, 准备, 持久化存储" +description: "介绍如何在生产环境中为{ks_product_both}集群配置外部持久化存储系统。" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 weight: 04 --- diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/_index.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/_index.adoc index bf6cc26a2..01b4504e6 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/_index.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/01-preparations/_index.adoc @@ -1,9 +1,14 @@ --- title: "准备工作" +<<<<<<< HEAD linkTitle: "准备工作" keywords: "Kubernetes, KubeSphere , 安装, 准备工作" description: "介绍安装 KubeSphere 前需要进行的准备工作。" layout: "second" +======= +keywords: "Kubernetes, {ks_product}, 安装, 准备工作" +description: "介绍安装{ks_product_both}前需要进行的准备工作。" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 weight: 01 --- diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc index 012a80cff..04c3a1a3e 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc @@ -1,8 +1,14 @@ --- +<<<<<<< HEAD title: "安装 Kubernetes 和 KubeSphere" linkTitle: "安装 Kubernetes 和 KubeSphere" keywords: "Kubernetes, {ks_product}, 安装, 安装{ks_product_left}, 安装 Kubernetes" description: "介绍如何在生产环境中安装 Kubernetes 和{ks_product_left}。" +======= +title: "安装 Kubernetes 和 KubeSphere 企业版" +keywords: "Kubernetes, {ks_product}, 安装, 安装{ks_product_left}, 安装 Kubernetes" +description: "介绍如何安装 Kubernetes 和{ks_product_left}。" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 weight: 02 --- @@ -14,17 +20,28 @@ weight: 02 == 前提条件 +<<<<<<< HEAD +======= +* 您需要联系{ks_product_both}的服务支持团队获取{ks_product_left} v4.1.0 安装包。 + +// 如实施现场条件允许在线拉取公开仓库，具备在线安装条件，可联系 KubeSphere 产品团队获取在线安装文件及相关信息。 + +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 * 您需要准备至少 1 台 Linux 服务器作为集群节点。在生产环境中，为确保集群具备高可用性，建议准备至少 5 台 Linux 服务器，其中 3 台作为控制平面节点，另外 2 台作为工作节点。如果您在多台 Linux 服务器上安装{ks_product_left}，请确保所有服务器属于同一子网。 * 集群节点的操作系统和版本须为 Ubuntu 16.04、Ubuntu 18.04、Ubuntu 20.04、Ubuntu 22.04、Debian 9、Debian 10、CentOS 7、CentOS Stream、RHEL 7、RHEL 8、SLES 15 或 openSUSE Leap 15。多台服务器的操作系统可以不同。关于其它操作系统和版本支持，请联系{ks_product_both}技术支持。 * 在生产环境中，为确保集群具有足够的计算和存储资源，建议每台集群节点配置至少 8 个 CPU 核心、16 GB 内存和 200 GB 磁盘空间。除此之外，建议在每台集群节点的 **/var/lib/docker**（对于 Docker）或 **/var/lib/containerd**（对于 containerd） 目录额外挂载至少 200 GB 磁盘空间用于存储容器运行时数据。 +<<<<<<< HEAD // :relfileprefix: ../../../ // include::../../../_custom/installationAndUpgrade/installationAndUpgrade-prer-offlineInstallation.adoc[] // :relfileprefix: ./ +======= +* 除集群节点外，您还需要准备一台 Linux 服务器用于创建私有镜像服务，该服务器必须与{ks_product_both}集群节点网络连通，并且在 **/mnt/registry** 目录挂载至少 100 GB 磁盘空间。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 * 在生产环境中，建议提前为{ks_product_both}集群配置高可用性以避免单个控制平面节点出现故障时集群服务中断。有关更多信息，请参阅link:../../../03-installation-and-upgrade/01-preparations/03-configure-high-availability/[配置高可用性]。 + @@ -163,6 +180,7 @@ include::../../../../_ks_components/code/bash.adoc[] sudo apt install socat conntrack ebtables ipset -y +<<<<<<< HEAD ---- 如果集群节点使用其他操作系统，请将 **apt** 替换为操作系统对应的软件包管理工具。 @@ -194,6 +212,51 @@ include::../../../../_ks_components/code/bash.adoc[] include::../../../_custom/installationAndUpgrade/installationAndUpgrade-note-doNotDeleteConfig_v4.adoc[] -- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] + +如果集群节点使用其他操作系统，请将 **apt** 替换为操作系统对应的软件包管理工具。 + +== 查看安装包内容 + +了解{ks_product_left} v4.1.0 的安装包内容，以便进行后续步骤。 + +安装包包含以下文件： + +[,bash] +---- +kse-all-v4.1.0-offline-linux-amd64/ +├── charts +│   ├── ks-core # KubeSphere 企业版核心组件 +│   ├── kse-extensions-publish # 用于发布 KubeSphere 企业版扩展组件 +│   ├── csi-qingcloud # 用于对接青云云平台存储 +│   ├── csi-neonsan # 用于对接 NeonSan 存储 +│   └── nfs-client-provisioner # 用于对接 NFS 存储 +├── tools +│ ├── pre-check.sh # 用于 KubeSphere 企业版升级前的集群环境检查 +│ ├── backup.sh # 用于 KubeSphere 企业版升级前备份系统企业空间中的关键资源 +│ └── upgrade.sh # KubeSphere 企业版升级脚本，提供快速升级能力 +│ ├── oras # OCI 工具，便于镜像同步等操作 +│ └── ks-core-values.yaml # 升级配置示例文件，用于配置各组件的升级参数 +├── kse-extensions # 其中包含所有扩展组件的 installplan，可用于快速安装 KubeSphere 企业版扩展组件 +├── config-sample.yaml # 安装配置文件的模版 +├── create_project_harbor.sh # 用于快速创建 harbor 项目 +├── kk # 集群部署工具 +├── kubekey-artifact.tar.gz # KubeSphere 企业版制品，其中包含集群部署所需的二进制文件及镜像 +└── manifest-v410-amd64.yaml # KubeSphere 企业版制品清单，其中包含各组件的版本以及镜像列表 +---- + + + +== 配置安装配置文件 + +**config-sample.yaml** 是{ks_product_both}的安装配置文件，请先配置该文件，以便进行后续步骤。 + +include::../../../_custom/installationAndUpgrade/installationAndUpgrade-note-doNotDeleteConfig_v4.adoc[] + +include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage_new.adoc[] ++ +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 . 执行以下命令编辑安装配置文件 **config-sample.yaml**： + @@ -202,7 +265,12 @@ include::../../../_custom/installationAndUpgrade/installationAndUpgrade-note-doN include::../../../../_ks_components/code/bash.adoc[] vi config-sample.yaml +<<<<<<< HEAD ---- +======= + +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 以下为部分示例配置文件，如需了解完整示例，请参阅link:https://github.com/kubesphere/kubekey/blob/master/docs/config-example.md[此文件]。 @@ -257,13 +325,21 @@ spec: "dockerhub.kubekey.local": username: admin # harbor 默认用户名 password: Harbor12345 # harbor 默认密码 +<<<<<<< HEAD plainHTTP: false  # 如果仓库使用 http，请将该参数设置为 true +======= + plainHTTP: false  # 如果仓库使用 http，请将该参数设置为true +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 privateRegistry: "dockerhub.kubekey.local/kse"   # 设置集群部署时使用的私有仓库地址 registryMirrors: [] insecureRegistries: [] addons: [] +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 在 **config-sample.yaml** 配置文件的 **spec:hosts** 参数下设置各服务器的信息。 @@ -292,45 +368,74 @@ include::../../../_custom/installationAndUpgrade/installationAndUpgrade-para-con + -- // Bash +<<<<<<< HEAD [,bash] ---- +======= +include::../../../../_ks_components/code/bash.adoc[] + +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 - name: csi-qingcloud namespace: kube-system sources: chart: name: csi-qingcloud +<<<<<<< HEAD repo: https://charts.kubesphere.io/test valuesFile: ---- +======= + path: charts/csi-qingcloud + valuesFile: +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- * 如果使用 NeonSAN 存储设备，在 **spec:addons** 下设置以下参数（将 替换为存储插件配置文件的实际路径）： + -- // Bash +<<<<<<< HEAD [,bash] ---- +======= +include::../../../../_ks_components/code/bash.adoc[] + +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 - name: csi-neonsan namespace: kube-system sources: chart: name: csi-neonsan +<<<<<<< HEAD repo: https://charts.kubesphere.io/test valuesFile: ---- +======= + path: charts/csi-neonsan + valuesFile: + +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- * 如果使用 NFS 存储系统，在 **spec:addons** 下设置以下参数（将 替换为存储插件配置文件的实际路径）： + -- // Bash +<<<<<<< HEAD [,bash] ---- +======= +include::../../../../_ks_components/code/bash.adoc[] + +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 - name: nfs-client namespace: kube-system sources: chart: name: nfs-client-provisioner +<<<<<<< HEAD repo: https://charts.kubesphere.io/main valuesFile: ---- @@ -352,12 +457,127 @@ include::../../../../_ks_components/admonitions/note.adoc[] include::../../../../_ks_components/admonitions/admonEnd.adoc[] +======= + repo: charts/nfs-client-provisioner + valuesFile: + +include::../../../../_ks_components/code/codeEnd.adoc[] +-- +==== + +== 创建私有镜像仓库 + +[.admon.attention,cols="a"] +|=== +|注意 + +| +如果您已有可用的镜像仓库，可跳过此步骤。但需要把私有镜像服务的默认地址 **dockerhub.kubekey.local/kse** 替换为您的实际镜像仓库地址。 +|=== + +. 在配置文件 **config-sample.yaml** 的 **spec:hosts** 参数下设置用于创建私有镜像服务的服务器的信息。 ++ +-- +[,yaml] +---- +spec: + hosts: + - {name: registry, address: 192.168.0.6, internalAddress: 192.168.0.6, user: ubuntu, password: Testing123} +---- + +include::../../../_custom/installationAndUpgrade/installationAndUpgrade-para-hosts.adoc[] +-- + +. 在 **spec:roleGroups:registry** 参数下设置用于创建私有镜像服务的服务器名称（将 替换为 **spec:hosts** 参数下设置的服务器实际名称）。 ++ +[,yaml] +---- +spec: + roleGroups: + registry: + - +---- + +. 将 **spec:registry:privateRegistry** 参数设置为私有镜像服务的默认地址 **dockerhub.kubekey.local/kse**，然后保存文件。 ++ +[,yaml] +---- +spec: + registry: + registryMirrors: [] + insecureRegistries: [] + privateRegistry: dockerhub.kubekey.local/kse +---- + + +. 执行以下命令初始化私有镜像服务： ++ +==== +[,bash] +---- +./kk init registry -f config-sample.yaml -a kubekey-artifact.tar.gz +---- + +如果显示如下信息，则表明镜像仓库创建成功。 + +image:/images/ks-qkcp/zh/v4.1/verify-registry.png[verify-registry, 100%] + +include::../../../_custom/installationAndUpgrade/installationAndUpgrade-note-initializeRegistry.adoc[] + +==== + +. 若 **spec:registry:type** 参数设置为 **harbor**，执行以下命令创建 Harbor 项目。 ++ +-- +// Bash +include::../../../../_ks_components/code/bash.adoc[] + +bash create_project_harbor.sh + +include::../../../../_ks_components/code/codeEnd.adoc[] + +创建 harbor 项目后，在 **config-sample.yaml** 中配置 **spec:registry:auths** 参数。 + +[.admon.note,cols="a"] +|=== +|说明 + +| +harbor 安装文件在 /opt/harbor 目录下，可在该目录下对 harbor 进行运维。 + +|=== +-- + ++ + +include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-editHosts_v4.adoc[] + +== 安装 Kubernetes + +// Note +include::../../../../_ks_components/admonitions/note.adoc[] + +* 如果您已有可用的 Kubernetes 集群，可跳过此步骤。 + +* 安装包中集成了 CentOS 7、Ubuntu 18.04、Ubuntu 20.04、Ubuntu 22.04 依赖包，如使用这些操作系统需要使用 kk 自动安装系统依赖，可在安装命令后添加 --with-packages ; 如使用这些操作系统之外的操作系统或由于依赖问题导致失败，需手动安装相关依赖（conntrack）。 + +* 如需使用 openebs localpv，可在如下命令后添加参数 --with-local-storage，如需对接其他存储，可在配置文件 addons 中添加配置相关存储插件，或 Kubernetes 集群部署完成后自行安装。 + +* 如使用 kk 部署的 harbor，请确保安装 Kubernetes 之前，已创建 harbor 项目，且配置文件 config-sample.yaml 中已配置 spec:registry:auths 参数。 + +include::../../../../_ks_components/admonitions/admonEnd.adoc[] + +执行以下命令创建 Kubernetes 集群： + +include::../../../_custom/installationAndUpgrade/installationAndUpgrade-startInstallationOffline.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 如果显示如下信息，则表明 Kubernetes 集群创建成功。 [,yaml] ---- Pipeline[CreateclusterPipeline] execute successfully +<<<<<<< HEAD ---- -- @@ -383,6 +603,55 @@ helm upgrade --install -n kubesphere-system --create-namespace ks-core chart=htt ---- 如果显示如下信息，则表明 ks-core 安装成功： +======= +Installation is complete. +---- + + +== 导入镜像到私有镜像仓库 + +执行以下命令将镜像导入到指定的私有镜像仓库中。 + +[,bash] +---- +./kk artifact images push -f config-sample.yaml -a kubekey-artifact.tar.gz +---- + +如果显示如下信息，则表明导入成功。 + +[,yaml] +---- +Pipeline[ArtifactImagesPushPipeline] execute successfully +---- + +== 安装{ks_product_left} + +=== 步骤 1：部署 ks-core + +. 在集群节点，执行以下命令安装 KubeSphere Core。 ++ +==== +[,bash] +---- +helm upgrade --install -n kubesphere-system --create-namespace ks-core charts/ks-core \ +--debug \ +--wait \ +--set cloud.enabled=false \ +--set upgrade.enabled=false \ +--set global.imageRegistry=dockerhub.kubekey.local/kse \ +--set extension.imageRegistry=dockerhub.kubekey.local/kse +---- + +[.admon.attention,cols="a"] +|=== +|注意 + +| +将 **global.imageRegistry** 和 **extension.imageRegistry** 的默认地址 **dockerhub.kubekey.local/kse** 替换为您的实际镜像仓库地址。 +|=== + +取决于您的硬件和网络环境，您可能需要配置流量转发规则并在防火墙中放行 30880 端口。如果显示如下信息，则表明 ks-core 安装成功： +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 [,yaml] ---- @@ -423,9 +692,110 @@ For additional information and details, please visit https://kubesphere.io. |说明 | +<<<<<<< HEAD 取决于您的网络环境，您可能需要配置流量转发规则并在防火墙中放行 30880 端口。 |=== // 此时，{ks_product_right} Web 控制台仅提供{ks_product_both}的核心功能。 -// * 若要使用扩展组件，还需link:../../../06-extension-user-guide/02-subscribe-and-install-components[订阅并安装扩展组件]。 \ No newline at end of file +// * 若要使用扩展组件，还需link:../../../06-extension-user-guide/02-subscribe-and-install-components[订阅并安装扩展组件]。 +======= +此时，{ks_product_right} Web 控制台仅提供{ks_product_both}的核心功能，若要使用扩展组件，还需继续执行以下 2 个步骤以便安装扩展组件。 +|=== + +=== 步骤 2：发布扩展组件 + +执行以下命令，将{ks_product_both}提供的所有扩展组件导入到 Web 控制台的扩展中心。 + +[,bash] +---- +helm template -n kubesphere-system charts/kse-extensions-publish --set museum.enabled=true,global.imageRegistry=dockerhub.kubekey.local/kse | kubectl apply -f - +---- + +如果显示如下信息，则表明扩展组件发布成功。 + +image:/images/ks-qkcp/zh/v4.1/verify-extension-release.png[verify-extension-release, 100%] + +=== 步骤 3：部署扩展组件 + +发布扩展组件后，登录{ks_product_left} Web 控制台，可在扩展中心查看并安装扩展组件。或者，按照以下步骤快速部署扩展组件。 + +. 若要安装可观测相关扩展组件，需要先部署 vector（WhizardTelemetry 数据流水线）和 whizard-monitoring（WhizardTelemetry 监控）扩展组件。否则，可跳过此步骤。 ++ +-- +[,bash] +---- +# 安装 vector 和 whizard-monitoring +kubectl apply -f kse-extensions/vector-installplan.yaml +kubectl apply -f kse-extensions/whizard-monitoring-installplan.yaml + +# 检查 vector 和 whizard-monitoring 的安装状态，等待状态变为 Installed +kubectl get installplan vector -w +kubectl get installplan whizard-monitoring -w +---- +-- + + +. 执行以下命令，安装指定扩展组件或所有扩展组件。 ++ +-- +[,bash] +---- +# 安装指定扩展组件，请将 {EXTENSION-NAME} 替换为实际名称 +kubectl apply -f kse-extensions/{EXTENSION-NAME}-installplan.yaml + +# 安装所有扩展组件 +kubectl apply -f kse-extensions +---- + +[.admon.note,cols="a"] +|=== +|说明 + +| +* 在{ks_product_both}安装包的 kse-extensions 目录下获取各个扩展组件的 `{EXTENSION-NAME}`，也可参考下图获取。 +* 点击link:../../../03-installation-and-upgrade/03-upgrade-kubesphere/05-appendix-ks-core#_升级组件清单[此处]查看组件清单，了解更多信息。 +|=== + +[.admon.attention,cols="a"] +|=== +|注意 + +| +对于已修改扩展组件配置的扩展组件，请勿重新执行 `kubectl apply -f kse-extensions/{EXTENSION-NAME}-installplan.yaml`，避免扩展组件配置被覆盖。 +|=== +-- + +. 执行以下命令，等待扩展组件状态变更为 **Installed**，则表明部署成功。 ++ +-- +[,bash] +---- +kubectl get installplan -w +---- + +image:/images/ks-qkcp/zh/v4.1/verify-extension-installed.png[ verify-extension-installed,100%] +-- + +// . 如需安装 Spring Cloud 扩展组件，可提前安装。否则，可跳过此步骤。 +// + +// -- +// [.admon.attention,cols="a"] +// |=== +// |注意 + +// | +// Spring Cloud 启动较慢，且包含聚合 API，因此 Spring Cloud 完全启动前会导致需要连接 kube-apiserver 的 Pod 异常，建议提前安装。 + +// |=== + +// [,bash] +// ---- +// # 安装 springcloud +// kubectl apply -f kse-extensions/springcloud-installplan.yaml + +// # 检查 springcloud 运行状态，确保 spring-cloud-controller-manager 和 springcloud-agent-nacos 为 running 状态 +// kubectl get pod -n extension-springcloud +// ---- +// -- +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/_index.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/_index.adoc index cf6f1e7a4..a7a228aae 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/_index.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/_index.adoc @@ -1,9 +1,15 @@ --- +<<<<<<< HEAD title: "安装 KubeSphere" linkTitle: "安装 KubeSphere" keywords: "Kubernetes,  KubeSphere, 安装" description: "介绍如何安装 KubeSphere。" layout: "second" +======= +title: "安装{ks_product_left}" +keywords: "Kubernetes, {ks_product}, 安装" +description: "介绍如何安装{ks_product_left}。" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 weight: 02 --- diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/03-upgrade-kubesphere/03-upgrade-kubephere.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/03-upgrade-kubesphere/03-upgrade-kubephere.adoc new file mode 100644 index 000000000..5f38c6905 --- /dev/null +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/03-upgrade-kubesphere/03-upgrade-kubephere.adoc @@ -0,0 +1,491 @@ +--- +title: "升级 KubeSphere 企业版" +keywords: "Kubernetes, {ks_product}, 安装, 升级{ks_product_left}" +description: "介绍如何升级{ks_product_left}。" +weight: 03 +--- + +本节介绍如何在保持当前的 Kubernetes 版本不变的情况下从{ks_product_both} v3.5.0 升级到{ks_product_both} v4.1.0。 + + +== 前提条件 + +* 您需要联系{ks_product_both}的服务支持团队获取{ks_product_left} v4.1.0 安装包，以及 license。 + +// 如实施现场条件允许在线拉取公开仓库，具备在线安装条件，可联系 KubeSphere 产品团队获取在线安装文件及相关信息。 + +* 请确保当前{ks_product_both}版本为 v3.5.0。如果您的{ks_product_both}版本低于 v3.5.0，请先将{ks_product_both}版本升级到 v3.5.0。 + +* 请确保当前 Kubernetes 版本为 v1.21.x、v1.22.x、v1.23.x, v1.24.x, v1.25.x, v1.26.x, v1.27.x 或 v1.28.x。 + +// :relfileprefix: ../../../ + +// include::../../../_custom/installationAndUpgrade/installationAndUpgrade-prer-offlineInstallation.adoc[] + +// :relfileprefix: ./ + +* {empty} +include::../../../_custom/installationAndUpgrade/installationAndUpgrade-prer-backUpData.adoc[] + +== 准备工作 + +. 将{ks_product_both} v4.1.0 安装包传输到所有集群的节点上。 ++ +[.admon.note,cols="a"] +|=== +|说明 + +| +若想了解安装包中各个文件的作用，请参阅link:../../02-install-kubesphere/02-install-kubernetes-and-kubesphere/#_查看安装包内容[查看安装包内容]。 +|=== + +. 使用 **backup.sh** 备份系统企业空间（system-workspace）下所有项目中的关键资源，以及备份所有自定义角色及权限相关资源。 ++ +-- +执行以下命令开始备份。相关资源将备份至 **backup-$timestamp** 目录下。 + +[,bash] +---- +bash backup.sh +---- + +备份完成后，如下图所示。 + +image:/images/ks-qkcp/zh/v4.1/backup.png[ backup, 100%] +-- + +. 联系{ks_product_both}的服务支持团队，根据当前集群的 cc.yaml 中的配置和 KubeSphere 组件的 patch 情况（如 cc.yaml 外的配置），确定升级时各组件使用的参数，然后创建 **ks-core-values.yaml** 文件。可参阅安装包中的 ks-core-values.yaml 示例文件。 ++ +-- +[.admon.attention,cols="a"] +|=== +|注意 + +| +* 在 ks-core-values.yaml 文件中，可将集群中没有启用的组件设置为 enabled: false。core 和 iam 组件必须配置为 enabled: true，不可禁用。 + +* 部分扩展组件在特定情况下（比如依赖外部服务的访问地址等），升级时不能使用**默认配置**，需手动配置一些字段。请参阅**组件升级配置文档**确认您的组件是否存在此问题，并在 ks-core-values.yaml 文件中做出相应修改。 +请在{ks_product_both} v4.1.0 用户文档中的**升级配置文档**文件夹下查阅“默认配置”和“组件升级配置文档”。 + +|=== +-- + +. 将安装包中的 **charts** 文件夹、以及创建的 **ks-core-values.yaml** 文件复制到 **upgrade.sh** 所在的 tools 目录。 + +. 执行安装包中的脚本 **pre-check.sh**，检查是否满足升级条件，需确保所有检查项通过。如果检查未通过，后续升级很有可能失败。 + + +== 单集群升级 + +. 在 host 集群节点上，切换到安装包的 tools 目录（该目录需包含 **charts** 文件夹、**ks-core-values.yaml** 和 **upgrade.sh**）。 + +. 执行以下命令开始升级{ks_product_left}。 ++ +-- +[,bash] +---- +bash upgrade.sh host +---- +-- + +. 参考以下步骤，检查 host 集群是否升级成功。 + +.. 执行以下命令，upgrade job 应该是成功完成的状态，如下所示。 ++ +[,bash] +---- +root@xxx:~# kubectl -n kubesphere-system get job | grep upgrade +ks-core-post-upgrade 1/1 16s 28m +ks-core-pre-upgrade 1/1 58s 31m +prepare-upgrade 1/1 26s 32m +---- + +.. 执行以下命令，如果显示如下信息，则表明 ks-core Helm Chart 已成功部署。 ++ +[,bash] +---- +root@xxx:~# helm list -n kubesphere-system +NAME NAMESPACE REVISION UPDATED STATUS CHART APP VERSION +ks-core kubesphere-system 6 2024-04-09 14:54:09.349488995 +0800 CST deployed ks-core-1.0.0 v4.1.0 +---- + +.. 执行以下命令，pod（ks-apiserver, ks-console, ks-controller-manager）应该为 running 状态，如下所示。 ++ +[,bash] +---- +root@xxx:~# kubectl -n kubesphere-system get pod +NAME READY STATUS RESTARTS AGE +ks-apiserver-594bb884db-phrlv 1/1 Running 0 28m +ks-console-7cd55dd9f9-f2jl9 1/1 Running 0 28m +ks-controller-manager-785fc676dc-9d9j2 1/1 Running 0 28m +---- + +.. 执行以下命令，如果所有扩展组件的状态为 Installed，表明扩展组件都已成功安装。 ++ +[,bash] +---- +root@xxx:~# kubectl get installplan +NAME STATE +storage-utils Installed +devops Installed +network Installed +... +---- + +.. 登录{ks_product_left} Web 控制台后，点击右上角用户名 > 关于，显示的平台版本应为 v4.1.0。 + +. 使用原有的 Web 控制台的 IP 地址、管理员用户名和管理员密码，并使用网页浏览器登录 v4.1.0 的{ks_product_left} Web 控制台。 + +. 根据激活提示点击**激活**，导入{ks_product_left}的 license。 + +. 检查 host 集群各项功能和数据是否正常。 + + +== 多集群升级 + +. 按照以上link:#_单集群升级[单集群升级]步骤完成 host 集群的升级。 + +. 在 member 集群节点上，切换到安装包的 tools 目录（该目录需包含 **charts** 文件夹、**ks-core-values.yaml** 和 **upgrade.sh**）。 + +. 执行以下命令开始升级{ks_product_left}。 ++ +[,bash] +---- +bash upgrade.sh member +---- + +. 参考以下步骤，检查 member 集群是否升级成功。 + +.. 执行以下命令，upgrade job 应该是成功完成的状态，如下所示。 ++ +[,bash] +---- +root@xxx:~# kubectl -n kubesphere-system get job | grep upgrade +ks-core-post-upgrade 1/1 16s 28m +ks-core-pre-upgrade 1/1 58s 31m +prepare-upgrade 1/1 26s 32m +---- + +.. 执行以下命令，如果显示如下信息，则表明 ks-core Helm Chart 已成功部署。 ++ +[,bash] +---- +root@xxx:~# helm list -n kubesphere-system +NAME NAMESPACE REVISION UPDATED STATUS CHART APP VERSION +ks-core kubesphere-system 6 2024-04-09 14:54:09.349488995 +0800 CST deployed ks-core-1.0.0 v4.1.0 +---- + +.. 执行以下命令，ks-agent pod 应该为 running 状态，如下所示。 ++ +[,bash] +---- +root@xxx:~# kubectl -n kubesphere-system get pod +NAME READY STATUS RESTARTS AGE +ks-agent-5dc5b57977-4x6mf 2/2 Running 0 59m +---- + +. member 集群升级成功后，在 host 集群上执行以下命令，修改 member 集群的状态，以便使扩展组件 agent 调度到 member 集群上。 ++ +-- +[,bash] +---- +kubectl get clusters.cluster.kubesphere.io {member-x} -o json | jq 'del(.status.conditions[] | select(.type=="Schedulable"))' | kubectl apply -f - +---- + +[.admon.note,cols="a"] +|=== +|说明 + +| 执行 `kubectl get cluster`，替换 `{member-x}`。 + +|=== + +如果节点没有 jq 命令，可通过编辑集群资源的方式实现，编辑 member 集群的 status.conditions 中 type 为 Schedulable 的 condition，将其 status 设置为 True。 + +[,bash] +---- +kubectl edit clusters.cluster.kubesphere.io {member-x} +---- + +[,yaml] +---- +status: + conditions: + - lastTransitionTime: "2024-04-11T09:12:22Z" + lastUpdateTime: "2024-04-11T09:12:22Z" + message: Cluster has been initialized + reason: Initialized + status: "True" + type: Initialized + - lastTransitionTime: "2024-04-12T07:59:14Z" + lastUpdateTime: "2024-04-12T07:59:14Z" + message: Cluster has joined federation control plane successfully + status: "True" + type: Federated + - lastTransitionTime: "2024-04-12T08:02:56Z" + lastUpdateTime: "2024-04-12T08:02:56Z" + message: KS Core is available now + reason: KSCoreReady + status: "True" + type: KSCoreReady + - lastTransitionTime: "2024-04-12T08:02:56Z" + lastUpdateTime: "2024-04-12T08:02:56Z" + message: Not schedulable now + reason: Upgrading + status: "False" # 修改此处即可 + type: Schedulable + - lastTransitionTime: "2024-04-12T08:24:27Z" + lastUpdateTime: "2024-04-12T08:24:27Z" + message: Agent has connected to proxy successfully. + status: "True" + type: AgentAvailable + - lastTransitionTime: "2024-04-12T08:57:40Z" + lastUpdateTime: "2024-04-12T08:57:40Z" + message: Cluster is available now + reason: Ready + status: "True" + type: Ready +---- +-- + +. 登录 host 集群的{ks_product_left} Web 控制台，进入**集群管理**页面，检查此 member 集群的各项功能和数据是否正常。 + +. 对下一个 member 集群继续执行以上步骤，直至完成所有集群的升级。 + +== 升级后配置 + +部分扩展组件，如 `KubeSphere 网关`、`WhizardTelemetry 监控`、`WhizardTelemetry 告警管理`、`WhizardTelemetry 通知管理`、`RadonDB DMP` 在升级后需进行额外配置，请参阅{ks_product_both} v4.1.0 用户文档中的**升级配置文档**文件夹下的**组件升级配置文档**进行配置。 + +[.admon.attention,cols="a"] +|=== +|注意 + +| +请务必参阅**组件升级配置文档**对升级后的 `KubeSphere 网关` 扩展组件进行配置，否则无法使用网关相关功能。 +|=== + +== 常见问题 + +=== 无法操作未升级的 member 集群 + +问题描述：host 集群升级到 v4.1.0 以后，无法在{ks_product_left} Web 控制台中查看和操作未升级的 member 集群。 + +原因：v4.1.0 与 v3.5.0 有许多 API 不兼容导致。 + +解决办法： + +* 尽快升级 member 集群。 +* 可在 member 集群升级前，通过 member 集群的 Web 控制台直接访问 member 集群。 + +=== member 集群的 Web 控制台无法登录 + +问题描述：在升级 member 集群前，通过 member 集群的 Web 控制台无法登录任何用户，提示"incorrect username or password"。 + +原因：{ks_product_right} v3.x 默认禁止直接访问 member 集群的 Web 控制台。 + +解决办法： + +. 执行以下命令，增加如下配置。 ++ +-- +[,bash] +---- +kubectl -n kubesphere-system edit cm kubesphere-config +---- + +[,yaml] +---- +authentication: + oauthOptions: + accessTokenMaxAge: 0 + clients: + - name: kubesphere + secret: kubesphere + redirectURIs: + - '*' +---- +-- + +. 执行以下命令重启 ks-apiserver，即可登录 member 集群的 Web 控制台。 ++ +[,bash] +---- +kubectl -n kubesphere-system rollout restart deployment ks-apiserver +---- + +=== 升级脚本异常退出 + +问题描述：升级过程中，升级脚本异常退出，升级失败。 + +解决办法：执行以下命令，查看升级 Job 日志，排查升级失败原因。 + +[,bash] +---- +kubectl -n kubesphere-system get job/prepare-upgrade + +kubectl -n kubesphere-system get pod |grep prepare-upgrade + +# 查看升级Job日志 +kubectl -n kubesphere-system logs prepare-upgrade-gvc6p +---- + +[,bash] +---- +kubectl -n kubesphere-system get job/ks-core-pre-upgrade + +kubectl -n kubesphere-system get pod |grep ks-core-pre-upgrade + +# 查看升级Job日志 +kubectl -n kubesphere-system logs ks-core-pre-upgrade-4n7tp +---- + +[,bash] +---- +kubectl -n kubesphere-system get job/ks-core-post-upgrade + +kubectl -n kubesphere-system get pod |grep ks-core-post-upgrade + +# 查看升级Job日志 +kubectl -n kubesphere-system logs ks-core-post-upgrade-4nzhk +---- + +=== 自定义角色的权限项为空 + +问题描述：升级后，自定义角色的权限项为空，被赋予自定义角色的用户无法正常使用。 + +解决办法： + +升级脚本 backup.sh 已帮助备份好自定义角色和自定义角色绑定，但由于权限变化，在升级时无法自动转换其权限，所以在升级后需要用户自行补充角色的权限。 + +. 使用升级脚本备份后，在 `backup-$timestamp/kse35-backup-iam-xxx.yaml` 路径下查看已经备份的自定义角色。 + +. 找到 `metadata.annotations[iam.kubesphere.io/aggregation-roles]`，用取到的值对比以下表格的 **3.x** 列中的名称，然后在{ks_product_left} Web 控制台找到对应的**描述**列中的权限名称。 ++ +-- +[.admon.note,cols="a"] +|=== +|说明 + +| +平台自定义角色请查阅以下**平台**表格，企业空间自定义角色请查阅以下**企业空间**表格，项目自定义角色请查阅以下**项目**表格，确认对应关系。 +|=== +-- + +**示例：** + +已经备份好的平台自定义角色 `test` 的信息如下 + +```yaml +apiVersion: iam.kubesphere.io/v1alpha2 +kind: GlobalRole +metadata: + annotations: + iam.kubesphere.io/aggregation-roles: '["role-template-view-roles","role-template-view-users","role-template-view-basic","role-template-manage-clusters","role-template-view-clusters"]' + kubesphere.io/alias-name: test-name + kubesphere.io/creator: admin + creationTimestamp: "2024-04-11T11:59:08Z" + generation: 3 + name: test #自定义角色的名称 + resourceVersion: "529194" + uid: a3ad5e39-2959-4e14-aa8f-e0c0ad8e6889 +rules: + ... + ... +``` + +. 取到 `metadata.annotations[iam.kubesphere.io/aggregation-roles]` 的值，如下： ++ +```yaml +'["role-template-view-roles","role-template-view-users","role-template-view-basic","role-template-manage-clusters","role-template-view-clusters"]' +``` + +. 对比以下**平台**表格，`metadata.annotations[iam.kubesphere.io/aggregation-roles]` 的各个值在表格的 **3.x** 列，对应的权限项在表格的**描述**列，故应该勾选**角色查看**、**用户查看**、**基础查看**、**集群管理**、**集群查看**。但因基础查看在 **4.1** 列被标记为 `none`，所以无法勾选**基础查看**。 + +. 在{ks_product_left} Web 控制台的**平台角色**页面编辑 `test` 角色的权限。 ++ +-- +image:/images/ks-qkcp/zh/v4.1/edit-permission.png[ edit-permission, 100%] + +勾选**角色查看**、**用户查看**、**集群管理**、**集群查看**。 + +image:/images/ks-qkcp/zh/v4.1/check-permission.png[ check-permission, 100%] +-- + +[.admon.attention,cols="a"] +|=== +|注意 + +| +一些权限项在 v4.1.0 中已经移除，标记为 `none`。有些没有移除，但出于安全考虑无法再将此权限授权给自定义角色，标记为 `can not use`。标记为 `none` 或 `can not use` 的权限项，在编辑自定义角色的权限时，不能被勾选。 +|=== + + +**平台** +[%header,cols="1a,2a,2a"] +|=== +| 描述 | 3.x | 4.1 + +|企业空间创建|role-template-create-workspaces| global-create-workspaces +|应用模版管理|role-template-manage-app-templates | `none` +|集群管理|role-template-manage-clusters | global-manage-clusters +|平台设置管理| role-template-manage-platform-settings | `can not use` +|角色管理| role-template-manage-roles | `can not use` +|用户管理|role-template-manage-users | `can not use` +|企业空间管理|role-template-manage-workspaces | global-manage-workspaces +|应用查看| role-template-view-app-templates | `none` +|基础查看|role-template-view-basic | `none` +|集群查看|role-template-view-clusters | global-view-clusters +|角色查看|role-template-view-roles | global-view-roles +|用户查看| role-template-view-users | global-view-users +|企业空间查看|role-template-view-workspaces | global-view-workspaces +|=== + +**企业空间** +[%header,cols="1a,2a,2a"] +|=== +| 描述 | 3.x | 4.1 + +|DevOps 项目创建|role-template-create-devops | workspace-create-devops +|项目创建|role-template-create-projects | workspace-create-projects +|应用仓库管理|role-template-manage-app-repos | workspace-manage-app-repos +|应用模板管理|role-template-manage-app-templates | workspace-manage-app-templates +|DevOps 项目管理|role-template-manage-devops | workspace-manage-devops +|部门管理 |role-template-manage-groups | `none` +|成员管理|role-template-manage-members | `can not use` +|项目管理|role-template-manage-projects | workspace-manage-projects +|角色管理|role-template-manage-roles | `can not use` +|企业空间设置管理|role-template-manage-workspace-settings | `can not use` +|应用仓库查看|role-template-view-app-repos | workspace-view-app-repos +|应用模版查看|role-template-view-app-templates | workspace-view-app-templates +|基础查看|role-template-view-basic | `none` +|DevOps 项目查看|role-template-view-devops | workspace-view-devops +|部门查看|role-template-view-groups | `none` +|成员查看|role-template-view-members | workspace-view-members +|角色查看|role-template-view-roles | workspace-view-roles +|企业空间设置查看|role-template-view-workspace-settings | `can not use` +|=== + +**项目** + +[%header,cols="1a,2a,2a"] +|=== +| 描述 | 3.x | 4.1 + +|应用负载管理|role-template-manage-app-workloads | namespace-manage-app-workloads +|配置字典管理|role-template-manage-configmaps | namespace-manage-configmaps +|成员管理|role-template-manage-members | `can not use` +|项目设置管理|role-template-manage-project-settings | namespace-manage-project-settings +|角色管理|role-template-manage-roles | `can not use` +|保密字典管理|role-template-manage-secrets | namespace-manage-secrets +|服务账户管理|role-template-manage-serviceaccount | namespace-manage-serviceaccount +|持久卷声明管理|role-template-manage-volumes | namespace-manage-persistentvolumeclaims +|应用负载查看|role-template-view-app-workloads | namespace-manage-app-workloads +|基础查看|role-template-view-basic|`none` +|配置字典查看|role-template-view-configmaps | namespace-view-configmaps +|成员查看|role-template-view-members | namespace-view-members +|角色查看|role-template-view-roles | namespace-view-roles +|保密字典查看|role-template-view-secrets | namespace-view-secrets +|服务账户查看|role-template-view-serviceaccount | namespace-view-serviceaccount +|持久卷声明查看|role-template-view-volumes | namespace-view-persistentvolumeclaims +|=== + diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/03-upgrade-kubesphere/05-appendix-ks-core.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/03-upgrade-kubesphere/05-appendix-ks-core.adoc new file mode 100644 index 000000000..384b8e2e1 --- /dev/null +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/03-upgrade-kubesphere/05-appendix-ks-core.adoc @@ -0,0 +1,94 @@ +--- +title: "附录 1：ks-core Helm Chart 升级参数" +weight: 05 +--- + +== 升级 Job 配置 + +[%header,cols="2a,1a,2a"] +|=== +| 选项 | 默认值 | 描述 + +| upgrade.enabled | true | bool - 是否启用升级组件 +| upgrade.image.registry | "" | string - 设置升级 Job 的镜像仓库地址 +| upgrade.image.repository | kse/ks-upgrade | string - 设置升级 Job 的镜像名称 +| upgrade.image.tag | "" | string - 设置升级 Job 的镜像标签 +| upgrade.image.pullPolicy | Always | string - 设置升级 Job 的镜像拉取策略 +| upgrade.persistenceVolume.name | ks-upgrade | string - 设置升级 Job 的存储卷 +| upgrade.persistenceVolume.storageClassName | "" | string - 设置升级 Job 的存储卷类 +| upgrade.persistenceVolume.accessMode | ReadWriteOnce | string - 设置升级 Job 的存储卷访问模式 +| upgrade.persistenceVolume.size | 5Gi | string - 设置升级 Job 的存储卷容量 +| upgrade.resources.limit.cpu | 1 | string - 设置升级 Job 的 CPU 资源配额上限 +| upgrade.resources.limit.memory | 1024Mi | string - 设置升级 Job 的 Memory 资源配额上限 +| upgrade.resources.requests.cpu | 20m | string - 设置升级 Job 的 CPU 资源申请配额 +| upgrade.resources.requests.memory | 100Mi | string - 设置升级 Job 的 Memory 资源申请配额 +|=== + +== 升级应用配置 + +[%header,cols="2a,1a,2a"] +|=== +| 选项 | 默认值 | 描述 + +| upgrade.config.storage.local.path | /tmp/ks-upgrade | string - 设置升级 Job 使用本地目录存储备份数据 +| upgrade.config.storage.s3.endpoint | "" | string - 设置升级 Job 使用支持 S3 协议的对象存储服务备份数据，存储服务地址 +| upgrade.config.storage.s3.region | "" | string - 设置 S3 服务数据存储区域 +| upgrade.config.storage.s3.disableSSL | false | bool - 设置禁用 SSL 安全协议 +| upgrade.config.storage.s3.forcePathStyle | false | bool - 设置 S3 客户端对桶使用路径式寻址 +| upgrade.config.storage.s3.accessKeyID | "" | string - 设置 S3 服务账号的访问键，不使用凭证文件时是必需的 +| upgrade.config.storage.s3.secretAccessKey | "" | string - 设置 S3 服务账号的访问密钥，不使用凭证文件时是必需的 +| upgrade.config.storage.s3.sessionToken | "" | string - 设置 S3 服务的访问凭证文件 +| upgrade.config.storage.s3.bucket | "" | string - 设置 S3 服务的存储桶 +| upgrade.config.download.globalRegistryUrl | oci://hub.kubesphere.com.cn/kse-extensions | string - 设置扩展组件的仓库地址 +| upgrade.config.download.file | - | 系统预留配置 +| upgrade.config.download.http.timeout | 20 | int64 - 设置拉取扩展组件的超时时间 +| upgrade.config.download.http.caBundle | "" | string - 设置扩展组件仓库的自签名证书的 base64 字符串，多个自签名证书合并字符串 base64 +| upgrade.config.download.http.insecureSkipVerify | true | bool - 设置跳过扩展组件仓库 TLS 认证 +| upgrade.config.download.oci | - | 系统预留配置 +| upgrade.config.skipValidator | false | bool - 设置跳过升级 Job 版本校验，当前校验 KubeSphere 版本 +|=== + +== 升级组件配置 + +[%header,cols="2a,1a,2a"] +|=== +| 选项 | 默认值 | 描述 + +|upgrade.config.jobs.$ID.enabled |false |bool - 设置启用升级组件 $ID +|upgrade.config.jobs.$ID.priority |0 |int - 设置组件升级顺序的优先级 +|upgrade.config.jobs.$ID.extensionRef.name |"" |string - 设置扩展组件名称 +|upgrade.config.jobs.$ID.extensionRef.version |"" |string - 设置扩展组件版本 + +|=== + +== 升级组件清单 + +[%header,cols="1a,2a"] +|=== +| ID | 名称/描述 + +| core | ks-core 核心组件 +| iam | 多租户管理 +| network | KubeSphere 网络，用于 IPPool 管理和 NetworkPolicy 管理 +| devops | DevOps 系统 +| storage-utils | KubeSphere 存储 +| tower | KubeSphere 多集群代理连接 +| kubefed | 联邦集群应用管理 +| whizard-monitoring | WhizardTelemetry 监控 +| whizard-notification | WhizardTelemetry 通知管理 +| whizard-alerting | WhizardTelemetry 告警管理 +| whizard-events | WhizardTelemetry 事件管理 +| whizard-auditing | WhizardTelemetry 审计管理 +| whizard-logging | WhizardTelemetry 日志管理 +| whizard-telemetry-ruler | WhizardTelemetry 事件告警 +| whizard-telemetry | WhizardTelemetry 平台服务 +| vector | WhizardTelemetry 数据流水线 +| metrics-server | Metrics Server，集群核心监控数据的聚合器 +| opensearch | 用于日志存储 +| kubeedge | KubeEdge 边缘计算框架 +| springcloud | Spring Cloud，管理微服务、微服务配置和微服务网关 +| servicemesh | KubeSphere 服务网格 +| application | KubeSphere 应用商店管理 +| dmp | RadonDB DMP，云原生数据库管理平台 +| gateway | KubeSphere 网关 +|=== \ No newline at end of file diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/03-upgrade-kubesphere/_index.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/03-upgrade-kubesphere/_index.adoc new file mode 100644 index 000000000..0fcb0ef75 --- /dev/null +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/03-upgrade-kubesphere/_index.adoc @@ -0,0 +1,10 @@ +--- +title: "升级{ks_product_left}" +keywords: "Kubernetes, {ks_product}, 升级" +description: "介绍如何升级{ks_product_both}。" +weight: 03 +--- + + + +本节介绍如何升级{ks_product_left}。 diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/04-uninstall-kubesphere/01-uninstall-kubesphere-only.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/04-uninstall-kubesphere/01-uninstall-kubesphere-only.adoc index ebbbf4d17..07281cfbe 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/04-uninstall-kubesphere/01-uninstall-kubesphere-only.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/04-uninstall-kubesphere/01-uninstall-kubesphere-only.adoc @@ -1,12 +1,20 @@ --- +<<<<<<< HEAD title: "仅卸载 KubeSphere" linkTitle: "仅卸载 KubeSphere" +======= +title: "仅卸载{ks_product_left}" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 keywords: "Kubernetes, {ks_product}, 仅卸载{ks_product_left}" description: "介绍如何卸载{ks_product_left}。" weight: 01 --- +<<<<<<< HEAD 本节介绍如何卸载 KubeSphere Core，即卸载{ks_product_left}。当前集群中运⾏的 Kubernetes 将不会被卸载。 +======= +本节介绍如何卸载{ks_product_left}。当前集群中运行的 Kubernetes 将不会被卸载。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // Warning include::../../../../_ks_components/admonitions/warning.adoc[] @@ -22,6 +30,7 @@ include::../../../../_ks_components/admonitions/admonEnd.adoc[] include::../../../_custom/installationAndUpgrade/installationAndUpgrade-prer-backUpData.adoc[] +<<<<<<< HEAD == 操作步骤 执行以下命令卸载{ks_product_left}。 @@ -29,4 +38,106 @@ include::../../../_custom/installationAndUpgrade/installationAndUpgrade-prer-bac [,bash] ---- helm -n kubesphere-system uninstall ks-core ----- \ No newline at end of file +---- +======= +== 卸载扩展组件 + +. 登录任意集群节点，执行以下命令查看集群中所有的扩展组件。 ++ +[,bash] +---- +kubectl get installplan +---- + +. 卸载指定扩展组件或所有扩展组件。 + + +* 卸载指定扩展组件。 ++ +-- +[,bash] +---- +kubectl delete installplan {InstallPlan Name} +---- +[.admon.note,cols="a"] +|=== +|说明 + +| +可根据第一步的命令获取扩展组件的 `InstallPlan Name`。 +|=== + +如果显示如下信息，表明该扩展组件卸载成功。 + +[,bash] +---- +installplan.kubesphere.io "{InstallPlan Name}" deleted +---- +-- + +* 卸载全部扩展组件。 ++ +-- +[,bash] +---- +kubectl delete installplan --all +---- + +输出信息应如下所示： + +[,bash] +---- +installplan.kubesphere.io "devops" deleted +installplan.kubesphere.io "dmp" deleted +installplan.kubesphere.io "gatekeeper" deleted +installplan.kubesphere.io "gateway" deleted +installplan.kubesphere.io "kubeedge" deleted +installplan.kubesphere.io "kubefed" deleted +installplan.kubesphere.io "metrics-server" deleted +installplan.kubesphere.io "network" deleted +installplan.kubesphere.io "openpitrix" deleted +installplan.kubesphere.io "opensearch" deleted +installplan.kubesphere.io "springcloud" deleted +installplan.kubesphere.io "storage-utils" deleted +installplan.kubesphere.io "tower" deleted +installplan.kubesphere.io "vector" deleted +installplan.kubesphere.io "whizard-alerting" deleted +installplan.kubesphere.io "whizard-auditing" deleted +installplan.kubesphere.io "whizard-events" deleted +installplan.kubesphere.io "whizard-logging" deleted +installplan.kubesphere.io "whizard-monitoring" deleted +installplan.kubesphere.io "whizard-notification" deleted +installplan.kubesphere.io "whizard-telemetry" deleted +installplan.kubesphere.io "whizard-telemetry-ruler" deleted +---- + +再次执行以下命令，如果显示 No resources found，表明所有扩展组件都已卸载。 + +[,bash] +---- +kubectl get installplan +---- +-- + + +== 卸载 ks-core + +卸载 ks-core 之前，请确保集群中的扩展组件都已被卸载，即执行 `kubectl get installplan` 命令后显示 No resources found。 + +. 执行以下命令卸载 ks-core。 ++ +[,bash] +---- +helm del -n kubesphere-system ks-core +---- + +. 执行以下命令，如果返回结果为空（如下所示），表明{ks_product_both}卸载成功。 ++ +-- +[,bash] +---- +root@xxx:~# helm list -n kubesphere-system +NAME NAMESPACE REVISION UPDATED STATUS CHART APP VERSION +---- +-- +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/04-uninstall-kubesphere/02-uninstall-kubernetes-and-kubesphere.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/04-uninstall-kubesphere/02-uninstall-kubernetes-and-kubesphere.adoc index c59af6e7e..83b8f89a1 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/04-uninstall-kubesphere/02-uninstall-kubernetes-and-kubesphere.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/04-uninstall-kubesphere/02-uninstall-kubernetes-and-kubesphere.adoc @@ -1,6 +1,10 @@ --- +<<<<<<< HEAD title: "卸载 Kubernetes 和 KubeSphere" linkTitle: "卸载 Kubernetes 和 KubeSphere" +======= +title: "卸载 Kubernetes 和{ks_product_left}" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 keywords: "Kubernetes, {ks_product}, 卸载 Kubernetes 和{ks_product_left}" description: "介绍如何卸载 Kubernetes 和{ks_product_left}。" weight: 02 @@ -26,14 +30,22 @@ include::../../../../_ks_components/admonitions/admonEnd.adoc[] == 前提条件 +<<<<<<< HEAD * 您需要获取安装配置文件 **config-sample.yaml** 并将其传输到用于执行本节操作的集群节点。有关更多信息，请参阅link:../../../03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere[安装 Kubernetes 和 KubeSphere]。 +======= +* 您需要获取安装配置文件 **config-sample.yaml** 并将其传输到用于执行本节操作的集群节点。有关更多信息，请参阅link:../../../03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere[安装 Kubernetes 和 KubeSphere 企业版]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 + [.admon.note,cols="a"] |=== |说明 | +<<<<<<< HEAD 如果您无法获取安装配置文件 **config-sample.yaml**，您需要参阅link:../../02-install-kubesphere/02-install-kubernetes-and-kubesphere/[安装 Kubernetes 和 KubeSphere] 重新创建 **config-sample.yaml** 文件。重新创建该文件时，请务必确保文件中的集群信息与集群的当前实际情况一致。否则，卸载过程可能会出现错误。 +======= +如果您无法获取安装配置文件 **config-sample.yaml**，您需要参阅link:../../02-install-kubesphere/02-install-kubernetes-and-kubesphere/[安装 Kubernetes 和 KubeSphere 企业版] 重新创建 **config-sample.yaml** 文件。重新创建该文件时，请务必确保文件中的集群信息与集群的当前实际情况一致。否则，卸载过程可能会出现错误。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 |=== * {empty} @@ -42,12 +54,21 @@ include::../../../_custom/installationAndUpgrade/installationAndUpgrade-prer-bac == 操作步骤 +<<<<<<< HEAD // ifeval::["{file_output_type}" == "pdf"] // include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage_new.adoc[] // endif::[] // ifeval::["{file_output_type}" == "html"] include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-downloadKubekey.adoc[] +======= +// ifeval::["{file_output_type}" == "html"] +// include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-downloadKubekey.adoc[] +// endif::[] + +// ifeval::["{file_output_type}" == "pdf"] +include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage_new.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // endif::[] + @@ -59,16 +80,32 @@ include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-tra + -- // Bash +<<<<<<< HEAD [,bash] ----  ./kk delete cluster -f config-sample.yaml ---- +======= +include::../../../../_ks_components/code/bash.adoc[] + + ./kk delete cluster -f config-sample.yaml + +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 如果显示如下信息，则表明卸载成功： // Bash +<<<<<<< HEAD [,bash] ---- Pipeline[DeleteClusterPipeline] execute successful ---- +======= +include::../../../../_ks_components/code/bash.adoc[] + +Pipeline[DeleteClusterPipeline] execute successful + +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/04-uninstall-kubesphere/_index.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/04-uninstall-kubesphere/_index.adoc index 14a9d177a..0167779e6 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/04-uninstall-kubesphere/_index.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/04-uninstall-kubesphere/_index.adoc @@ -1,9 +1,15 @@ --- +<<<<<<< HEAD title: "卸载 KubeSphere" linkTitle: "卸载 KubeSphere" keywords: "Kubernetes, KubeSphere, 卸载" description: "介绍如何卸载 KubeSphere。" layout: "second" +======= +title: "卸载{ks_product_left}" +keywords: "Kubernetes, {ks_product}, 卸载" +description: "介绍如何卸载{ks_product_left}。" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 weight: 04 --- diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/05-add-and-delete-cluster-nodes/01-add-cluster-nodes.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/05-add-and-delete-cluster-nodes/01-add-cluster-nodes.adoc index aec87fc93..18754af9d 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/05-add-and-delete-cluster-nodes/01-add-cluster-nodes.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/05-add-and-delete-cluster-nodes/01-add-cluster-nodes.adoc @@ -1,8 +1,13 @@ --- title: "添加集群节点" +<<<<<<< HEAD linkTitle: "添加集群节点" keywords: "Kubernetes, KubeSphere, 添加集群节点" description: "介绍如何添加 KubeSphere 集群节点。" +======= +keywords: "Kubernetes, {ks_product}, 添加集群节点" +description: "介绍如何添加{ks_product_both}集群节点。" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 weight: 01 --- @@ -21,17 +26,33 @@ include::../../../../_ks_components/admonitions/admonEnd.adoc[] == 前提条件 +<<<<<<< HEAD +======= +* 您需要联系{ks_product_both}的服务支持团队获取{ks_product_left} v4.1.0 安装包。 + +// 如实施现场条件允许在线拉取公开仓库，具备在线安装条件，可联系 KubeSphere 产品团队获取在线安装文件及相关信息。 + +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 * 新增节点的操作系统和版本须为 Ubuntu 16.04、Ubuntu 18.04、Ubuntu 20.04、Ubuntu 22.04、Debian 9、Debian 10、CentOS 7、CentOS Stream、RHEL 7、RHEL 8、SLES 15 或 openSUSE Leap 15。多个集群节点的操作系统可以不同。关于其它操作系统和版本支持，请联系{ks_product_both}技术支持。 * 为确保集群具有足够的计算和存储资源，建议新增节点配置至少 8 个 CPU 核心，16 GB 内存和 200 GB 磁盘空间。除此之外，建议在每台集群节点的 **/var/lib/docker**（对于 Docker）或 **/var/lib/containerd**（对于 containerd） 目录额外挂载至少 200 GB 磁盘空间用于存储容器运行时数据。 * 如果添加控制平面节点，您需要提前为集群配置高可用性。如果您使用负载均衡器，请确保负载均衡器监听所有控制平面节点的 6443 端口。有关更多信息，请参阅link:../../../03-installation-and-upgrade/01-preparations/03-configure-high-availability/[配置高可用性]。 +<<<<<<< HEAD // * 如果您的集群节点无法连接互联网，您还需要准备一台 Linux 服务器用于创建私有镜像服务，该服务器必须与{ks_product_both}集群节点网络连通并且在 **/mnt/registry** 目录挂载至少 100 GB 磁盘空间。 :relfileprefix: ../../../ * 您需要获取安装配置文件 **config-sample.yaml** 并将其传输到用于执行本节操作的集群节点。有关更多信息，请参阅xref:03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc[安装 Kubernetes 和 KubeSphere]。 +======= +* 如果您的集群节点无法连接互联网，您还需要准备一台 Linux 服务器用于创建私有镜像服务，该服务器必须与{ks_product_both}集群节点网络连通并且在 **/mnt/registry** 目录挂载至少 100 GB 磁盘空间。 + + +:relfileprefix: ../../../ + +* 您需要获取安装配置文件 **config-sample.yaml** 并将其传输到用于执行本节操作的集群节点。有关更多信息，请参阅xref:03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc[安装 Kubernetes 和 KubeSphere 企业版]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 :relfileprefix: ./ @@ -41,14 +62,28 @@ include::../../../../_ks_components/admonitions/warning.adoc[] * 添加节点过程中不支持在 **config-sample.yaml** 配置文件中修改原有的集群配置。 +<<<<<<< HEAD * 如果您无法获取安装配置文件 **config-sample.yaml**，您需要参阅link:../../02-install-kubesphere/02-install-kubernetes-and-kubesphere/[安装 Kubernetes 和 KubeSphere] 重新创建 **config-sample.yaml** 文件。重新创建该文件时，请务必确保文件中的集群信息与集群的当前实际情况一致。否则，添加节点后集群可能会出现错误。 +======= +* 如果您无法获取安装配置文件 **config-sample.yaml**，您需要参阅link:../../02-install-kubesphere/02-install-kubernetes-and-kubesphere/[安装 Kubernetes 和 KubeSphere 企业版] 重新创建 **config-sample.yaml** 文件。重新创建该文件时，请务必确保文件中的集群信息与集群的当前实际情况一致。否则，添加节点后集群可能会出现错误。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 include::../../../../_ks_components/admonitions/admonEnd.adoc[] -- == 操作步骤 +<<<<<<< HEAD include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-downloadKubekey.adoc[] +======= +// ifeval::["{file_output_type}" == "html"] +// include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-downloadKubekey.adoc[] +// endif::[] + +// ifeval::["{file_output_type}" == "pdf"] +include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage_new.adoc[] +// endif::[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 + include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-transferConfig.adoc[] @@ -63,7 +98,11 @@ include::../../../../_ks_components/code/bash.adoc[] vi config-sample.yaml +<<<<<<< HEAD ---- +======= +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 在 **config-sample.yaml** 文件的 **hosts** 参数下设置新增节点的信息。 @@ -121,10 +160,18 @@ include::../../../_custom/installationAndUpgrade/installationAndUpgrade-code-add + -- // Bash +<<<<<<< HEAD [,bash] ---- kubectl get node ---- +======= +include::../../../../_ks_components/code/bash.adoc[] + +kubectl get node + +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 如果显示新增节点的信息，则表明节点添加成功。 -- diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/05-add-and-delete-cluster-nodes/02-delete-cluster-nodes.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/05-add-and-delete-cluster-nodes/02-delete-cluster-nodes.adoc index c5b210741..6a7929f1c 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/05-add-and-delete-cluster-nodes/02-delete-cluster-nodes.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/05-add-and-delete-cluster-nodes/02-delete-cluster-nodes.adoc @@ -1,8 +1,13 @@ --- title: "删除集群节点" +<<<<<<< HEAD linkTitle: "删除集群节点" keywords: "Kubernetes, KubeSphere, 删除集群节点" description: "介绍如何删除 KubeSphere 集群节点。" +======= +keywords: "Kubernetes, {ks_product}, 删除集群节点" +description: "介绍如何删除{ks_product_both}集群节点。" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 weight: 02 --- @@ -30,9 +35,19 @@ include::../../../../_ks_components/admonitions/admonEnd.adoc[] == 前提条件 +<<<<<<< HEAD :relfileprefix: ../../../ 您需要获取安装配置文件 **config-sample.yaml** 并将其传输到用于执行本节操作的集群节点。有关更多信息，请参阅xref:03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc[安装 Kubernetes 和 KubeSphere]。 +======= +* 您需要联系{ks_product_both}的服务支持团队获取{ks_product_left} v4.1.0 安装包。 + +// 如实施现场条件允许在线拉取公开仓库，具备在线安装条件，可联系 KubeSphere 产品团队获取在线安装文件及相关信息。 + +:relfileprefix: ../../../ + +* 您需要获取安装配置文件 **config-sample.yaml** 并将其传输到用于执行本节操作的集群节点。有关更多信息，请参阅xref:03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc[安装 Kubernetes 和 KubeSphere 企业版]。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 :relfileprefix: ./ @@ -40,7 +55,11 @@ include::../../../../_ks_components/admonitions/admonEnd.adoc[] // Warning include::../../../../_ks_components/admonitions/warning.adoc[] +<<<<<<< HEAD 如果您无法获取安装配置文件 **config-sample.yaml**，您需要参阅link:../../02-install-kubesphere/02-install-kubernetes-and-kubesphere/[安装 Kubernetes 和 KubeSphere] 重新创建 **config-sample.yaml** 文件。重新创建该文件时，请务必确保文件中的集群信息与集群的当前实际情况一致。否则，删除节点后集群可能会出现错误。 +======= +如果您无法获取安装配置文件 **config-sample.yaml**，您需要参阅link:../../02-install-kubesphere/02-install-kubernetes-and-kubesphere/[安装 Kubernetes 和 KubeSphere 企业版] 重新创建 **config-sample.yaml** 文件。重新创建该文件时，请务必确保文件中的集群信息与集群的当前实际情况一致。否则，删除节点后集群可能会出现错误。 +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 include::../../../../_ks_components/admonitions/admonEnd.adoc[] -- @@ -48,32 +67,57 @@ include::../../../../_ks_components/admonitions/admonEnd.adoc[] == 操作步骤 +<<<<<<< HEAD // ifeval::["{file_output_type}" == "pdf"] // include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage_new.adoc[] // endif::[] // ifeval::["{file_output_type}" == "html"] include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-downloadKubekey.adoc[] +======= +// ifeval::["{file_output_type}" == "html"] +// include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-downloadKubekey.adoc[] +// endif::[] + +// ifeval::["{file_output_type}" == "pdf"] +include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-decompressInstallationPackage_new.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 // endif::[] . 执行以下命令查看需要删除的节点的名称： + -- // Bash +<<<<<<< HEAD [,bash] ---- kubectl get node ---- +======= +include::../../../../_ks_components/code/bash.adoc[] + +kubectl get node + +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令将需要删除的节点上运行的容器组驱逐到其他节点（将 替换为需要删除的节点的名称）： + -- // Bash +<<<<<<< HEAD [,bash] ---- kubectl drain ---- +======= +include::../../../../_ks_components/code/bash.adoc[] + +kubectl drain + +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- + @@ -86,16 +130,25 @@ include::../../../_custom/installationAndUpgrade/installationAndUpgrade-oper-tra + -- // Bash +<<<<<<< HEAD [,bash] ----  ./kk delete node -f config-sample.yaml ---- +======= +include::../../../../_ks_components/code/bash.adoc[] + + ./kk delete node -f config-sample.yaml + +include::../../../../_ks_components/code/codeEnd.adoc[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 -- . 执行以下命令查看当前集群节点： + -- // Bash +<<<<<<< HEAD [,bash] ---- kubectl get node @@ -103,3 +156,13 @@ kubectl get node 如果没有显示已删除节点的信息，则表明节点删除成功。 -- +======= +include::../../../../_ks_components/code/bash.adoc[] + +kubectl get node + +include::../../../../_ks_components/code/codeEnd.adoc[] + +如果没有显示已删除节点的信息，则表明节点删除成功。 +-- +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/05-add-and-delete-cluster-nodes/_index.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/05-add-and-delete-cluster-nodes/_index.adoc index 0d2cbb7d3..90de43617 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/05-add-and-delete-cluster-nodes/_index.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/05-add-and-delete-cluster-nodes/_index.adoc @@ -1,9 +1,14 @@ --- title: "添加和删除集群节点" +<<<<<<< HEAD linkTitle: "添加和删除集群节点" keywords: "Kubernetes, KubeSphere, 添加集群节点, 删除集群节点" description: "介绍如何添加和删除 KubeSphere 集群节点。" layout: "second" +======= +keywords: "Kubernetes, {ks_product}, 添加集群节点, 删除集群节点" +description: "介绍如何添加和删除{ks_product_both}集群节点。" +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 weight: 05 --- diff --git a/content/zh/docs/v4.1/03-installation-and-upgrade/_index.adoc b/content/zh/docs/v4.1/03-installation-and-upgrade/_index.adoc index 47720d27a..3366ef38e 100644 --- a/content/zh/docs/v4.1/03-installation-and-upgrade/_index.adoc +++ b/content/zh/docs/v4.1/03-installation-and-upgrade/_index.adoc @@ -1,5 +1,6 @@ --- title: "安装指南" +<<<<<<< HEAD linkTitle: "安装指南" keywords: "Kubernetes, KubeSphere, 安装, 升级, 卸载" description: "介绍如何安装、升级和卸载 KubeSphere。" @@ -18,4 +19,44 @@ icon: "/images/docs/common/docs.svg" | 暂不支持从{ks_product_left} v3.x 升级到 v4.1。 -|=== \ No newline at end of file +|=== +======= +keywords: "Kubernetes, {ks_product}, 安装, 升级, 卸载" +description: "介绍如何安装、升级和卸载{ks_product_left}。" +weight: 03 +--- + +// 导出说明：此文档用于离线交付 pdf 版本，不可与 03-install-and-uninstall 同时存在。 + +本节介绍如何安装、升级和卸载{ks_product_left}，以及如何添加和删除{ks_product_both}集群节点。 + +ifeval::["{file_output_type}" == "pdf"] +== 产品版本 + +本文档适用于{ks_product_left} v4.1.0 版本。 + +== 读者对象 + +本文档主要适用于以下读者： + +* {ks_product_right}用户 + +* 交付工程师 + +* 运维工程师 + +* 售后工程师 + + +== 修订记录 + +[%header,cols="1a,1a,3a"] +|=== +|文档版本 |发布日期 |修改说明 + +|01 +|{pdf_releaseDate} +|第一次正式发布。 +|=== +endif::[] +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 diff --git a/content/zh/docs/v4.1/_index.adoc b/content/zh/docs/v4.1/_index.adoc index b9506a664..81d02d3cb 100644 --- a/content/zh/docs/v4.1/_index.adoc +++ b/content/zh/docs/v4.1/_index.adoc @@ -1,4 +1,5 @@ --- +<<<<<<< HEAD title: 文档中心 css: scss/docs.scss isDocsRoot: true @@ -40,4 +41,64 @@ section3: titleRight: 想要在您的云上托管 KubeSphere? btnContent: 与我们合作 btnLink: /partner/ +======= +title: KubeSphere 企业版 +weight: 45 +css: scss/docs.scss +LinkTitle: KubeSphere 企业版 +pdf_coverDocName: KubeSphere 企业版 v4.1.0 +pdf_projectVersion: '4.1.0' +pdf_releaseDate: 2024-04-12 +section1: + title: KubeSphere 企业版 + content: 了解如何通过 KubeSphere 企业版构建并管理云原生应用程序。获取文档、示例代码与教程等信息。 + image: /images/docs/banner.png +study_section: + - title: 了解 + icon: icon-note_tree_duotone + children: + - title: 产品简介 + children: + - title: 产品优势 + url: 01-intro/01-introduction/ + - title: 应用场景 + url: 01-intro/03-scenarios/ + - title: 上手 + icon: icon-gamepad_2_duotone + children: + - title: 快速入门 + children: + - title: 最小化安装 + url: 02-quickstart/01-install-ks-core + - title: 安装示例组件 + url: 02-quickstart/02-install-a-demo-extension + - title: 控制用户权限 + url: 02-quickstart/03-control-user-permissions + - title: 管理 + icon: icon-simulation_duotone + children: + - title: 管理指南 + children: + - title: 扩展组件管理 + url: 06-extension-user-guide + - title: 集群管理 + url: 07-cluster-management + - title: 企业空间管理 + url: 08-workspace-management + - title: 项目管理 + url: 09-project-management + - title: 使用 + icon: icon-apps_2_duotone + children: + - title: 扩展组件 + children: + - title: DevOps + url: 11-use-extensions/01-devops + - title: 应用商店管理 + url: 11-use-extensions/02-app-store + - title: Whizard 可观测平台 + url: 11-use-extensions/05-observability-platform + - title: KubeSphere 网络 + url: 11-use-extensions/11-network +>>>>>>> 33f730a984ccbc140ff5c4d2867db9592a37f2e3 ---