diff --git a/content/en/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management.md b/content/en/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management.md index 5a0daf371..4ea78a9e6 100644 --- a/content/en/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management.md +++ b/content/en/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management.md @@ -31,35 +31,35 @@ In **Project Roles**, there are three available built-in roles as shown below. B ## Create a DevOps Project Role -1. Log in to the console as `devops-admin` and select a DevOps project (for example, `demo-devops`) under **DevOps Projects** list. +1. Log in to the console as `devops-admin` and select a DevOps project (for example, `demo-devops`) on the **DevOps Projects** page. {{< notice note >}} - The account `devops-admin` is used as an example. As long as the account you are using is granted a role including the authorization of **Project Members View**, **Project Roles Management** and **Project Roles View** in **Access Control** at DevOps project level, it can create a DevOps project role. + The account `devops-admin` is used as an example. As long as the account you are using is granted a role including the permissions of **Project Member Viewing**, **Project Role Management** and **Project Role Viewing** in **Access Control** at DevOps project level, it can create a DevOps project role. {{}} -2. Go to **Project Roles** in **Project Management**, click **Create** and set a **Role Identifier**. In this example, a role named `pipeline-creator` will be created. Click **Edit Authorization** to continue. +2. Go to **Project Roles** in **Project Management**, click **Create** and set a **Name**. In this example, a role named `pipeline-creator` will be created. Click **Edit Permissions** to continue. ![devops_role_step1](/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_step1.png) -3. In **Pipelines Management**, select the authorization that you want this role to contain. For example, **Pipelines Management** and **Pipelines View** are selected for this role. Click **OK** to finish. +3. In **Pipeline Management**, select the permissions that you want this role to contain. For example, **Pipeline Management** and **Pipeline Viewing** are selected for this role. Click **OK** to finish. ![devops_role_step2](/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_step2.png) {{< notice note >}} - **Depend on** means the major authorization (the one listed after **Depend on**) needs to be selected first so that the affiliated authorization can be assigned. + **Depends on** means the major permission (the one listed after **Depends on**) needs to be selected first so that the affiliated permission can be assigned. {{}} -4. Newly-created roles will be listed in **Project Roles**. You can click the three dots on the right to edit it. +4. Newly created roles will be listed in **Project Roles**. You can click on the right to edit it. ![devops_role_list](/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_list.png) {{< notice note >}} - The role of `pipeline-creator` is only granted **Pipelines Management** and **Pipelines View**, which may not satisfy your need. This example is only for demonstration purpose. You can create customized roles based on your needs. + The role of `pipeline-creator` is only granted **Pipeline Management** and **Pipeline Viewing**, which may not satisfy your need. This example is only for demonstration purpose. You can create customized roles based on your needs. {{}} @@ -67,7 +67,7 @@ In **Project Roles**, there are three available built-in roles as shown below. B 1. In **Project Management**, select **Project Members** and click **Invite Member**. -2. Invite a user to the DevOps project. Grant the role of `pipeline-creator` to the user. +2. Click to invite an account to the DevOps project. Grant the role of `pipeline-creator` to the account. ![devops_invite_member](/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_invite_member.png) diff --git a/content/zh/blogs/litmus-kubesphere.md b/content/zh/blogs/litmus-kubesphere.md index f353566b5..37437d76b 100644 --- a/content/zh/blogs/litmus-kubesphere.md +++ b/content/zh/blogs/litmus-kubesphere.md @@ -2,7 +2,7 @@ title: 'KubeSphere 部署 Litmus 至 Kubernetes 开启混沌实验' tag: 'Litmus,KubeSphere' keywords: 'Litmus,LitmusChaos,Kubernetes,Helm,KubeSphere' -description: Litmus 是一种开源的云原生混沌工程工具集,专注于 Kubernetes 集群进行模拟故障测试,以帮助开发者和 SRE 发现集群及程序中的缺陷,从而提高系统的健壮性。本文介绍了 Litmus 的架构以及在 KubeSphere 上的部署方法,通过一系列混沌实验来验证整个基础设施和服务抵抗故障的能力。' +description: 'Litmus 是一种开源的云原生混沌工程工具集,专注于 Kubernetes 集群进行模拟故障测试,以帮助开发者和 SRE 发现集群及程序中的缺陷,从而提高系统的健壮性。本文介绍了 Litmus 的架构以及在 KubeSphere 上的部署方法,通过一系列混沌实验来验证整个基础设施和服务抵抗故障的能力。' createTime: '2021-06-09' author: '杨传胜' snapshot: 'https://pek3b.qingstor.com/kubesphere-community/images/20210609224203.png' diff --git a/content/zh/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management.md b/content/zh/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management.md index e974dcaf7..1408afe41 100644 --- a/content/zh/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management.md +++ b/content/zh/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management.md @@ -31,7 +31,7 @@ weight: 11130 ## 创建 DevOps 工程角色 -1. 以 `devops-admin` 身份登录控制台,然后在 **DevOps 工程**列表下选择一个 DevOps 工程(例如 `demo-devops`)。 +1. 以 `devops-admin` 身份登录控制台,然后前往 **DevOps 工程**页面选择一个 DevOps 工程(例如 `demo-devops`)。 {{< notice note >}} @@ -41,21 +41,21 @@ weight: 11130 2. 转到**工程管理**中的**工程角色**,点击**创建**并设置**角色标识符**。在本示例中,将创建一个名为 `pipeline-creator` 的角色。点击**编辑权限**继续。 - ![创建角色](/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step1.PNG) + ![创建角色](/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step_1.png) 3. 在**流水线管理**中,选择您希望授予该角色的权限。例如,为此角色选择了**流水线管理**和**流水线查看**。点击**确定**完成操作。 - ![分配角色](/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step2.PNG) + ![分配角色](/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step_2.png) {{< notice note >}} - **依赖于**表示首先需要选择主要授权(**依赖于**之后列出的),以便可以分配关联授权。 + **依赖于**表示首先需要选择主要权限(**依赖于**之后列出的),以便可以分配关联权限。 {{}} -4. 新创建的角色将列在**工程角色**中。您可以点击右侧的三个点对其进行编辑。 +4. 新创建的角色将列在**工程角色**中。您可以点击右侧的 对其进行编辑。 - ![角色列表](/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-list.PNG) + ![角色列表](/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-list_3.png) {{< notice note >}} @@ -67,9 +67,9 @@ weight: 11130 1. 在**工程管理**中选择**工程成员**,然后点击**邀请成员**。 -2. 邀请用户加入此 DevOps 工程,并向此用户授予 `pipeline-creator` 角色。 +2. 点击 邀请帐户加入此 DevOps 工程,并向此帐户授予 `pipeline-creator` 角色。 - ![邀请成员](/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-invite-member.PNG) + ![邀请成员](/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-invite-member_4.png) {{< notice note >}} @@ -81,5 +81,5 @@ weight: 11130 4. 您还可以通过编辑现有成员来更改其角色或将其从 DevOps 工程中删除。 - ![编辑成员](/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-user-edit.PNG) + ![编辑成员](/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-user-edit_5.png) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index f7ac5c2b9..a48f96283 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -11,7 +11,7 @@ {{ if eq .Site.Language.Lang "en"}}
- 🚀 KubeSphere 3.1.0 is now general available!It extends the Kubernetes from the multi-cloud to the edge. Read the Release Notes for 3.1.0 → + 🚀 KubeSphere 3.1.0 is now generally available as it extends Kubernetes from the cloud to the edge. Read the Release Notes for 3.1.0 → close
diff --git a/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_invite_member.png b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_invite_member.png index ad735cb67..016dc0e39 100644 Binary files a/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_invite_member.png and b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_invite_member.png differ diff --git a/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_list.png b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_list.png index 0993c2bbd..1516bdd2d 100644 Binary files a/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_list.png and b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_list.png differ diff --git a/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_step1.png b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_step1.png index 060fc051e..30d4ce162 100644 Binary files a/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_step1.png and b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_step1.png differ diff --git a/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_step2.png b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_step2.png index 53f9ee2d4..e9f817e16 100644 Binary files a/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_step2.png and b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_role_step2.png differ diff --git a/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_user_edit.png b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_user_edit.png index e06107485..bb4392673 100644 Binary files a/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_user_edit.png and b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops_user_edit.png differ diff --git a/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/plus-button.png b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/plus-button.png new file mode 100644 index 000000000..9a0cd2fa6 Binary files /dev/null and b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/plus-button.png differ diff --git a/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/three-dots.png b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/three-dots.png new file mode 100644 index 000000000..37c20ebd2 Binary files /dev/null and b/static/images/docs/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/three-dots.png differ diff --git a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-invite-member.PNG b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-invite-member.PNG deleted file mode 100644 index 6fad9ef88..000000000 Binary files a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-invite-member.PNG and /dev/null differ diff --git a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-invite-member_4.png b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-invite-member_4.png new file mode 100644 index 000000000..e7c34aa2e Binary files /dev/null and b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-invite-member_4.png differ diff --git a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-list.PNG b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-list.PNG deleted file mode 100644 index 5a6b35391..000000000 Binary files a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-list.PNG and /dev/null differ diff --git a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-list_3.png b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-list_3.png new file mode 100644 index 000000000..f20613024 Binary files /dev/null and b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-list_3.png differ diff --git a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step1.PNG b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step1.PNG deleted file mode 100644 index 5261447e9..000000000 Binary files a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step1.PNG and /dev/null differ diff --git a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step2.PNG b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step2.PNG deleted file mode 100644 index c8a87d309..000000000 Binary files a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step2.PNG and /dev/null differ diff --git a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step_1.png b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step_1.png new file mode 100644 index 000000000..cd17b3cb6 Binary files /dev/null and b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step_1.png differ diff --git a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step_2.png b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step_2.png new file mode 100644 index 000000000..b6e8b703a Binary files /dev/null and b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-role-step_2.png differ diff --git a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-user-edit.PNG b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-user-edit.PNG deleted file mode 100644 index b7acf1147..000000000 Binary files a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-user-edit.PNG and /dev/null differ diff --git a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-user-edit_5.png b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-user-edit_5.png new file mode 100644 index 000000000..97e8ed0e2 Binary files /dev/null and b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/devops-user-edit_5.png differ diff --git a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/plus-button.png b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/plus-button.png new file mode 100644 index 000000000..9a0cd2fa6 Binary files /dev/null and b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/plus-button.png differ diff --git a/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/three-dots.png b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/three-dots.png new file mode 100644 index 000000000..37c20ebd2 Binary files /dev/null and b/static/images/docs/zh-cn/devops-user-guide/understand-and-manage-devops-projects/role-and-member-management/three-dots.png differ