Skip to content

Commit

Permalink
Merge pull request #113 from sophongo/fixnav
Browse files Browse the repository at this point in the history
fix en text in nav and terms
  • Loading branch information
windsonsea authored Nov 27, 2024
2 parents e45ae81 + d7e865f commit cfbcd20
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 24 deletions.
2 changes: 1 addition & 1 deletion docs/en/end-user/ghippo/workspace/folders.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ hide:

# Create/Delete Folders

Folders have the capability to map permissions, allowing users/user groups to have their permissions in the folder mapped to its sub-folders, workspaces, and resources.
Folders have the capability to map permissions, allowing users/groups to have their permissions in the folder mapped to its sub-folders, workspaces, and resources.

Follow the steps below to create a folder:

Expand Down
4 changes: 2 additions & 2 deletions docs/en/end-user/ghippo/workspace/quota.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Cluster resources in both shared resources and resource groups are derived from

1. Binding Resources

Users/User groups in the workspace will have full management and usage permissions for the cluster.
Users/Groups in the workspace will have full management and usage permissions for the cluster.
Workspace Admin will be mapped as Cluster Admin.
Workspace Admin can access the [Container Management module](../../kpanda/permissions/permission-brief.md)
to manage the cluster.
Expand All @@ -41,7 +41,7 @@ Cluster resources in both shared resources and resource groups are derived from

2. Adding Shared Resources

Users/User groups in the workspace will have usage permissions for the cluster resources.
Users/Groups in the workspace will have usage permissions for the cluster resources.

![Shared Resources](https://docs.daocloud.io/daocloud-docs-images/docs/en/docs/ghippo/images/quota02.png)

Expand Down
2 changes: 1 addition & 1 deletion docs/en/end-user/ghippo/workspace/workspace.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ hide:
A workspace is a resource category that represents a hierarchical relationship of resources.
A workspace can contain resources such as clusters, namespaces, and registries. Typically,
each workspace corresponds to a project and different resources can be allocated, and
different users and user groups can be assigned to each workspace.
different users and groups can be assigned to each workspace.

Follow the steps below to create a workspace:

Expand Down
2 changes: 1 addition & 1 deletion docs/en/end-user/ghippo/workspace/ws-folder.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Workspace and Folder involves two concepts: workspaces and folders.
## Workspaces

Workspaces allow the management of resources through __Authorization__ , __Resource Group__ , and __Shared Resource__ ,
enabling users (and user groups) to share resources within the workspace.
enabling users (and groups) to share resources within the workspace.

![Workspaces](https://docs.daocloud.io/daocloud-docs-images/docs/en/docs/ghippo/images/wsfd01.png)

Expand Down
6 changes: 3 additions & 3 deletions docs/en/end-user/kpanda/permissions/permission-brief.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ date: 2024-05-13

# Container Management Permissions

Container management permissions are based on a multi-dimensional permission management system created by global permission management and Kubernetes RBAC permission management. It supports cluster-level and namespace-level permission control, helping users to conveniently and flexibly set different operation permissions for IAM users and user groups (collections of users) under a tenant.
Container management permissions are based on a multi-dimensional permission management system created by global permission management and Kubernetes RBAC permission management. It supports cluster-level and namespace-level permission control, helping users to conveniently and flexibly set different operation permissions for IAM users and groups (collections of users) under a tenant.

## Cluster Permissions

Cluster permissions are authorized based on Kubernetes RBAC's ClusterRoleBinding, allowing users/user groups to have cluster-related permissions. The current default cluster role is __Cluster Admin__ (does not have the permission to create or delete clusters).
Cluster permissions are authorized based on Kubernetes RBAC's ClusterRoleBinding, allowing users/groups to have cluster-related permissions. The current default cluster role is __Cluster Admin__ (does not have the permission to create or delete clusters).

### __Cluster Admin__

Expand Down Expand Up @@ -48,7 +48,7 @@ rules:
## Namespace Permissions
Namespace permissions are authorized based on Kubernetes RBAC capabilities, allowing different users/user groups to have different operation permissions on resources under a namespace (including Kubernetes API permissions). For details, refer to: [Kubernetes RBAC](https://kubernetes.io/docs/reference/access-authn-authz/rbac/). Currently, the default roles for container management are: NS Admin, NS Editor, NS Viewer.
Namespace permissions are authorized based on Kubernetes RBAC capabilities, allowing different users/groups to have different operation permissions on resources under a namespace (including Kubernetes API permissions). For details, refer to: [Kubernetes RBAC](https://kubernetes.io/docs/reference/access-authn-authz/rbac/). Currently, the default roles for container management are: NS Admin, NS Editor, NS Viewer.
### __NS Admin__
Expand Down
2 changes: 0 additions & 2 deletions docs/en/end-user/register/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ New users need to register when using the AI platform for the first time.

3. The system will prompt that an email has been sent to your inbox.

![to register](../../images/regis03.png)

4. Log into your email, find the email, and click the link.

![email](../../images/regis04.png)
Expand Down
28 changes: 14 additions & 14 deletions navigation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ plugins:
管理 Helm 应用: Manage Helm Apps
管理 Helm 仓库: Manage Helm Repo
Operator 应用: Operator Apps
容器网络: Container Networking
容器网络: Container Network
创建服务: Create Services
创建路由: Create Ingress
网络策略: Network Policies
Expand All @@ -230,8 +230,8 @@ plugins:
创建命名空间: Create Namespace
命名空间独享节点: Nodes Exclusive to a Namespace
容器组安全策略: Pod Security Policies
集群运维: Cluster Operations
最近操作: Recent Operations
集群运维: Operations and Maintenance
最近操作: Latest Operations
集群设置: Cluster Settings
集群巡检: Cluster Inspection
介绍: Introduction
Expand All @@ -250,7 +250,7 @@ plugins:
权限管理: Permissions
权限体系介绍: Introduction
集群和命名空间授权: Authorize Cluster and Namespace
增加容器管理内置权限点: Add Built-in Permission
增加容器管理内置权限点: Add Built-in Permissions
算法开发: AI Lab
创建 AI 工作负载: Create AI Workload
使用 Notebook: Use Notebook
Expand Down Expand Up @@ -306,7 +306,7 @@ plugins:
什么是 AI 算力平台: What is AI Platform
安装: Installation
安装云主机: Install VM
安装依赖及前提条件: Install Dependencies and Prerequisites
安装依赖及前提条件: Install Dependencies
离线升级: Offline Upgrade
安装 virtnest-agent: Install virtnest-agent
快速入门: Quick Start
Expand All @@ -332,8 +332,8 @@ plugins:
通过模板创建云主机: Create VM with Template
云主机镜像: VM Images
最佳实践: Best Practices
从 VMware 导入传统 Linux 云主机: Import Traditional Linux VM from VMware
从 VMware 导入传统 Windows 云主机: Import Traditional Windows VM from VMware
从 VMware 导入传统 Linux 云主机: Import Legacy Linux VM from VMware
从 VMware 导入传统 Windows 云主机: Import Legacy Windows VM from VMware
创建 Windows 云主机: Create Windows VM
集群管理: Manage Clusters
创建集群: Create Cluster
Expand All @@ -345,11 +345,11 @@ plugins:
添加工作节点: Add Worker Node
移除 GPU 工作节点: Remove GPU Worker Node
弹性伸缩: Autoscaling
安装 metrics-server 插件: Install Metrics Server Plugin
安装 kubernetes-cronhpa-controller: Install Kubernetes CronHPA Controller
安装 metrics-server 插件: Install metrics-server
安装 kubernetes-cronhpa-controller: Install kubernetes-cronhpa-controller
安装 VPA 插件: Install VPA Plugin
基于内置指标创建 HPA: Create HPA Based on Built-in Metrics
基于自定义指标创建 HPA: Create HPA Based on Custom Metrics
基于内置指标创建 HPA: Create HPA from Built-in Metrics
基于自定义指标创建 HPA: Create HPA from Custom Metrics
创建 VPA 策略: Create VPA Policy
HPA和CronHPA兼容规则: HPA and CronHPA Compatibility Rules
其他方案: Other Solutions
Expand Down Expand Up @@ -403,10 +403,10 @@ plugins:
跨集群备份恢复MySQL: Cross-cluster Backup and Recovery for MySQL
工作集群相关实践: Practices Related to Worker Clusters
加固自建工作集群: Harden Self-built Worker Cluster
离线部署/升级工作集群: Offline Deployment/Upgrade of Worker Cluster
离线部署/升级工作集群: Offline Deployment/Upgrade Worker Cluster
工作集群添加异构节点: Add Heterogeneous Nodes to Worker Cluster
工作集群的控制节点扩容: Expand Control Nodes of Worker Cluster
替换工作集群首个控制节点: Replace First Control Node of Worker Cluster
工作集群的控制节点扩容: Expand Controller Nodes
替换工作集群首个控制节点: Replace First Controller Node
全局集群工作节点扩容: Global Cluster Worker Node Expansion
CentOS上创建Ubuntu工作集群: Create Ubuntu Worker Cluster on CentOS
CentOS上创建Red Hat工作集群: Create Red Hat Worker Cluster on CentOS
Expand Down

0 comments on commit cfbcd20

Please sign in to comment.