diff --git a/content/en/docs/_custom-en/clusterManagement/clusterManagement-prer-requiredPermission.adoc b/content/en/docs/_custom-en/clusterManagement/clusterManagement-prer-requiredPermission.adoc deleted file mode 100644 index 58adabe19..000000000 --- a/content/en/docs/_custom-en/clusterManagement/clusterManagement-prer-requiredPermission.adoc +++ /dev/null @@ -1,2 +0,0 @@ -// :ks_include_id: f3341457c4584e59b799240a35ca496d -您需要加入一个集群并在集群中具有pass:a,q[{ks_permission}]权限。有关更多信息,请参阅xref:05-cluster-management/12-cluster-settings/03-cluster-members/_index.adoc[集群成员]和xref:05-cluster-management/12-cluster-settings/04-cluster-roles/_index.adoc[集群角色]。 diff --git a/content/en/docs/_custom-en/platformManagement/platformManagement-prer-enableAppStore.adoc b/content/en/docs/_custom-en/platformManagement/platformManagement-prer-enableAppStore.adoc deleted file mode 100644 index bc9eca81b..000000000 --- a/content/en/docs/_custom-en/platformManagement/platformManagement-prer-enableAppStore.adoc +++ /dev/null @@ -1,2 +0,0 @@ -// :ks_include_id: 5fdcd8cc560f4cff91cb47b7de175bd3 -* {ks_product-en}平台需要启用应用管理扩展组件。有关更多信息,请参阅xref:04-platform-management/01-extension-management/01-app-management/01-enable-app-management.adoc[启用应用管理]。 diff --git a/content/en/docs/_custom-en/platformManagement/platformManagement-prer-requiredPermission.adoc b/content/en/docs/_custom-en/platformManagement/platformManagement-prer-requiredPermission.adoc deleted file mode 100644 index 9117d8c23..000000000 --- a/content/en/docs/_custom-en/platformManagement/platformManagement-prer-requiredPermission.adoc +++ /dev/null @@ -1,2 +0,0 @@ -// :ks_include_id: 95e415bcbafa45ed8545cb7700801b09 -您需要在{ks_product-en}平台具有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[平台角色]。 diff --git a/content/en/docs/_custom-en/workspaceManagement/webConsole/webConsole-note-firstLogin.adoc b/content/en/docs/_custom-en/workspaceManagement/webConsole/webConsole-note-firstLogin.adoc index b4bc9d0ef..2491344e9 100644 --- a/content/en/docs/_custom-en/workspaceManagement/webConsole/webConsole-note-firstLogin.adoc +++ b/content/en/docs/_custom-en/workspaceManagement/webConsole/webConsole-note-firstLogin.adoc @@ -1,2 +1,2 @@ // :ks_include_id: 8a815fa5b82845cfa11a8ce3911564e2 -初次登录时系统将提示修改用户密码。 +Upon initial login, the system will prompt you to change your password. diff --git a/content/en/docs/_custom-en/workspaceManagement/webConsole/webConsole-oper-logIn.adoc b/content/en/docs/_custom-en/workspaceManagement/webConsole/webConsole-oper-logIn.adoc index 6d3d18109..10cab8091 100644 --- a/content/en/docs/_custom-en/workspaceManagement/webConsole/webConsole-oper-logIn.adoc +++ b/content/en/docs/_custom-en/workspaceManagement/webConsole/webConsole-oper-logIn.adoc @@ -1,4 +1,3 @@ // :ks_include_id: b690a1bf28354fa9a64364d91a595cd7 -. 打开 Web 浏览器,在地址栏中输入{ks_product-en} Web 控制台的 IP 地址和端口号。 - -. 在{ks_product-en}登录页面,输入用户信息然后点击**登录**。 +. Open a web browser and enter the IP address and port number of the {ks_product-en} web console in the address bar, such as `172.31.85.22:30880`. +. On the login page, enter your username and password and click **Log In**. diff --git a/content/en/docs/_custom-en/workspaceManagement/webConsole/webConsole-prer-logIn.adoc b/content/en/docs/_custom-en/workspaceManagement/webConsole/webConsole-prer-logIn.adoc index 3fbb16c22..a514d751f 100644 --- a/content/en/docs/_custom-en/workspaceManagement/webConsole/webConsole-prer-logIn.adoc +++ b/content/en/docs/_custom-en/workspaceManagement/webConsole/webConsole-prer-logIn.adoc @@ -1,4 +1,4 @@ // :ks_include_id: b7d4651227e646b1b025777d274f6c4a -* 您需要联系{ks_product-en}平台管理员获取 Web 控制台的 IP 地址和端口号。 +* Contact the administrator to obtain the IP address and port number of the {ks_product-en} web console. -* 取决于您的网络环境,您可能需要配置防火墙策略和流量转发策略。有关具体操作,请联系您的网络环境管理员。 +* Depending on your network environment, you may need to configure firewall policies and traffic forwarding strategies. For specific instructions, please contact your network administrator. \ No newline at end of file diff --git a/content/en/docs/_custom-en/workspaceManagement/workspaceManagement-oper-openWorkspacePage.adoc b/content/en/docs/_custom-en/workspaceManagement/workspaceManagement-oper-openWorkspacePage.adoc index 75b60db69..aadb0eecf 100644 --- a/content/en/docs/_custom-en/workspaceManagement/workspaceManagement-oper-openWorkspacePage.adoc +++ b/content/en/docs/_custom-en/workspaceManagement/workspaceManagement-oper-openWorkspacePage.adoc @@ -1,2 +1,2 @@ // :ks_include_id: 9e983855b51f4d47a0318514ec5e4d84 -. 以具有pass:a,q[{ks_permission}]权限的用户登录{ks_product-en} Web 控制台并进入您的企业空间。 +. Log in to the {ks_product-en} web console with a user who has the pass:a,q[{ks_permission}] permission, and access your workspace. \ No newline at end of file diff --git a/content/en/docs/_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission.adoc b/content/en/docs/_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission.adoc deleted file mode 100644 index b012eb816..000000000 --- a/content/en/docs/_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission.adoc +++ /dev/null @@ -1,2 +0,0 @@ -// :ks_include_id: 05d7ebe027f04cc589e8baa04343e651 -您需要加入一个企业空间并在企业空间中具有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[部门]。 diff --git a/content/en/docs/_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_new.adoc b/content/en/docs/_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_new.adoc deleted file mode 100644 index d723b7823..000000000 --- a/content/en/docs/_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_new.adoc +++ /dev/null @@ -1,2 +0,0 @@ -// :ks_include_id: 05d7ebe027f04cc589e8baa04343e651 -您需要加入一个企业空间并在企业空间中具有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[企业空间角色]。 diff --git a/content/en/docs/v4.1/02-quickstart/01-install-kubesphere.adoc b/content/en/docs/v4.1/02-quickstart/01-install-kubesphere.adoc index 75adc8bea..11ff9aabe 100644 --- a/content/en/docs/v4.1/02-quickstart/01-install-kubesphere.adoc +++ b/content/en/docs/v4.1/02-quickstart/01-install-kubesphere.adoc @@ -55,7 +55,7 @@ apt install socat conntrack -y + [,bash] ---- -helm upgrade --install -n kubesphere-system --create-namespace ks-core https://charts.kubesphere.io/main/ks-core-1.1.1.tgz --debug --wait +helm upgrade --install -n kubesphere-system --create-namespace ks-core https://charts.kubesphere.io/main/ks-core-1.1.2.tgz --debug --wait ---- + include::../../../_ks_components-en/admonitions/note.adoc[] diff --git a/content/en/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc b/content/en/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc index f9cd640fd..d698be7b5 100644 --- a/content/en/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc +++ b/content/en/docs/v4.1/03-installation-and-upgrade/02-install-kubesphere/02-install-kubernetes-and-kubesphere.adoc @@ -10,6 +10,12 @@ This section explains how to install Kubernetes and {ks_product-en}. The installation process will use the open-source tool KubeKey. For more information about KubeKey, please visit the link:https://github.com/kubesphere/kubekey[GitHub KubeKey repository]. +[.admon.note,cols="a"] +|=== +|Note + +|You can also run the command in the link:#_install_kubesphere[Install KubeSphere] section to directly upgrade KubeSphere from v4.1.1 to v4.1.2. +|=== == Prerequisites @@ -349,7 +355,7 @@ Pipeline[CreateclusterPipeline] execute successfully ---- -- -== Install {ks_product-en} +== Install KubeSphere KubeSphere Core (ks-core) is the core component of KubeSphere, providing a foundational runtime environment for extensions. Once KubeSphere Core is installed, you can access the {ks_product-en} web console. @@ -358,7 +364,7 @@ KubeSphere Core (ks-core) is the core component of KubeSphere, providing a found ==== [,bash] ---- -helm upgrade --install -n kubesphere-system --create-namespace ks-core https://charts.kubesphere.io/main/ks-core-1.1.1.tgz --debug --wait +helm upgrade --install -n kubesphere-system --create-namespace ks-core https://charts.kubesphere.io/main/ks-core-1.1.2.tgz --debug --wait ---- If you see the following information, it means that ks-core installation is successful: diff --git a/content/en/docs/v4.1/07-cluster-management/01-web-console/01-log-in-and-go-to-a-cluster.adoc b/content/en/docs/v4.1/07-cluster-management/01-web-console/01-log-in-and-go-to-a-cluster.adoc index 137c09489..0e7bd64ac 100644 --- a/content/en/docs/v4.1/07-cluster-management/01-web-console/01-log-in-and-go-to-a-cluster.adoc +++ b/content/en/docs/v4.1/07-cluster-management/01-web-console/01-log-in-and-go-to-a-cluster.adoc @@ -1,5 +1,5 @@ --- -title: "Log In and Access Cluster" +title: "Log In and Access Clusters" keywords: "Kubernetes, KubeSphere, Cluster Management, Web Console, Access Cluster" description: "This section explains how to log in and access a cluster." weight: 01 diff --git a/content/en/docs/v4.1/07-cluster-management/01-web-console/_index.adoc b/content/en/docs/v4.1/07-cluster-management/01-web-console/_index.adoc index 7cb0b5db5..43814a92f 100644 --- a/content/en/docs/v4.1/07-cluster-management/01-web-console/_index.adoc +++ b/content/en/docs/v4.1/07-cluster-management/01-web-console/_index.adoc @@ -1,5 +1,5 @@ --- -title: "Web Console" +title: "Access Your Cluster" keywords: "Kubernetes, KubeSphere, Cluster Management, Web Console" description: "Learn how to access clusters in the web console." layout: "second" diff --git a/content/en/docs/v4.1/08-workspace-management/01-web-console/01-log-in-and-go-to-a-workspace.adoc b/content/en/docs/v4.1/08-workspace-management/01-web-console/01-log-in-and-go-to-a-workspace.adoc index 1d564a5fa..f8d4d4b9f 100644 --- a/content/en/docs/v4.1/08-workspace-management/01-web-console/01-log-in-and-go-to-a-workspace.adoc +++ b/content/en/docs/v4.1/08-workspace-management/01-web-console/01-log-in-and-go-to-a-workspace.adoc @@ -1,19 +1,18 @@ --- -title: "登录并进入企业空间" -linkTitle: "登录并进入企业空间" -keywords: "Kubernetes, KubeSphere, 企业空间管理, Web 控制台, 登录并进入企业空间" -description: "介绍如何登录 KubeSphere Web 控制台并进入企业空间。" +title: "Log In and Access Workspaces" +linkTitle: "Log In and Access Workspaces" +keywords: "Kubernetes, KubeSphere, Workspace Management, Web Console, Access Workspace" +description: "This section explains how to log in and access a workspace." weight: 01 --- - -本节介绍如何登录{ks_product-en} Web 控制台并进入企业空间。 +This section explains how to log in to the {ks_product-en} web console and access a workspace. == Prerequisites -* 您需要获取企业空间成员用户名和密码。 +* You need to have the username and password of a workspace member. include::../../../_custom-en/workspaceManagement/webConsole/webConsole-prer-logIn.adoc[] @@ -30,6 +29,6 @@ include::../../../_custom-en/workspaceManagement/webConsole/webConsole-note-firs include::../../../../_ks_components-en/admonitions/admonEnd.adoc[] -. 点击**企业空间管理**。 +. Click **Workspace Management**. -. 在**企业空间管理**页面点击一个企业空间的名称进入企业空间。 +. Click the name of a workspace in the **Workspaces** page to access the workspace. diff --git a/content/en/docs/v4.1/08-workspace-management/01-web-console/_index.adoc b/content/en/docs/v4.1/08-workspace-management/01-web-console/_index.adoc index 7a2af8cea..45a603d88 100644 --- a/content/en/docs/v4.1/08-workspace-management/01-web-console/_index.adoc +++ b/content/en/docs/v4.1/08-workspace-management/01-web-console/_index.adoc @@ -1,12 +1,10 @@ --- -title: "进入企业空间" -linkTitle: "进入企业空间" -keywords: "Kubernetes, KubeSphere, 企业空间管理, Web 控制台" -description: "介绍如何登录 KubeSphere Web 控制台并进入企业空间,以及修改用户的邮箱、语言和密码。" +title: "Access Your Workspace" +linkTitle: "Access Your Workspace" +keywords: "Kubernetes, KubeSphere, Workspace Management, Web Console" +description: "Learn how to access workspaces in the web console." layout: "second" weight: 01 --- - - -本节介绍如何登录{ks_product-en} Web 控制台并进入企业空间。 +This section explains how to access workspaces in the {ks_product-en} web console. diff --git a/content/en/docs/v4.1/08-workspace-management/02-workspaces/01-create-a-workspace.adoc b/content/en/docs/v4.1/08-workspace-management/02-workspaces/01-create-a-workspace.adoc index 515272420..f82bbbb85 100644 --- a/content/en/docs/v4.1/08-workspace-management/02-workspaces/01-create-a-workspace.adoc +++ b/content/en/docs/v4.1/08-workspace-management/02-workspaces/01-create-a-workspace.adoc @@ -1,50 +1,46 @@ --- -title: "创建企业空间" -linkTitle: "创建企业空间" -keywords: "Kubernetes, KubeSphere, 访问控制, 企业空间, 创建企业空间" -description: "介绍如何创建企业空间。" +title: "Create Workspaces" +linkTitle: "Create Workspaces" +keywords: "Kubernetes, KubeSphere, Access Control, Workspace, Create Workspace" +description: "Learn how to create a workspace." weight: 01 --- -:ks_permission: **企业空间创建** - - -本节介绍如何创建企业空间。 +:ks_permission: **Workspace Creation** +This section explains how to create a workspace. == Prerequisites include::../../../_custom-en/platformManagement/platformManagement-prer-requiredPermission_v4.adoc[] - == Steps -. 以具有pass:a,q[{ks_permission}]权限的用户登录{ks_product-en} Web 控制台。 -. 点击**企业空间管理**。 -. 在页面点击**创建**。 -. 在**创建企业空间**页面,设置企业空间的基本信息,然后点击**下一步**。 +include::../../../_custom-en/platformManagement/platformManagement-oper-logIn.adoc[] + +. Click **Workspace Management**. +. Click **Create** on the page. +. On the **Create Workspace** page, set the basic information for the workspace and then click **Next**. + -- [%header,cols="1a,4a"] |=== -|参数 |描述 +|Parameter |Description -|名称 -|企业空间的名称。名称只能包含小写字母、数字和连字符(-),必须以小写字母或数字开头和结尾,最长 63 个字符 +|Name +|The name of the workspace. The name can only contain lowercase letters, numbers, and hyphens (-), must start and end with a lowercase letter or number, and can be up to 63 characters long. -|别名 -|企业空间的别名。别名可包含任意字符,最长 63 个字符。 +|Alias +|The alias of the workspace. The alias can contain any characters and can be up to 63 characters long. -|管理员 -|企业空间的管理员。 - -|描述 -|企业空间的描述信息。描述可包含任意字符,最长 256 个字符。 +|Administrator +|The administrator of the workspace. +|Description +|The description of the workspace. The description can contain any characters and can be up to 256 characters long. |=== -- -. 在**集群设置**页签选择授权给该企业空间的集群(可同时选择多个集群),企业空间中的资源将创建在该集群上。点击**确定**。 +. On the **Cluster Settings** tab, select the clusters authorized for this workspace (multiple clusters can be selected at the same time), and resources within the workspace will be created on those clusters. Click **OK**. + -企业空间创建完成后将显示在企业空间列表中。 - +After creating the workspace, it will be displayed in the workspace list. \ No newline at end of file diff --git a/content/en/docs/v4.1/08-workspace-management/02-workspaces/02-view-a-workspace-list.adoc b/content/en/docs/v4.1/08-workspace-management/02-workspaces/02-view-a-workspace-list.adoc index 031028ef0..106fd7613 100644 --- a/content/en/docs/v4.1/08-workspace-management/02-workspaces/02-view-a-workspace-list.adoc +++ b/content/en/docs/v4.1/08-workspace-management/02-workspaces/02-view-a-workspace-list.adoc @@ -1,15 +1,14 @@ --- -title: "查看企业空间列表" -linkTitle: "查看企业空间列表" -keywords: "Kubernetes, KubeSphere, 访问控制, 企业空间, 查看企业空间列表" -description: "介绍如何查看企业空间列表。" +title: "View Workspace List" +linkTitle: "View Workspace List" +keywords: "Kubernetes, KubeSphere, Access Control, Workspace, View Workspace List" +description: "Learn how to view the workspace list." weight: 02 --- -:ks_permission: **企业空间查看** - -本节介绍如何查看企业空间列表。 +:ks_permission: **Workspace Viewing** +This section explains how to view the workspace list. == Prerequisites @@ -18,12 +17,13 @@ include::../../../_custom-en/platformManagement/platformManagement-prer-required == Steps -. 以具有pass:a,q[{ks_permission}]权限的用户登录{ks_product-en} Web 控制台。 -. 点击**企业空间管理**。 +include::../../../_custom-en/platformManagement/platformManagement-oper-logIn.adoc[] + +. Click **Workspace Management**. + -- -* 企业空间列表显示当前 KubeSphere 平台的所有企业空间。 +* The workspace list displays all workspaces on the KubeSphere platform. -* 在企业空间列表中,点击企业空间的名称可进入企业空间,查看和管理企业空间中的资源。 +* In the workspace list, click the name of a workspace to view and manage resources within it. -- diff --git a/content/en/docs/v4.1/08-workspace-management/02-workspaces/03-edit-workspace-information.adoc b/content/en/docs/v4.1/08-workspace-management/02-workspaces/03-edit-workspace-information.adoc index 28b295cf2..c1af682fe 100644 --- a/content/en/docs/v4.1/08-workspace-management/02-workspaces/03-edit-workspace-information.adoc +++ b/content/en/docs/v4.1/08-workspace-management/02-workspaces/03-edit-workspace-information.adoc @@ -1,18 +1,16 @@ --- -title: "编辑企业空间信息" -linkTitle: "编辑企业空间信息" -keywords: "Kubernetes, KubeSphere, 访问控制, 企业空间, 编辑企业空间信息" -description: "介绍如何编辑企业空间信息。" +title: "Edit Workspace Information" +linkTitle: "Edit Workspace Information" +keywords: "Kubernetes, KubeSphere, Access Control, Workspace, Edit Workspace Information" +description: "Learn how to edit workspace information." weight: 03 --- -:ks_permission: **企业空间管理** +:ks_permission: **Workspace Management** +This section explains how to edit workspace information. -本节介绍如何编辑企业空间信息。 - -您可以编辑企业空间的别名和描述。{ks_product-en}不支持编辑已创建企业空间的名称。 - +You can edit the alias and description of a workspace. KubeSphere does not support editing the name of an already created workspace. == Prerequisites @@ -21,22 +19,23 @@ include::../../../_custom-en/platformManagement/platformManagement-prer-required == Steps -. 以具有pass:a,q[{ks_permission}]权限的用户登录{ks_product-en} Web 控制台。 -. 点击**企业空间管理**。 -. 在需要操作的企业空间右侧点击image:/images/ks-qkcp/zh/icons/more.svg[more,18,18],然后在下拉列表中选择**编辑信息**。 -. 在**编辑信息**对话框设置企业空间的别名和描述,然后点击**确定**。 +include::../../../_custom-en/platformManagement/platformManagement-oper-logIn.adoc[] +. Click **Workspace Management**. + +. Click image:/images/ks-qkcp/zh/icons/more.svg[more,18,18] on the right of the workspace you want to edit, then choose **Edit Information** from the dropdown list. + +. In the **Edit Information** dialog, set the alias and description for the workspace, then click **OK**. + -- [%header,cols="1a,4a"] |=== -|参数 |描述 +| Parameter | Description -|别名 -|企业空间的别名。别名可包含任意字符,最长 63 个字符。 - -|描述 -|企业空间的描述信息。描述可包含任意字符,最长 256 个字符。 +| Alias +| The alias of the workspace. The alias can contain any characters, with a maximum length of 63 characters. +| Description +| The description of the workspace. The description can contain any characters, with a maximum length of 256 characters. |=== -- diff --git a/content/en/docs/v4.1/08-workspace-management/02-workspaces/04-delete-workspaces.adoc b/content/en/docs/v4.1/08-workspace-management/02-workspaces/04-delete-workspaces.adoc index 4440c6c89..01c6a47eb 100644 --- a/content/en/docs/v4.1/08-workspace-management/02-workspaces/04-delete-workspaces.adoc +++ b/content/en/docs/v4.1/08-workspace-management/02-workspaces/04-delete-workspaces.adoc @@ -1,23 +1,22 @@ --- -title: "删除企业空间" -linkTitle: "删除企业空间" -keywords: "Kubernetes, KubeSphere, 访问控制, 企业空间, 删除企业空间" -description: "介绍如何删除企业空间。" +title: "Delete Workspaces" +linkTitle: "Delete Workspaces" +keywords: "Kubernetes, KubeSphere, Access Control, Workspace, Delete Workspace" +description: "Learn how to delete a workspace." weight: 04 --- -:ks_permission: **企业空间管理** +:ks_permission: **Workspace Management** - -本节介绍如何删除企业空间。 +This section explains how to delete a workspace. //note [.admon.note,cols="a"] |=== -|说明 +|Note | -系统企业空间 **system-workspace** 无法删除。 +The system workspace **system-workspace** cannot be deleted. |=== @@ -27,25 +26,30 @@ weight: 04 include::../../../_custom-en/platformManagement/platformManagement-prer-requiredPermission_v4.adoc[] -== 删除单个企业空间 +== Delete a Single Workspace -. 以具有pass:a,q[{ks_permission}]权限的用户登录{ks_product-en} Web 控制台。 -. 点击**企业空间管理**。 -. 在需要操作的企业空间右侧点击image:/images/ks-qkcp/zh/icons/more.svg[more,18,18],然后在下拉列表中选择**删除**。 -. 在**删除企业空间**对话框,输入企业空间的名称,然后点击**确定**。 +include::../../../_custom-en/platformManagement/platformManagement-oper-logIn.adoc[] +. Click **Workspace Management**. -== 批量删除企业空间 -. 以具有pass:a,q[{ks_permission}]权限的用户登录{ks_product-en} Web 控制台。 -. 点击**企业空间管理**。 -. 选择需要删除的企业空间左侧的复选框,然后在项目列表上方点击**删除**。 -. 在**批量删除企业空间**对话框,输入企业空间的名称,然后点击**确定**。 +. Click image:/images/ks-qkcp/zh/icons/more.svg[more,18,18] on the right of the workspace you want to delete, then choose **Delete** from the dropdown list. + +. In the **Delete Workspace** dialog, enter the name of the workspace, then click **OK**. + +== Delete Multiple Workspaces + +include::../../../_custom-en/platformManagement/platformManagement-oper-logIn.adoc[] + +. Click **Workspace Management**. + +. Select the checkbox on the left of the workspaces you want to delete, then click **Delete** above the workspace list. + +. In the **Delete Multiple Workspaces** dialog, enter the name of the workspaces, then click **OK**. + [.admon.note,cols="a"] |=== -|说明 +|Note -| -请使⽤半⻆逗号(,)和空格分隔多个名称。 +|Please separate multiple names using a comma (,) and a space. |=== diff --git a/content/en/docs/v4.1/08-workspace-management/02-workspaces/_index.adoc b/content/en/docs/v4.1/08-workspace-management/02-workspaces/_index.adoc index f807903ad..4d23396ed 100644 --- a/content/en/docs/v4.1/08-workspace-management/02-workspaces/_index.adoc +++ b/content/en/docs/v4.1/08-workspace-management/02-workspaces/_index.adoc @@ -1,10 +1,10 @@ --- -title: "管理企业空间" -linkTitle: "管理企业空间" -keywords: "Kubernetes, KubeSphere, 访问控制, 企业空间" -description: "介绍如何管理企业空间。" +title: "Manage Workspaces" +linkTitle: "Manage Workspaces" +keywords: "Kubernetes, KubeSphere, Access Control, Workspaces" +description: "Learn how to manage workspaces." layout: "second" weight: 02 --- -本节介绍如何创建和管理多个企业空间。 +This section explains how to create and manage multiple workspaces. diff --git a/content/en/docs/v4.1/08-workspace-management/03-overview/01-view-workspace-resource-usage.adoc b/content/en/docs/v4.1/08-workspace-management/03-overview/01-view-workspace-resource-usage.adoc index 9bc46f9d2..75f7a352f 100644 --- a/content/en/docs/v4.1/08-workspace-management/03-overview/01-view-workspace-resource-usage.adoc +++ b/content/en/docs/v4.1/08-workspace-management/03-overview/01-view-workspace-resource-usage.adoc @@ -1,27 +1,22 @@ --- -title: "查看资源用量" -linkTitle: "查看资源用量" -keywords: "Kubernetes, KubeSphere, 企业空间管理, 概览, 查看企业空间资源用量" -description: "介绍如何查看企业空间资源用量。" +title: "View Resource Usage" +linkTitle: "View Resource Usage" +keywords: "Kubernetes, KubeSphere, Workspace Management, Overview, View Workspace Resource Usage" +description: "Learn how to view workspace resource usage." weight: 01 --- -:ks_permission: **企业空间设置查看** -:ks_navigation: **概览** +:ks_permission: **Workspace Settings Viewing** +:ks_navigation: **Overview** - -本节介绍如何查看企业空间资源用量。 +This section explains how to view workspace resource usage. == Prerequisites -:relfileprefix: ../../../ - include::../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps @@ -32,29 +27,4 @@ include::../../../_custom-en/workspaceManagement/workspaceManagement-oper-openWo include::../../../../_ks_components-en/oper-navigate.adoc[] + -**概览**页面的**资源用量**页签提供项目、角色、企业空间成员的数量信息。 - -// ==== -// * **概览**页面的**资源用量**页签提供以下信息: -// + -// -- -// [%header,cols="1a,4a"] -// |=== -// |参数 |描述 - -// |物理资源 -// |企业空间在指定集群中的 CPU 和内存使用情况。 - -// |应用资源 -// |企业空间在指定集群中创建的部署、有状态副本集、守护进程集、任务、定时任务和持久卷声明的数量。 -// |=== -// -- - -// include::../../../../_ks_components-en/oper-selectTimeRange.adoc[] - -// include::../../../../_ks_components-en/oper-Autorefresh.adoc[] - -// include::../../../../_ks_components-en/oper-refreshData.adoc[] - -// * 在右上角点击**集群**下拉列表可查看特定集群中的数据。 -// ==== +The **Resource Usage** tab on the **Overview** page provides information on the number of projects, roles, and members in the workspace. \ No newline at end of file diff --git a/content/en/docs/v4.1/08-workspace-management/03-overview/03-view-cluster-resource-usage.adoc b/content/en/docs/v4.1/08-workspace-management/03-overview/03-view-cluster-resource-usage.adoc index 0ce0d6edf..9d0f26d83 100644 --- a/content/en/docs/v4.1/08-workspace-management/03-overview/03-view-cluster-resource-usage.adoc +++ b/content/en/docs/v4.1/08-workspace-management/03-overview/03-view-cluster-resource-usage.adoc @@ -1,28 +1,22 @@ --- -title: "查看集群信息" -linkTitle: "查看集群信息" -keywords: "Kubernetes, KubeSphere, 企业空间管理, 概览, 查看集群信息" -description: "介绍如何查看集群信息。" +title: "View Cluster Information" +linkTitle: "View Cluster Information" +keywords: "Kubernetes, KubeSphere, Workspace Management, Overview, View Cluster Information" +description: "Learn how to view cluster information." weight: 03 --- +:ks_permission: **Workspace Settings Viewing** +:ks_navigation: **Overview** -:ks_permission: **企业空间设置查看** -:ks_navigation: **概览** - - -介绍如何查看授权给企业空间的集群的基本信息。 +This section explains how to view basic information about the clusters authorized for the workspace. == Prerequisites -:relfileprefix: ../../../ - include::../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps @@ -35,16 +29,4 @@ include::../../../../_ks_components-en/oper-navigate.adoc[] + -. 在**概览**页面点击**集群信息**页签查看授权给企业空间的集群的基本信息。 - -// . 在**概览**页面点击**集群信息**页签查看授权给企业空间的集群的 CPU、内存、磁盘总量和已使用量,以及集群上可创建容器组的总数和已创建容器组的数量。 -// + -// -- -// // Note -// include::../../../../_ks_components-en/admonitions/note.adoc[] - -// 默认情况下每个集群节点最多可以创建 110 个容器组。 - -// include::../../../../_ks_components-en/admonitions/admonEnd.adoc[] -// -- - +. Click the **Cluster Information** tab on the **Overview** page to view basic information about the clusters authorized for the workspace. \ No newline at end of file diff --git a/content/en/docs/v4.1/08-workspace-management/03-overview/_index.adoc b/content/en/docs/v4.1/08-workspace-management/03-overview/_index.adoc index 798c9e058..403ddb656 100644 --- a/content/en/docs/v4.1/08-workspace-management/03-overview/_index.adoc +++ b/content/en/docs/v4.1/08-workspace-management/03-overview/_index.adoc @@ -1,12 +1,10 @@ --- -title: "概览" -linkTitle: "概览" -keywords: "Kubernetes, KubeSphere, 企业空间管理, 概览" -description: "介绍如何查看企业空间概览信息。" +title: "Overview" +linkTitle: "Overview" +keywords: "Kubernetes, KubeSphere, Workspace Management, Overview" +description: "Learn how to get workspace overview info." layout: "second" weight: 03 --- - - -本节介绍如何查看企业空间概览信息。 +This section explains how to get workspace overview info. \ No newline at end of file diff --git a/content/en/docs/v4.1/08-workspace-management/04-projects/01-create-a-project.adoc b/content/en/docs/v4.1/08-workspace-management/04-projects/01-create-a-project.adoc index 9f6f7211a..283c82d4d 100644 --- a/content/en/docs/v4.1/08-workspace-management/04-projects/01-create-a-project.adoc +++ b/content/en/docs/v4.1/08-workspace-management/04-projects/01-create-a-project.adoc @@ -16,12 +16,8 @@ weight: 01 == Prerequisites -:relfileprefix: ../../../ - include::../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/04-projects/02-view-a-project-list.adoc b/content/en/docs/v4.1/08-workspace-management/04-projects/02-view-a-project-list.adoc index 6d3b61ed6..b0f42b8fa 100644 --- a/content/en/docs/v4.1/08-workspace-management/04-projects/02-view-a-project-list.adoc +++ b/content/en/docs/v4.1/08-workspace-management/04-projects/02-view-a-project-list.adoc @@ -15,12 +15,8 @@ include::../../../_custom-en/workspaceManagement/projects/projects-desc-viewProj == Prerequisites -:relfileprefix: ../../../ - include::../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/04-projects/03-edit-project-information.adoc b/content/en/docs/v4.1/08-workspace-management/04-projects/03-edit-project-information.adoc index e73d2871e..aa44ad54b 100644 --- a/content/en/docs/v4.1/08-workspace-management/04-projects/03-edit-project-information.adoc +++ b/content/en/docs/v4.1/08-workspace-management/04-projects/03-edit-project-information.adoc @@ -17,12 +17,8 @@ include::../../../_custom-en/clusterManagement/projects/projects-note-editInform == Prerequisites -:relfileprefix: ../../../ - include::../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/04-projects/04-edit-project-annotations.adoc b/content/en/docs/v4.1/08-workspace-management/04-projects/04-edit-project-annotations.adoc index 6a5edbeb0..920c562da 100644 --- a/content/en/docs/v4.1/08-workspace-management/04-projects/04-edit-project-annotations.adoc +++ b/content/en/docs/v4.1/08-workspace-management/04-projects/04-edit-project-annotations.adoc @@ -18,12 +18,8 @@ weight: 04 == Prerequisites -:relfileprefix: ../../../ - include::../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/04-projects/05-edit-project-quotas.adoc b/content/en/docs/v4.1/08-workspace-management/04-projects/05-edit-project-quotas.adoc index 528734b7c..d8ae7d20c 100644 --- a/content/en/docs/v4.1/08-workspace-management/04-projects/05-edit-project-quotas.adoc +++ b/content/en/docs/v4.1/08-workspace-management/04-projects/05-edit-project-quotas.adoc @@ -15,12 +15,8 @@ include::../../../_custom-en/clusterManagement/projects/projects-desc-editQuotas == Prerequisites -:relfileprefix: ../../../ - include::../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/04-projects/06-delete-projects.adoc b/content/en/docs/v4.1/08-workspace-management/04-projects/06-delete-projects.adoc index 0d16edec4..44ab0d5f3 100644 --- a/content/en/docs/v4.1/08-workspace-management/04-projects/06-delete-projects.adoc +++ b/content/en/docs/v4.1/08-workspace-management/04-projects/06-delete-projects.adoc @@ -15,12 +15,8 @@ include::../../../_custom-en/clusterManagement/projects/projects-desc-deleteProj == Prerequisites -:relfileprefix: ../../../ - include::../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == 删除单个项目 diff --git a/content/en/docs/v4.1/08-workspace-management/04-projects/_index.adoc b/content/en/docs/v4.1/08-workspace-management/04-projects/_index.adoc index e122b940c..6152d7fb3 100644 --- a/content/en/docs/v4.1/08-workspace-management/04-projects/_index.adoc +++ b/content/en/docs/v4.1/08-workspace-management/04-projects/_index.adoc @@ -1,20 +1,12 @@ --- -title: "项目" -linkTitle: "项目" -keywords: "Kuberentes, KubeSphere, 企业空间管理, 项目" -description: "介绍如何查看项目信息以及管理项目。" +title: "Projects" +linkTitle: "Projects" +keywords: "Kubernetes, KubeSphere, Workspace Management, Projects" +description: "Learn how to view project information and manage projects." layout: "second" weight: 04 --- +This section explains how to manage projects within a workspace. - -本节介绍如何管理企业空间中的项目。 - -在{ks_product-en}平台,企业空间和项目都用于对资源进行分组管理。每个企业空间可包含多个项目。 - -// {ks_product-en}支持两类项目: - -// * 普通项目:基于单个集群创建的项目。普通项目中的所有资源都运行在同一个集群上。 - -// * 联邦项目:基于多个集群创建的项目。联邦项目中的资源可运行在不同集群上。 +In KubeSphere, workspaces and projects are used for grouping and managing resources. Each workspace can contain multiple projects. \ No newline at end of file diff --git a/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/02-view-an-app-repository-list.adoc b/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/02-view-an-app-repository-list.adoc index a78facf43..931414e3a 100644 --- a/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/02-view-an-app-repository-list.adoc +++ b/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/02-view-an-app-repository-list.adoc @@ -16,12 +16,8 @@ weight: 02 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps include::../../../../_custom-en/workspaceManagement/workspaceManagement-oper-openWorkspacePage.adoc[] diff --git a/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/03-edit-an-app-repository.adoc b/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/03-edit-an-app-repository.adoc index 52f957d6e..a5261d9e9 100644 --- a/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/03-edit-an-app-repository.adoc +++ b/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/03-edit-an-app-repository.adoc @@ -15,12 +15,8 @@ weight: 03 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/04-sync-an-app-repository-with-a-helm-chart-repository.adoc b/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/04-sync-an-app-repository-with-a-helm-chart-repository.adoc index 0b3b8526d..edac10b1a 100644 --- a/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/04-sync-an-app-repository-with-a-helm-chart-repository.adoc +++ b/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/04-sync-an-app-repository-with-a-helm-chart-repository.adoc @@ -19,12 +19,8 @@ weight: 04 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/05-delete-an-app-repository.adoc b/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/05-delete-an-app-repository.adoc index 1b0e7273f..119c1ac2c 100644 --- a/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/05-delete-an-app-repository.adoc +++ b/content/en/docs/v4.1/08-workspace-management/05-app-management/02-app-repositories/05-delete-an-app-repository.adoc @@ -23,12 +23,8 @@ include::../../../../../_ks_components-en/admonitions/admonEnd.adoc[] == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/01-basic-information/02-edit-workspace-information.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/01-basic-information/02-edit-workspace-information.adoc index 2f4922f5f..b42c70e59 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/01-basic-information/02-edit-workspace-information.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/01-basic-information/02-edit-workspace-information.adoc @@ -18,12 +18,8 @@ weight: 02 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/01-basic-information/04-delete-a-workspace.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/01-basic-information/04-delete-a-workspace.adoc index 1e4be3a3f..6c17cb51f 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/01-basic-information/04-delete-a-workspace.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/01-basic-information/04-delete-a-workspace.adoc @@ -23,12 +23,8 @@ include::../../../../../_ks_components-en/admonitions/admonEnd.adoc[] == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/02-workspace-quotas/01-edit-workspace-quotas.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/02-workspace-quotas/01-edit-workspace-quotas.adoc index 206c71fc0..244986136 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/02-workspace-quotas/01-edit-workspace-quotas.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/02-workspace-quotas/01-edit-workspace-quotas.adoc @@ -18,12 +18,8 @@ weight: 01 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/02-workspace-quotas/02-view-workspace-quotas.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/02-workspace-quotas/02-view-workspace-quotas.adoc index 80e1e85b6..99472e4bc 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/02-workspace-quotas/02-view-workspace-quotas.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/02-workspace-quotas/02-view-workspace-quotas.adoc @@ -16,12 +16,8 @@ weight: 02 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/01-invite-a-user-to-a-workspace.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/01-invite-a-user-to-a-workspace.adoc index d1f33bf40..bb13dd0a4 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/01-invite-a-user-to-a-workspace.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/01-invite-a-user-to-a-workspace.adoc @@ -16,12 +16,8 @@ weight: 01 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/02-view-a-workspace-member-list.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/02-view-a-workspace-member-list.adoc index 7a4bd981f..f72b60826 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/02-view-a-workspace-member-list.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/02-view-a-workspace-member-list.adoc @@ -16,12 +16,8 @@ weight: 02 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/03-view-workspace-member-details.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/03-view-workspace-member-details.adoc index dde804b13..3a6166889 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/03-view-workspace-member-details.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/03-view-workspace-member-details.adoc @@ -16,12 +16,8 @@ weight: 03 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/04-change-the-role-of-a-workspace-member.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/04-change-the-role-of-a-workspace-member.adoc index 1478d4a68..58aedf17c 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/04-change-the-role-of-a-workspace-member.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/04-change-the-role-of-a-workspace-member.adoc @@ -16,12 +16,8 @@ weight: 04 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/05-remove-a-workspace-member.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/05-remove-a-workspace-member.adoc index dabb01f60..b150b5401 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/05-remove-a-workspace-member.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/03-workspace-members/05-remove-a-workspace-member.adoc @@ -23,12 +23,8 @@ include::../../../../../_ks_components-en/admonitions/admonEnd.adoc[] == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/01-create-a-workspace-role.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/01-create-a-workspace-role.adoc index 7d02b85b4..cc2f9e1ca 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/01-create-a-workspace-role.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/01-create-a-workspace-role.adoc @@ -16,12 +16,8 @@ weight: 01 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/02-view-a-workspace-role-list.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/02-view-a-workspace-role-list.adoc index d35f181bd..dbd358313 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/02-view-a-workspace-role-list.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/02-view-a-workspace-role-list.adoc @@ -18,12 +18,8 @@ weight: 02 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/03-view-workspace-role-details.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/03-view-workspace-role-details.adoc index 9d1dc7260..e328e7bad 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/03-view-workspace-role-details.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/03-view-workspace-role-details.adoc @@ -16,12 +16,8 @@ weight: 03 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/04-edit-workspace-role-information.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/04-edit-workspace-role-information.adoc index 9a153dc72..dded45ceb 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/04-edit-workspace-role-information.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/04-edit-workspace-role-information.adoc @@ -18,12 +18,8 @@ weight: 04 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/05-edit-permissions-of-a-workspace-role.adoc b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/05-edit-permissions-of-a-workspace-role.adoc index 36578e365..510cba85c 100644 --- a/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/05-edit-permissions-of-a-workspace-role.adoc +++ b/content/en/docs/v4.1/08-workspace-management/06-workspace-settings/04-workspace-roles/05-edit-permissions-of-a-workspace-role.adoc @@ -17,12 +17,8 @@ weight: 05 == Prerequisites -:relfileprefix: ../../../../ - include::../../../../_custom-en/workspaceManagement/workspaceManagement-prer-requiredPermission_v4.adoc[] -:relfileprefix: ./ - == Steps diff --git a/content/en/docs/v4.1/08-workspace-management/_index.adoc b/content/en/docs/v4.1/08-workspace-management/_index.adoc index d1134ec55..d5480c0ed 100644 --- a/content/en/docs/v4.1/08-workspace-management/_index.adoc +++ b/content/en/docs/v4.1/08-workspace-management/_index.adoc @@ -1,17 +1,15 @@ --- -title: "企业空间管理" -linkTitle: "企业空间管理" -keywords: "Kubernetes, KubeSphere, 企业空间管理" -description: "介绍如何管理单个企业空间中的资源。" +title: "Workspace Management" +linkTitle: "Workspace Management" +keywords: "Kubernetes, KubeSphere, Workspace Management" +description: "Learn how to manage resources within a single workspace." layout: "second" weight: 08 icon: "/images/docs/common/docs.svg" --- +This section explains how to manage resources within a workspace. +In KubeSphere, a workspace is used to group resources for management. Cluster administrators can authorize one or more clusters to a workspace, allowing resources within the workspace to run on the cluster. Each workspace can contain multiple projects. Users can be invited to join a workspace and gain view and management permissions for workspace resources based on their workspace roles. -本节介绍如何管理企业空间中的资源。 - -在{ks_product-en}平台,企业空间用于对资源进行分组管理。集群管理员可以将一个或多个集群授权给企业空间,从而允许企业空间中的资源运行在集群上。每个企业空间可包含多个项目。用户可以被邀请加入企业空间,并根据企业空间角色获得企业空间资源的查看和管理权限。 - -{ks_product-en}安装完成后系统将自动创建 **system-workspace** 企业空间,其中包含系统项目,用于管理系统资源。 \ No newline at end of file +After the {ks_product-en} installation is complete, the system will automatically create the **system-workspace** workspace, which includes system projects for managing system resources. \ No newline at end of file diff --git a/content/en/docs/v4.1/09-project-management/01-web-console/01-log-in-and-go-to-a-project.adoc b/content/en/docs/v4.1/09-project-management/01-web-console/01-log-in-and-go-to-a-project.adoc index 5e9706104..87e5b8dd1 100644 --- a/content/en/docs/v4.1/09-project-management/01-web-console/01-log-in-and-go-to-a-project.adoc +++ b/content/en/docs/v4.1/09-project-management/01-web-console/01-log-in-and-go-to-a-project.adoc @@ -31,6 +31,6 @@ include::../../../_custom-en/workspaceManagement/webConsole/webConsole-note-firs include::../../../../_ks_components-en/admonitions/admonEnd.adoc[] -- -. 点击**企业空间管理**。 +. Click **Workspace Management**. . 在**企业空间管理**页面点击一个企业空间的名称进入企业空间。 . 在左侧导航栏选择**项目**,然后点击一个项目的名称进入项目。 diff --git a/content/en/docs/v4.1/20-release-notes/release-v330.md b/content/en/docs/v4.1/20-release-notes/release-v330.md index bc828e72e..e191f555c 100644 --- a/content/en/docs/v4.1/20-release-notes/release-v330.md +++ b/content/en/docs/v4.1/20-release-notes/release-v330.md @@ -1,89 +1,90 @@ --- -title: "3.3.0 版本说明" -keywords: "Kubernetes, KubeSphere, 版本说明" -description: "KubeSphere 3.3.0 版本说明" -linkTitle: "3.3.0 版本说明" -weight: 50 +title: "Release Notes for 3.3.0" +keywords: "Kubernetes, KubeSphere, Release Notes" +description: "KubeSphere 3.3.0 Release Notes" +linkTitle: "Release Notes - 3.3.0" +weight: 18098 --- ## DevOps -### 新特性 -- 提供了基于 GitOps 的持续部署方案,底层支持 Argo CD,可以实时查看持续部署的状态。 -- 支持配置持续部署白名单,限制持续部署的目标代码仓库和部署位置。 -- 支持导入并管理代码仓库。 -- 新增多款基于 CRD 的内置流水线模板,支持参数自定义。 -- 支持查看流水线事件。 -## 存储 -### 新特性 -- 支持租户级存储类权限管理。 -- 新增卷快照内容和卷快照类管理。 -- 支持 deployment 与 statefulSet 资源调整存储卷声明修改后自动重启。 -- 支持存储卷声明设定使用阈值自动扩容。 +### Features +- Add the Continuous Deployment feature, which supports GitOps and uses Argo CD as the backend, and users can view the status of continuous deployments in real time. +- Add the allowlist feature on the **Basic Information** page of a DevOps project to restrict the target repository and deployment location for continuous deployments. +- Add support for importing and managing code repositories. +- Add support for built-in CRD-based pipeline templates and parameter customization. +- Add support for viewing pipeline events. -## 多租户和多集群 -### 新特性 -- 支持 kubeconfig 证书到期提示。 -- 支持 kubesphere-config configmap 以显示当前集群的名称。 -- 支持集群层级的成员管理。 +## Storage +### Features -## 可观察性 -### 新特性 -- 增加容器进程/线程监控指标。 -- 支持监控节点用量。 -- 支持导入 Grafana 模板实现自定义监控看板。 -- 支持为容器日志、资源事件和审计日志指定不同的数据保存时间。 +- Add support for tenant-level storage class permission management. +- Add the volume snapshot content management and volume snapshot class management features. +- Add support for automatic restart of deployments and statefulsets after a PVC has been changed. +- Add the PVC auto expansion feature, which automatically expands PVCs when remaining capacity is insufficient. -### 优化增强 -- Alertmanager 从 v0.21.0 升级至 v0.23.0。 -- Grafana 从 7.4.3 升级至 8.3.3。 -- kube-state-metrics 从 v1.9.7 升级至 v2.3.0。 -- node-exporter 从 v0.18.1 升级至 v1.3.1。 -- Prometheus 从 v2.26.0 升级至 v2.34.0。 -- Prometheus Operator 从 v0.43.2 升级至 v0.55.1。 -- kube-rbac-proxy 从 v0.8.0 升级至 v0.11.0。 -- configmap-reload 从 v0.3.0 升级至 v0.5.0。 -- Thanos 从 v0.18.0 升级至 v0.25.2。 -- kube-events 从 v0.3.0 升级至 v0.4.0。 -- Fluent Bit Operator 从 v0.11.0 升级至 v0.13.0。 -- Fluent Bit 从 v1.8.3 升级至 v1.8.11。 +## Multi-tenancy and Multi-cluster +### Features +- Add a notification to remind users when the kubeconfig certificate of a cluster is about to expire. +- Add the kubesphere-config configmap, which provides the name of the current cluster. +- Add support for cluster-level member and role management. -## KubeEdge 集成 -### 新特性 -- 支持节点终端,可以直接在 UI 上登陆集群节点,包括边缘节点。 -### 优化增强 -- KubeEdge 版本从v1.7.2 升级到 v1.9.2。 -- 移除 EdgeWatcher。 +## Observability -## 网络 -### 优化增强 -- 负载均衡类型选择新增 OpenELB。 -### 问题修复 -- 修复了删除项目后项目网关遗留的问题。 +### Features +- Add process and thread monitoring metrics for containers. +- Add disk monitoring metrics that provide usage of each disk. +- Add support for importing Grafana templates to create custom monitoring dashboards of a namespace scope. +- Add support for defining separate data retention periods for container logs, resource events, and audit logs. + +### Enhancements & Updates +- Upgrade Alertmanager from v0.21.0 to v0.23.0. +- Upgrade Grafana from 7.4.3 to 8.3.3. +- Upgrade kube-state-metrics from v1.9.7 to v2.3.0. +- Upgrade node-exporter from v0.18.1 to v1.3.1. +- Upgrade Prometheus from v2.26.0 to v2.34.0. +- Upgrade Prometheus Operator from v0.43.2 to v0.55.1. +- Upgrade kube-rbac-proxy from v0.8.0 to v0.11.0. +- Upgrade configmap-reload from v0.3.0 to v0.5.0. +- Upgrade Thanos from v0.18.0 to v0.25.2. +- Upgrade kube-events from v0.3.0 to v0.4.0. +- Upgrade Fluent Bit Operator from v0.11.0 to v0.13.0. +- Upgrade Fluent Bit from v1.8.3 to v1.8.11. + +## KubeEdge Integration +### Features +- Add support for logging in to common cluster nodes and edge nodes from the KubeSphere web console. +### Enhancements & Updates +- Upgrade KubeEdge from v1.7.2 to v1.9.2. +- Remove EdgeWatcher. + +## Network +### Enhancements & Updates +- Integrate OpenELB with KubeSphere for exposing LoadBalancer services. +### Bug Fixes +- Fix an issue where the gateway of a project is not deleted after the project is deleted. ## App Store -### 问题修复 -- 修复 Helm Controller NPE 错误引起的 ks-controller-manager 崩溃。 +### Bug Fixes +- Fix a ks-controller-manager crash caused by Helm controller NPE errors. -## 验证和授权 -### 新特性 -- 支持手动启用/禁用用户。 +## Authentication & Authorization +### Features +- Add support for manually disabling and enabling users. +## User Experience +- Add a prompt when the audit log of Kubernetes has been enabled. +- Add the lifecycle management feature for containers. +- Add support for creating container environment variables in batches from secrets and configmaps. +- Add a time range selector on the **Traffic Monitoring** tab page. +- Add a message in the **Audit Log Search** dialog box, which prompts users to enable the audit logs feature. +- Add more Istio parameters in `ClusterConfiguration`. +- Add support for more languages, for example, Turkish. +- Set the **Token** parameter on the webhook settings page as mandatory. +- Prevent passwords without uppercase letters set through the backend CLI. +- Fix an issue where no data is displayed on the **Traffic Management** and **Tracing** tab pages in a multi-cluster project. +- Fix an app installation failure, which occurs when users click buttons too fast. +- Fix an issue where container probes are still displayed after they are deleted. +- Fix an issue where statefulset creation fails when a volume is mounted to an init container. +- Prevent ks-apiserver and ks-controller-manager from restarting when the cluster configuration is changed. +- Optimize some UI texts. +- Optimize display of the service topology on the **Service** page. -## 用户体验 -- 新增 Kubernetes 审计日志开启提示。 -- 支持容器生命周期管理。 -- 支持应用整个配置字典或保密字典文件。 -- 支持在**流量监控**页签选择时间段。 -- 新增在**审计日志搜索** 对话框提醒用户开启审计日志的功能。 -- 支持通过 `ClusterConfiguration` 配置更多 Istio 参数。 -- 新增多语言支持,如土耳其语。 -- 支持用户密码合规性检查。 -- 新增在 webhook 设置页面将**访问令牌**设置为必填项的功能。 -- 修复**服务拓扑**页面的服务详情区域数据未自动更新的问题。 -- 修复“修改有状态服务时未显示服务名称”问题。 -- 修复用户点击按钮过快造成的应用安装失败问题。 -- 修复容器组探针删除后仍然显示的问题。 -- 修复存储卷挂载到 init 容器时 statefulset 创建失败的问题。 -- 优化了服务拓扑图详情展示窗口。 -- 优化了 ClusterConfiguration 更新机制,无需重启 ks-apiserver、ks-controller-manager。 -- 优化了部分页面文案描述。 - -有关 KubeSphere 3.3.0 的 Issue 和贡献者详细信息,请参阅 [GitHub](https://github.com/kubesphere/kubesphere/blob/master/CHANGELOG/CHANGELOG-3.3.md)。 +For more information about issues and contributors of KubeSphere 3.3.0, see [GitHub](https://github.com/kubesphere/kubesphere/blob/master/CHANGELOG/CHANGELOG-3.3.md). \ No newline at end of file diff --git a/content/en/docs/v4.1/20-release-notes/release-v331.md b/content/en/docs/v4.1/20-release-notes/release-v331.md index d15e5529c..375e08f94 100644 --- a/content/en/docs/v4.1/20-release-notes/release-v331.md +++ b/content/en/docs/v4.1/20-release-notes/release-v331.md @@ -1,38 +1,42 @@ --- -title: "3.3.1 版本说明" -keywords: "Kubernetes, KubeSphere, 版本说明" -description: "KubeSphere 3.3.1 版本说明" -linkTitle: "3.3.1 版本说明" -weight: 49 +title: "Release Notes for 3.3.1" +keywords: "Kubernetes, KubeSphere, Release Notes" +description: "KubeSphere 3.3.1 Release Notes" +linkTitle: "Release Notes - 3.3.1" +weight: 18096 --- ## DevOps -### 优化增强 +### Enhancements & Updates -- 支持通过 UI 编辑流水线中 kubeconfig 文件绑定方式。 +- Add support for editing the kubeconfig binding mode on the pipeline UI. -### 问题修复 -- 修复用户查看 CI/CD 模板失败的问题。 -- 将 `Deprecated` 标签从 CI/CD 模版中移除,并将部署环节由 `kubernetesDeploy` 修改为 kubeconfig 绑定方式。 +### Bug Fixes -## 网络 -### 问题修复 -- 修复 IPv4/IPv6 双栈模式下用户创建路由规则失败的问题。 +- Fix an issue where users fail to check the CI/CD template. +- Remove the `Deprecated` tag from the CI/CD template and replace `kubernetesDeploy` with `kubeconfig binding` at the deployment phase. -## 存储 -### 问题修复 -- 当用户使用 `hostpath` 作为存储时,必须填写主机路径。 +## Network +### Bug Fixes + +- Fix an issue where users fail to create routing rules in IPv6 and IPv4 dual-stack environments. + +## Storage +### Bug Fixes + +- Set `hostpath` as a required option when users are mounting volumes. -## 验证和授权 -### 问题修复 -- 删除角色 `users-manager` 和 `workspace-manager`。 -- 新增角色 `platform-self-provisioner`。 -- 屏蔽用户自定义角色的部分权限。 +## Authentication & Authorization +### Bug Fixes +- Delete roles `users-manager` and `workspace-manager`. +- Add role `platform-self-provisioner`. +- Block some permissions of custom roles. -## 用户体验 -- 支持修改每页列表的展示数量。 -- 新增对 statefulset 和 deamonset 批量停止的支持 +## User Experience -有关 KubeSphere 3.3.1 的 Issue 和贡献者详细信息,请参阅 [GitHub](https://github.com/kubesphere/kubesphere/blob/master/CHANGELOG/CHANGELOG-3.3.1.md)。 +- Add support for changing the number of items displayed on each page of a table. +- Add support for batch stopping workloads. + +For more information about issues and contributors of KubeSphere 3.3.1, see [GitHub](https://github.com/kubesphere/kubesphere/blob/master/CHANGELOG/CHANGELOG-3.3.1.md). \ No newline at end of file diff --git a/content/en/docs/v4.1/20-release-notes/release-v332.md b/content/en/docs/v4.1/20-release-notes/release-v332.md index 5a122ea0a..1c80c0d92 100644 --- a/content/en/docs/v4.1/20-release-notes/release-v332.md +++ b/content/en/docs/v4.1/20-release-notes/release-v332.md @@ -1,97 +1,92 @@ --- -title: "3.3.2 版本说明" -keywords: "Kubernetes, KubeSphere, 版本说明" -description: "KubeSphere 3.3.2 版本说明" -linkTitle: "3.3.2 版本说明" -weight: 48 +title: "Release Notes for 3.3.2" +keywords: "Kubernetes, KubeSphere, Release Notes" +description: "KubeSphere 3.3.2 Release Notes" +linkTitle: "Release Notes - 3.3.2" +weight: 18095 --- ## DevOps -### 优化增强 +### Enhancements & Upgrades -- 添加最新的 GitHub Actions。 -- 将 PipelineRun 的结果保存到 configmap 中。 -- 修改持续部署应用程序状态的中文描述。 -- 为持续部署参数添加更丰富的信息。 -- 为处于中止状态的 PipelineRun 添加链接。 -- 为 PipelineRun 增加 ID 列,用于执行 kubectl 命令时展示。 -- PipelineRun 生命周期中去掉 Queued 状态。 +- Add the latest GitHub Actions. +- Save the PipelineRun results to the configmap. +- Modify the Chinese description of the status of ArgoCD applications. +- Add more information to continuous deployment parameters. +- Add a link for PipelineRun in the aborted state. +- Add an ID column for PipelineRun, and the ID will be displayed when users run kubectl commands. +- Remove the queued state from PipelineRun. -### 问题修复 - -- 修复用户修改并保存流水线配置后 Webhook 配置丢失的问题。 -- 修复下载 DevOps 流水线制品失败的问题。 -- 修复使用 JAR/WAR 文件创建服务时,镜像地址不匹配的问题。 -- 修复 PipelineRun 从“取消”状态变成“未运行”状态的问题。 -- 修复 Pipeline 的自动清理策略,使其与 Jenkins 的清理保持一致。 +### Bug Fixes +- Fix an issue where webhook configurations are missing after users change and save pipeline configurations. +- Fix an issue where downloading DevOps pipeline artifacts fails. +- Fix an issue where the image address does not match when a service is created by using a JAR/WAR file. +- Fix an issue where the status of PipelineRun changes from `Cancelled` to `Not-Running`. +- Fix the automatic cleaning behavior of pipelines to keep it consistent with the cleaning configurations of Jenkins. ## App Store -### 问题修复 +### Bug Fixes -- 修复上传的应用程序模板上不显示图标的问题。 -- 修复应用商店应用信息处没有显示应用首页的问题。 -- 修复应用商店导入内置应用时导入失败的问题。 -- 修复 IPv6 环境下 UUID 生成错误的问题。 +- Fix an issue where the application icon is not displayed on the uploaded application template. +- Fix an issue where the homepage of an application is not displayed on the application information page. +- Fix an issue where importing built-in applications fails. +- Fix a UUID generation error in an IPv6-only environment. -## 可观测性 +## Observability -### 问题修复 +### Bug Fixes -- 修复 logsidecar-injector 配置文件中的解析问题。 +- Fix a parsing error in the configuration file of logsidecar-injector. -## 微服务 +## Service Mesh -### 问题修复 +### Bug Fixes -- 修复未启用 service mesh 时创建的 Bookinfo 项目没有默认关闭应用治理的问题。 -- 修复蓝绿部署发布模式下线按钮缺失的问题。 +- Fix an issue that application governance of Bookinfo projects without service mesh enabled is not disabled by default. +- Fix an issue where the delete button is missing on the blue-green deployment details page. -## 网络 +## Network -### 优化增强 +### Bug Fixes -- 限制项目的网络隔离范围为当前企业空间。 +- Restrict network isolation of projects within the current workspace. -## 存储 +## Storage -### 优化增强 +### Enhancements & Upgrades -- 在多集群环境中显示 system-workspace 所属集群。 -- 将“应用路由”的英文词条由 “route” 修改为 “ingress”。 +- Display the cluster to which system-workspace belongs in multi-cluster environments. +- Rename route to ingress. -### 问题修复 +## Authentication & Authorization -- 修复编辑联邦项目中的持久卷声明存储类错误的问题。 +### Enhancements & Upgrades -## 验证和授权 +- Add dynamic options for cache. +- Remove the "Alerting Message Management" permission. -### 优化增强 +### Bug Fixes -- 增加了动态的 cache 配置项。 -- 移除“告警消息管理”权限。 +- Fix an issue where platform roles with platform management permisions cannot manage clusters. -### 问题修复 +## Development & Testing -- 修复拥有集群管理权限的平台角色无法管理集群的问题。 +### Bug Fixes -## 开发 & 测试 +- Fix an issue where some data is in the `Out of sync` state after the live-reload feature is introduced. +- Fix an issue where the ks-apiserver fails when it is reloaded multiple times. +- Fix an issue where caching resources fails if some required CRDs are missing. +- Fix an issue where the ks-apiserver crashes in Kubernetes 1.24+ versions. +- Fix an issue where Goroutine leaks occur when the audit event sender times out. -### 问题修复 +## User Experience -- 修复引入热加载功能后部分数据后处于“不同步”状态的问题。 -- 修复 ks-apiserver 多次重载后崩溃的问题。 -- 修复缺少必要的 CRD 造成的资源缓存失败问题。 -- 修复 ks-apiserver 在 Kubernetes 1.24+ 版本中异常崩溃的问题。 -- 修复审计功能中协程泄露的问题。 +- Limit the length of cluster names. +- Fix an issue where pod replicas of a federated service are not automatically refreshed. +- Fix an issue where related pods are not deleted after users delete a service. +- Fix an issue where the number of nodes and roles are incorrectly displayed when there is only one node. -## 用户体验 - -- 限制集群名称长度。 -- 修复 pod 副本不能自动刷新的问题。 -- 修复删除服务时,相关的 pod 没有删除的问题。 -- 修复只有一个节点时,节点数量和角色显示错误的问题。 - -有关 KubeSphere 3.3.2 的 Issue 和贡献者详细信息,请参阅 [GitHub](https://github.com/kubesphere/kubesphere/blob/master/CHANGELOG/CHANGELOG-3.3.2.md)。 +For more information about issues and contributors of KubeSphere 3.3.2, see [GitHub](https://github.com/kubesphere/kubesphere/blob/master/CHANGELOG/CHANGELOG-3.3.2.md). \ No newline at end of file diff --git a/content/en/docs/v4.1/20-release-notes/release-v340.md b/content/en/docs/v4.1/20-release-notes/release-v340.md index f6f095f88..f775cd3da 100644 --- a/content/en/docs/v4.1/20-release-notes/release-v340.md +++ b/content/en/docs/v4.1/20-release-notes/release-v340.md @@ -1,156 +1,154 @@ --- -title: "3.4.0 版本说明" -keywords: "Kubernetes, KubeSphere, 版本说明" -description: "KubeSphere 3.4.0 版本说明" -linkTitle: "3.4.0 版本说明" -weight: 47 +title: "Release Notes for 3.4.0" +keywords: "Kubernetes, KubeSphere, Release Notes" +description: "KubeSphere 3.4.0 Release Notes" +linkTitle: "Release Notes - 3.4.0" +weight: 18094 --- ## DevOps -### 优化增强 +### Enhancements & Updates -- 支持用户自定义流水线配置步骤。 -- 优化 DevOps Jenkins JVM 内存配置。 +- Support user-defined pipeline configuration steps. +- Optimize the devops-jenkins JVM memory configuration. -### 问题修复 +### Bug Fixes -- 修复级联删除 ArgoCD 资源的问题。 -- 修复多分支流水线下载制品失败的问题。 -- 修复流水线运行状态与 Jenkins 不一致的问题(增加重试以同步状态)。 -- 修复新建用户运行流水线一直等待中的问题。 +- Fix the issue of removing ArgoCD resources without cascade parameters. +- Fix the issue that downloading artifacts for multi-branch pipelines fails. +- Fix the issue that the pipeline running status is inconsistent with Jenkins (Add retry for pipelinerun annotation update). +- Fix the issue that the running of a pipeline created by a new user is pending. -## 存储 +## Storage -### 问题修复 +### Bug Fixes -- 修复 pvc 无法删除的问题。 +- Fix the issue that pvc cannot be deleted. + +## Gateway and Microservice + +### Features + +- Gateway supports the configuration of forwarding TCP/UDP traffic. + +### Enhancements & Updates + +- Upgrade ingress nginx: v1.1.0 -> v1.3.1. +- Upgrade servicemesh: +istio: 1.11.1 -> 1.14.6; kiali: v1.38.1 -> v1.50.1; jaeger: 1.27 -> 1.29. + +### Bug Fixes + +- Fix the issue that the returned cluster gateways duplicate. +- Fix the verification error when upgrading the gateway. +- Fix the abnormal display of cluster gateway log and resource status after changing gateway namespace configuration. + +## Observability + +### Features + +- Add CRDs such as RuleGroup, ClusterRuleGroup, GlobalRuleGroup to support Alerting v2beta1 APIs. +- Add admission webhook for RuleGroup, ClusterRuleGroup, GlobalRuleGroup. +- Add controllers to sync RuleGroup, ClusterRuleGroup, GlobalRuleGroup resources to PrometheusRule resources. +- Add Alerting v2beta1 APIs. +- The ks-apiserver of Kubesphere integrates the v1 and v2 versions of opensearch, and users can use the external or built-in opensearch cluster for log storage and query. (Currently the built-in opensearch version of Kubesphere is v2). +- ks-installer integrates the opensearch dashboard, which should be enabled by users. + +### Enhancements & Updates +- Upgrade Prometheus stack dependencies. +- Support configuring the maximum number of logs that can be exported. +- The monitoring component supports Kubernetes PDB Apiversion changes. +- Upgrade Notification Manager to v2.3.0. +- Support cleaning up notification configuration in member clusters when a member cluster is deleted. +- Support switching notification languages. +- Support route notifications to specified users. + +### Bug Fixes + +- Fix the issue that Goroutine leaks when getting audit event sender times out. +- Fix the promql statement of ingress P95 delay. -## 网关和微服务 +## Multi-tenancy and Multi-cluster -### 新特性 +### Enhancements & Updates -- 网关支持配置 TCP/UDP 流量转发。 +- Check the cluster ID (kube-system UID) when updating the cluster. -### 优化增强 +### Bug Fixes -- 升级 ingress nginx 版本: v1.1.0 -> v1.3.1。 -- 升级 servicemesh 组件版本:istio: 1.11.1 -> 1.14.6;kiali: v1.38.1 -> v1.50.1;jaeger: 1.27 -> 1.29。 - -### 问题修复 - -- 修复返回集群网关数据重复的问题。 -- 修复网关升级校验错误 。 -- 修复更改网关命名空间配置后,集群网关日志和资源状态显示异常的问题。 - - -## 可观测性 - -### 新特性 - -- 新增 RuleGroup, ClusterRuleGroup, GlobalRuleGroup 等 CRDs,用于支持 Alerting v2beta1 APIs。 -- 新增 RuleGroup, ClusterRuleGroup, GlobalRuleGroup 等资源的准入控制 webhook。 -- 新增 Controllers,将 RuleGroup, ClusterRuleGroup, GlobalRuleGroup 资源同步为 PrometheusRule 资源。 -- 添加 Alerting v2beta1 APIs。 -- 在 Kubesphere 的 ks-apiserver 中集成了 opensearch 的 v1 和 v2 版本,用户可以使用外置或内置的 opensearch 集群进行日志的存储和查询。(目前 Kubesphere 内置的 opensearch 版本为 v2) -- ks-installer 集成了 opensearch 的 dashboard,需要用户自行开启。 - - -### 优化增强 -- 升级 Prometheus 栈依赖。 -- 支持配置最大日志导出数量。 -- 监控组件部署支持 Kubernetes PDB Apiversion 变更。 -- 升级 Notification Manager 到 v2.3.0。 -- 支持删除集群时删除集群上的通知设置。 -- 支持切换通知语言。 -- 通知支持路由功能。 - - -### 问题修复 - -- 修复潜在 Go 协程泄漏的问题。 -- 修复 ingress P95 延迟时间 promql 语句。 - - -## 多租户和多集群 - -### 优化增强 - -- 更新集群的时候校验集群 ID。 - -### 问题修复 - -- 确保在清理通知相关资源时集群状态正常。 -- 修复针对新集群的校验问题。 -- 修复集群状态信息不正确的问题。 -- 限制企业空间授权集群不可重复。 +- Make sure the cluster is Ready when cleaning up notifications. +- Fix the webhook validation issue for new clusters. +- Fix the incorrect cluster status. +- Fix the issue of potentially duplicated entries for granted clusters in the workspace. ## App Store -### 问题修复 +### Bug Fixes -- 修复 IPv6 环境下应用商店模块无法生成 ID 的问题。 -- 修复应用模板 Home 字段缺失的问题。 -- 修复应用模板图标缺失的问题。 -- 修复应用模板缺少 Maintainers 字段的问题。 -- 修复应用部署失败后无法重新部署的问题。 -- 修复应用 ID 参数错误的问题。 -- 修复部分应用无法正确安装的问题。 -- 修复应用仓库状态不正确的问题。 +- Fix the ID generation failure in IPv6-only environment. +- Fix the missing Home field in app templates. +- Fix the issue that the uploaded app templates do not show icons. +- Fix missing maintainers in Helm apps. +- Fix the issue that Helm applications in a failed status cannot be upgraded again. +- Fix the wrong "applicationId" parameter. +- Fix the infinite loop after app installation failure. +- FIx the wrong status of application repository. -## 网络 +## Network -### 优化增强 +### Enhancements & Updates -- 升级依赖。 +- Upgrade dependencies. -## 验证和授权 -### 新特性 +## Authentication and Authorization -- 新增 inmemory cache。 -- 新增 Resource Getter v1beta1。 -- 新增 Resource Manager 写操作。 +### Features -### 优化增强 +- Add inmemory cache. +- Add Resource Getter v1beta1. +- Add write operation for Resource Manager. -- 新增 iam.kubesphere/v1beta1 RoleTemplate。 -- 更新密码最小长度为 8 位。 -- 修改 Version 的 API。 -- 修改 identityProvider 的 API。 -- 新增 IAM v1beta1 APIs。 +### Enhancements & Updates -### 问题修复 +- Add iam.kubesphere/v1beta1 RoleTemplate. +- Update the password minimum length to 8. +- Update Version API. +- Update identityProvider API. +- Add IAM v1beta1 APIs. -- 修复 enableMultiLogin 配置不生效的问题。 +### Bug Fixes + +- Fix the issue that the enableMultiLogin configuration does not take effect. ## API Changes -- 使用 autoscaling/v2 版本 API。 -- 使用 batch/v1 版本的 API 。 -- 更新 KubeSphere 健康检查 API。 -- 修复 K8s 1.25 版本中 ks-apiserver 崩溃的问题。 +- Use autoscaling/v2 API. +- Use batch/v1 API. +- Update health check API. +- Fix the ks-apiserver crash issue in K8s v1.25. -## 用户体验 -### 新特性 +## User Experience -- Resource API 支持别名搜索。 +### Features -### 问题修复 +- Resource API supports searching alias in annotations. -- 修复潜在 Websocket 链接泄漏的问题。 +### Bug Fixes -### 优化增强 +- Fix the potential Websocket link leakage issue. -- 使用 helm action 包代替直接使用 helm 二进制。 -- 调整 kubectl terminal 中 bash 和 sh 的优先级。 -- 修复由于 DiscoveryAPI 异常导致 ks-apiserver 无法启动的问题。 -- 修复容器组列表页按状态查询时,显示的状态与筛选的结果不一致的问题。 -- 查询 Secret 支持 fieldSelector 筛选。 +### Enhancements & Updates +- Use Helm action package instead of using Helm binary. +- Adjust the priority of bash and sh in the kubectl terminal. +- Fix the issue that ks-apiserver cannot start due to DiscoveryAPI exception. +- Fix the issue that the pod status is inconsistent with the filtered status when filtering by status on the pod list page. +- Support querying the secret list according to the secret type by supporting fieldSelector filtering. -有关 KubeSphere 3.4.0 的 Issue 和贡献者详细信息,请参阅 [GitHub](https://github.com/kubesphere/kubesphere/blob/master/CHANGELOG/CHANGELOG-3.4.0.md)。 \ No newline at end of file +For more information about issues and contributors of KubeSphere 3.4.0, see [GitHub](https://github.com/kubesphere/kubesphere/blob/master/CHANGELOG/CHANGELOG-3.4.0.md). \ No newline at end of file diff --git a/content/en/docs/v4.1/20-release-notes/release-v341.md b/content/en/docs/v4.1/20-release-notes/release-v341.md index c091fa6fb..b84c14be8 100644 --- a/content/en/docs/v4.1/20-release-notes/release-v341.md +++ b/content/en/docs/v4.1/20-release-notes/release-v341.md @@ -1,96 +1,96 @@ --- -title: "3.4.1 版本说明" -keywords: "Kubernetes, KubeSphere, 版本说明" -description: "KubeSphere 3.4.1 版本说明" -linkTitle: "3.4.1 版本说明" -weight: 46 +title: "Release Notes for 3.4.1" +keywords: "Kubernetes, KubeSphere, Release Notes" +description: "KubeSphere 3.4.1 Release Notes" +linkTitle: "Release Notes - 3.4.1" +weight: 18093 --- +## App Store -## 应用商店 +### Bug Fixes -### 问题修复 - -- 修复应用仓库页面的报错。 -- 修复应用审核报错。 -- Appdeploy schemaform 支持 select。 - -## 控制台 - -### 问题修复 - -- 修复编辑 CRD 资源后,状态丢失的问题。 -- 修复网络隔离页面的 IsolateInfo 和 RuleInfo 样式错误。 -- 修复某些页面的中文翻译错误。 -- 修复高版本 K8s 中,资源创建失败的问题。 -- 修复最近访问面板中名称被遮挡的问题。 -- 修复在列表页面点击定制内容按钮,内容显示不全。 -- 修复容器状态显示错误。 -- 修复在 PVC 页面设置卷容量时,数字显示有误。 -- 修复添加容器页面,使用 tag 搜索 image 失效。 -- 支持构建 ARM64 镜像。 +- Fix the error on the application repository page. +- Fix the error in the application approval process. +- Support "select" in Appdeploy schemaform. -## 多集群 +## Console -### 问题修复 +### Bug Fixes -- 修复多集群中,CD 关联集群显示错误。 -- 修复主机集群被错误地添加为其他集群的成员集群。 +- Fix the issue of losing status when modifying a CRD. +- Fix the incorrect style for IsolateInfo and RuleInfo in the Network Policy panel. +- Fix inaccurate Chinese translations on some pages. +- Fix the resource creation failure issue in higher versions of Kubernetes. +- Fix the issue in the dashboard where the names in Recently Access are obscured. +- Fix the issue on the list page where the Customize Columns button displays incomplete content. +- Fix the display error of pod status. +- Fix the issue on the PVC page where the capacity selection numbers are displayed incorrectly. +- Fix the issue when adding containers on the Create Deployment page, using tags to search for images is not working. +- Support building ARM64 images. + +## Multi Cluster + +### Bug Fixes + +- Fix the issue where CD-related clusters are displayed incorrectly in a multi-cluster environment. +- Fix the issue of mistakenly adding a host cluster as a member cluster of another cluster. -## 可观测性 +## Observability -### 问题修复 +### Bug Fixes -- 修复 CPU 和内存统计图表不显示。 -- 修复通知渠道页面,API 调用错误。 -- 修复日志接收器页面,显示空白。 -- 修复新建通知渠道页面,条件过滤值丢失。 +- Fix the issue that CPU and memory statistics charts are not displaying. +- Fix API call errors on the notification channel page. +- Fix the blank log receiver page. +- Fix the issue on the new notification channel page where conditional filtering values are missing. -## 认证和授权 -### 问题修复 +## Authentication & Authorization -- 修复 LDAP 登录失败。 +### Bug Fixes + +- Fix LDAP login failure. ## DevOps -### 问题修复 +### Bug Fixes -- 修复图形化编辑 Shell 不生效。 -- 当集群未就绪或未安装 DevOps 时,DevOps 项目不可用。 -- 修复 jenkins 参数传递不正确的问题。 -- 修复点击回放按钮时报错。 -- 修复 Pipeline 详情无法查看的问题。 -- 修复流水线日志过大引发的问题。 -- 修复 Jenkins 镜像漏洞。 -- 修复 DevOps 更新版本后无法正常使用的问题。 -- 修复流水线清理任务报错。 -- 修复设置 timeout 失败的问题。 -- 修复多分支流水线下载制品失败的问题。 -- 修复无法禁用已丢弃的历史 Pipelinerun。 -- 修复级联删除多个应用程序时,一些应用程序资源未被删除的问题。 +- Fix the issue where shell is not effective in graphical editing. +- When a cluster is not ready or does not install DevOps, DevOps projects are unavailable. +- Fix the incorrect parameter passing in Jenkins. +- Fix the issue that clicking the replay button pops up an error prompt. +- Fix the issue that the details of a pipeline cannot be viewed. +- Fix the run error due to the large DevOps pipeline logs. +- Fix Jenkins image vulnerability. +- Fix the issue that failed to upgrade DevOps to 3.4.0. +- Fix the error in the cleanup task. +- Fix the failure to set a timeout. +- Fix the bug with downloading multi-branch-pipeline artifacts. +- Fix the issue that disabling discarded history pipelineruns doesn't work. +- Fix the issue that some application resources are not deleted when cascade deleting multiple applications. + +### Enhancements & Updates + +- Display the git repo link on the Pipeline page. +- Improve the API documentation for DevOps. + +## User Experience + +### Bug Fixes + +- Fix the issue on the Statefuls page where the Pod Grace Period parameter is missing. +- Fix the issue where the cluster gateway is not displayed in cluster management. +- Fix the error when creating an application route. +- Add pagination for listing repository tags. -### 优化增强 +## Monitoring -- 在流水线页面显示 git 仓库地址。 -- 完善 API 文档。 +### Bug Fixes -## 用户体验 +- Fix the issue that the Monitoring Target field is displayed blank. -### 问题修复 - -- 修复 Statefuls 页面缺少 Pod Grace Period 参数。 -- 修复集群管理中,集群网关不显示。 -- 修复创建应用路由报错。 -- 在列出仓库标签时实现分页功能。 - -## 监控 - -### 问题修复 - -- 修复监控目标显示为空。 - -有关 KubeSphere 3.4.1 的 Issue 和贡献者详细信息,请参阅 [GitHub](https://github.com/kubesphere/kubesphere/blob/master/CHANGELOG/CHANGELOG-3.4.1.md)。 \ No newline at end of file +For more information about issues and contributors of KubeSphere 3.4.1, see [GitHub](https://github.com/kubesphere/kubesphere/blob/master/CHANGELOG/CHANGELOG-3.4.1.md). \ No newline at end of file diff --git a/content/en/docs/v4.1/20-release-notes/release-v411.md b/content/en/docs/v4.1/20-release-notes/release-v411.md index 60dbae03b..934ac2ada 100644 --- a/content/en/docs/v4.1/20-release-notes/release-v411.md +++ b/content/en/docs/v4.1/20-release-notes/release-v411.md @@ -1,8 +1,8 @@ --- -title: "4.1.1 版本说明" -keywords: "Kubernetes, KubeSphere, 版本说明" -description: "KubeSphere 4.1.1 版本说明" -linkTitle: "4.1.1 版本说明" +title: "Release Notes for 4.1.1" +keywords: "Kubernetes, KubeSphere, Release Notes" +description: "KubeSphere 4.1.1 Release Notes" +linkTitle: "Release Notes - 4.1.1" weight: 45 --- diff --git a/content/zh/docs/v4.1/08-workspace-management/01-web-console/_index.adoc b/content/zh/docs/v4.1/08-workspace-management/01-web-console/_index.adoc index c7edde85d..264cbcf66 100644 --- a/content/zh/docs/v4.1/08-workspace-management/01-web-console/_index.adoc +++ b/content/zh/docs/v4.1/08-workspace-management/01-web-console/_index.adoc @@ -2,7 +2,7 @@ title: "进入企业空间" linkTitle: "进入企业空间" keywords: "Kubernetes, KubeSphere, 企业空间管理, Web 控制台" -description: "介绍如何登录 KubeSphere Web 控制台并进入企业空间,以及修改用户的邮箱、语言和密码。" +description: "介绍如何登录 KubeSphere Web 控制台并进入企业空间。" layout: "second" weight: 01 --- diff --git a/content/zh/docs/v4.1/08-workspace-management/02-workspaces/01-create-a-workspace.adoc b/content/zh/docs/v4.1/08-workspace-management/02-workspaces/01-create-a-workspace.adoc index 3a9541a9f..a234137a7 100644 --- a/content/zh/docs/v4.1/08-workspace-management/02-workspaces/01-create-a-workspace.adoc +++ b/content/zh/docs/v4.1/08-workspace-management/02-workspaces/01-create-a-workspace.adoc @@ -18,7 +18,8 @@ include::../../../_custom/platformManagement/platformManagement-prer-requiredPer == 操作步骤 -. 以具有pass:a,q[{ks_permission}]权限的用户登录{ks_product_left} Web 控制台。 +include::../../../_custom/platformManagement/platformManagement-oper-logIn.adoc[] ++ . 点击**企业空间管理**。 . 在页面点击**创建**。 . 在**创建企业空间**页面,设置企业空间的基本信息,然后点击**下一步**。 diff --git a/content/zh/docs/v4.1/08-workspace-management/02-workspaces/02-view-a-workspace-list.adoc b/content/zh/docs/v4.1/08-workspace-management/02-workspaces/02-view-a-workspace-list.adoc index 80c7a2be7..cff18bf99 100644 --- a/content/zh/docs/v4.1/08-workspace-management/02-workspaces/02-view-a-workspace-list.adoc +++ b/content/zh/docs/v4.1/08-workspace-management/02-workspaces/02-view-a-workspace-list.adoc @@ -17,7 +17,8 @@ include::../../../_custom/platformManagement/platformManagement-prer-requiredPer == 操作步骤 -. 以具有pass:a,q[{ks_permission}]权限的用户登录{ks_product_left} Web 控制台。 +include::../../../_custom/platformManagement/platformManagement-oper-logIn.adoc[] ++ . 点击**企业空间管理**。 + -- diff --git a/content/zh/docs/v4.1/08-workspace-management/02-workspaces/03-edit-workspace-information.adoc b/content/zh/docs/v4.1/08-workspace-management/02-workspaces/03-edit-workspace-information.adoc index 2f17a8d8d..5808a7314 100644 --- a/content/zh/docs/v4.1/08-workspace-management/02-workspaces/03-edit-workspace-information.adoc +++ b/content/zh/docs/v4.1/08-workspace-management/02-workspaces/03-edit-workspace-information.adoc @@ -20,7 +20,8 @@ include::../../../_custom/platformManagement/platformManagement-prer-requiredPer == 操作步骤 -. 以具有pass:a,q[{ks_permission}]权限的用户登录{ks_product_left} Web 控制台。 +include::../../../_custom/platformManagement/platformManagement-oper-logIn.adoc[] ++ . 点击**企业空间管理**。 . 在需要操作的企业空间右侧点击image:/images/ks-qkcp/zh/icons/more.svg[more,18,18],然后在下拉列表中选择**编辑信息**。 . 在**编辑信息**对话框设置企业空间的别名和描述,然后点击**确定**。 diff --git a/content/zh/docs/v4.1/08-workspace-management/02-workspaces/04-delete-workspaces.adoc b/content/zh/docs/v4.1/08-workspace-management/02-workspaces/04-delete-workspaces.adoc index e0ffeaf30..27a3c3812 100644 --- a/content/zh/docs/v4.1/08-workspace-management/02-workspaces/04-delete-workspaces.adoc +++ b/content/zh/docs/v4.1/08-workspace-management/02-workspaces/04-delete-workspaces.adoc @@ -29,16 +29,19 @@ include::../../../_custom/platformManagement/platformManagement-prer-requiredPer == 删除单个企业空间 -. 以具有pass:a,q[{ks_permission}]权限的用户登录{ks_product_left} Web 控制台。 +include::../../../_custom/platformManagement/platformManagement-oper-logIn.adoc[] ++ . 点击**企业空间管理**。 . 在需要操作的企业空间右侧点击image:/images/ks-qkcp/zh/icons/more.svg[more,18,18],然后在下拉列表中选择**删除**。 . 在**删除企业空间**对话框,输入企业空间的名称,然后点击**确定**。 == 批量删除企业空间 -. 以具有pass:a,q[{ks_permission}]权限的用户登录{ks_product_left} Web 控制台。 + +include::../../../_custom/platformManagement/platformManagement-oper-logIn.adoc[] ++ . 点击**企业空间管理**。 -. 选择需要删除的企业空间左侧的复选框,然后在项目列表上方点击**删除**。 +. 选择需要删除的企业空间左侧的复选框,然后在企业空间列表上方点击**删除**。 . 在**批量删除企业空间**对话框,输入企业空间的名称,然后点击**确定**。 + [.admon.note,cols="a"] diff --git a/data/en/footer.yaml b/data/en/footer.yaml index af6545941..e3acea733 100644 --- a/data/en/footer.yaml +++ b/data/en/footer.yaml @@ -34,11 +34,11 @@ footer: - title: KubeSphere Docs list: - content: Introduction - link: '../../../docs/v3.4/introduction/what-is-kubesphere/' + link: '../../../docs/v4.1/01-intro/01-introduction.adoc' - content: Installation - link: '../../../docs/v3.4/quick-start/all-in-one-on-linux/' + link: '../../../docs/v4.1/02-quickstart/01-install-kubesphere.adoc' - content: Tutorial - link: '../../../docs/v3.4/quick-start/create-workspace-and-project/' + link: '../../../docs/v4.1/02-quickstart/create-workspace-and-project/' - content: API Documentation link: '../../../docs/v3.4/reference/api-docs/'