From 07b4f19c74f55bd12dc0b7e8bff86675eec5142f Mon Sep 17 00:00:00 2001 From: vickyhella Date: Thu, 8 Dec 2022 15:40:59 +0800 Subject: [PATCH 1/2] Update Chinese docs --- .../port-requirements.md | 5 +++++ .../install-rancher-ha.md | 4 ++-- .../resources/update-rancher-certificate.md | 8 ++++---- .../create-persistent-grafana-dashboard.md | 2 +- .../custom-branding.md | 2 +- .../cluster-and-project-roles.md | 2 +- .../current/integrations-in-rancher/harvester.md | 11 +++++++++++ .../pages-for-subheaders/about-the-api.md | 2 +- .../monitoring-v2-configuration/receivers.md | 2 +- .../monitoring-v2-configuration/routes.md | 2 +- .../current/v2.7.md | 16 ++++++++++++++++ .../install-rancher-ha.md | 4 ++-- .../create-persistent-grafana-dashboard.md | 2 +- .../custom-branding.md | 2 +- .../cluster-and-project-roles.md | 2 +- .../pages-for-subheaders/about-the-api.md | 2 +- .../monitoring-v2-configuration/receivers.md | 2 +- .../monitoring-v2-configuration/routes.md | 2 +- 18 files changed, 52 insertions(+), 20 deletions(-) create mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/v2.7.md diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md index 9e09fc15834..b3827198086 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md @@ -192,6 +192,11 @@ RKE2 server 需要开放端口 6443 和 9345 才能供集群中的其他节点 ::: +### Harvester 集群的端口 + +有关 Harvester 端口要求的更多信息，请参阅[此处](../../../integrations-in-rancher/harvester.md#port-requirements)。 + + ### Rancher 使用节点池启动 Kubernetes 集群的端口
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md index 9dee02557c2..7d2c9eb9848 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md @@ -205,7 +205,7 @@ kubectl create namespace cattle-system | `` | 你的私有镜像仓库的 DNS 名称。 | ```plain - helm install rancher ./rancher-.tgz --output-dir . \ + helm install rancher ./rancher-.tgz \ --namespace cattle-system \ --set hostname= \ --set rancherImage=/rancher/rancher \ @@ -217,7 +217,7 @@ kubectl create namespace cattle-system 如果你使用的是私有 CA 签名的证书，请在 `--set ingress.tls.source=secret` 后加上 `--set privateCA=true`： ```plain - helm install rancher ./rancher-.tgz --output-dir . \ + helm install rancher ./rancher-.tgz \ --namespace cattle-system \ --set hostname= \ --set rancherImage=/rancher/rancher \ diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md index 60c99afb7b4..7697cd29286 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md @@ -78,7 +78,7 @@ ingress: privateCA: true ``` :::note 重要： -由于证书由私有 CA 签发，因此确保在 `values.yaml` 文件中设置了 [`privateCA: true`](../installation-references/helm-chart-options#common-options) 是非常重要的。 +由于证书由私有 CA 签发，因此确保在 `values.yaml` 文件中设置了 [`privateCA: true`](../installation-references/helm-chart-options.md#常用选项) 是非常重要的。 ::: 1. 使用 `values.yaml` 文件和当前 Chart 版本升级 Helm 应用程序实例。版本必须匹配以防止 Rancher 升级。 ```bash @@ -131,7 +131,7 @@ kubectl annotate clusters.management.cattle.io io.cattle.agent.forc curl -k -s -fL /v3/settings/cacerts | jq -r .value | sha256sum cacert.tmp | awk '{print $1}' ``` -为每个下游集群使用 Kubeconfig 更新两个 Agent 部署的环境变量。如果集群启用了 [ACE](../../../how-to-guides/new-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint)，你可以[调整 kubectl 上下文](../../../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig#authenticating-directly-with-a-downstream-cluster)，从而直接连接到下游集群。 +为每个下游集群使用 Kubeconfig 更新两个 Agent 部署的环境变量。如果集群启用了 [ACE](../../../how-to-guides/new-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint)，你可以[调整 kubectl 上下文](../../../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig#直接使用下游集群进行身份验证)，从而直接连接到下游集群。 ```bash kubectl edit -n cattle-system ds/cattle-node-agent @@ -150,7 +150,7 @@ kubectl edit -n cattle-system deployment/cattle-cluster-agent 1. 复制 `insecureCommand` 字段中的命令，使用此命令是因为未使用私有 CA。 2. 使用以下其中一种方法，使用 kubeconfig 为下游集群运行上一步中的 kubectl 命令： - 1. 如果集群启用了 [ACE](../../../how-to-guides/new-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint)，你可以[调整上下文](../../../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig#authenticating-directly-with-a-downstream-cluster)，从而直接连接到下游集群。 + 1. 如果集群启用了 [ACE](../../../how-to-guides/new-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint)，你可以[调整上下文](../../../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig#直接使用下游集群进行身份验证)，从而直接连接到下游集群。 1. 或者，SSH 到 control plane 节点： - RKE：使用[此处文档中的步骤](https://github.com/rancherlabs/support-tools/tree/master/how-to-retrieve-kubeconfig-from-custom-cluster)生成 kubeconfig - RKE2/K3s：使用安装时填充的 kubeconfig @@ -220,7 +220,7 @@ helm ls -n cattle-system ``` 1. 更新 `values.yaml` 文件中的当前 Helm 值： 1. 由于不再使用私有 CA，删除 `privateCA: true` 字段，或将其设置为 `false`。 - 1. 根据需要调整 `ingress.tls.source` 字段。有关更多信息，请参阅 [Chart 选项](../installation-references/helm-chart-options#common-options)。以下是一些示例： + 1. 根据需要调整 `ingress.tls.source` 字段。有关更多信息，请参阅 [Chart 选项](../installation-references/helm-chart-options#常用选项)。以下是一些示例： 1. 如果使用公共 CA，继续使用 `secret` 1. 如果使用 Let's Encrypt，将值更新为 `letsEncrypt` 1. 使用 `values.yaml` 文件更新 Rancher Chart 的 Helm 值，并使用当前 Chart 版本防止升级： diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md index 4adfeaaa1ab..e5a2deccf45 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md @@ -89,7 +89,7 @@ grafana.sidecar.dashboards.searchNamespace=ALL 请注意，Monitoring Chart 用于添加 Grafana 仪表板的 RBAC 角色仅能让用户将仪表板添加到定义在 `grafana.dashboards.namespace` 中的命名空间，默认为 `cattle-dashboards`。 - + :::note 先决条件： diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding.md index dbb52016779..d9ae33812bb 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding.md @@ -38,7 +38,7 @@ Rancher 2.6 开始支持自定义 Rancher 的品牌和导航链接。 ### 固定横幅 - + 在页眉、页脚或两者中显示自定义固定横幅。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md index be7f66fd506..dbdfa4be809 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md @@ -88,7 +88,7 @@ Rancher 支持将 _自定义集群角色_ 分配给普通用户，而不是典 要将角色分配给新的集群成员： - + 1. 点击 **☰ > 集群管理**。 1. 转到要将角色分配给成员的集群，然后单击 **Explore**。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/harvester.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/harvester.md index f71250fb0c7..d27555e3061 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/harvester.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/harvester.md @@ -32,6 +32,17 @@ Harvester 允许通过 Harvester UI 上传和显示 `.ISO` 镜像，但 Rancher 如需了解 Rancher 中主机驱动的更多详细信息，请单击[此处](../pages-for-subheaders/about-provisioning-drivers.md#主机驱动)。 +### 端口要求 + +可以在[此处](https://docs.harvesterhci.io/v1.1/install/requirements#networking)找到 Harvester 集群的端口要求。 + +此外，其他网络注意事项如下： + +- 请务必为 VM VLAN 网络启用物理交换机的 VLAN 中继端口。 +- 按照[此处](https://docs.harvesterhci.io/v1.1/networking/clusternetwork)的网络设置指南进行操作。 + +对于其他集群（例如 K3s 和 RKE1）的其他端口要求，请参阅[这些文档](https://docs.harvesterhci.io/v1.1/install/requirements/#guest-clusters)。 + ### 限制 --- diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-the-api.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-the-api.md index 055a0ce761e..db0ad233862 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-the-api.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-the-api.md @@ -14,7 +14,7 @@ API 有自己的用户界面，你可以从 Web 浏览器访问它。这是查 1. 在 **API 密钥**下，找到 **API 端点**字段并单击链接。该链接类似于 `https:///v3`，其中 `` 是 Rancher deployment 的完全限定域名。 - + 转到位于 `https:///v3` 的 URL 端点，其中 `` 是你的 Rancher deployment 的完全限定域名。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/receivers.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/receivers.md index 3c47e3cf6e5..ef27b89de42 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/receivers.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/receivers.md @@ -33,7 +33,7 @@ title: 接收器配置 1. 单击**创建**。 - + 1. 转到要创建接收器的集群。单击**监控**，然后单击**接收器**。 2. 输入接收器的名称。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/routes.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/routes.md index 9ce122dff60..2672bb7a9c6 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/routes.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/routes.md @@ -57,7 +57,7 @@ Alerting Drivers 为 Alertmanager 将告警代理到非原生接收器，例如 | 重复间隔 | 4h | 等待多长时间后，才重新发送已发送的告警。 | - + | 字段 | 默认 | 描述 | |-------|--------------|---------| diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/v2.7.md b/i18n/zh/docusaurus-plugin-content-docs/current/v2.7.md new file mode 100644 index 00000000000..36108500ded --- /dev/null +++ b/i18n/zh/docusaurus-plugin-content-docs/current/v2.7.md @@ -0,0 +1,16 @@ +--- +title: v2.7 +description: Dummy file used to redirect to the base url +--- + + + +import {Redirect} from '@docusaurus/router'; + +const Home = () => { +return ; +}; \ No newline at end of file diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md index 9dee02557c2..7d2c9eb9848 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md @@ -205,7 +205,7 @@ kubectl create namespace cattle-system | `` | 你的私有镜像仓库的 DNS 名称。 | ```plain - helm install rancher ./rancher-.tgz --output-dir . \ + helm install rancher ./rancher-.tgz \ --namespace cattle-system \ --set hostname= \ --set rancherImage=/rancher/rancher \ @@ -217,7 +217,7 @@ kubectl create namespace cattle-system 如果你使用的是私有 CA 签名的证书，请在 `--set ingress.tls.source=secret` 后加上 `--set privateCA=true`： ```plain - helm install rancher ./rancher-.tgz --output-dir . \ + helm install rancher ./rancher-.tgz \ --namespace cattle-system \ --set hostname= \ --set rancherImage=/rancher/rancher \ diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md index 4adfeaaa1ab..e5a2deccf45 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md @@ -89,7 +89,7 @@ grafana.sidecar.dashboards.searchNamespace=ALL 请注意，Monitoring Chart 用于添加 Grafana 仪表板的 RBAC 角色仅能让用户将仪表板添加到定义在 `grafana.dashboards.namespace` 中的命名空间，默认为 `cattle-dashboards`。 - + :::note 先决条件： diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding.md index dbb52016779..d9ae33812bb 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding.md @@ -38,7 +38,7 @@ Rancher 2.6 开始支持自定义 Rancher 的品牌和导航链接。 ### 固定横幅 - + 在页眉、页脚或两者中显示自定义固定横幅。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md index be7f66fd506..dbdfa4be809 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md @@ -88,7 +88,7 @@ Rancher 支持将 _自定义集群角色_ 分配给普通用户，而不是典 要将角色分配给新的集群成员： - + 1. 点击 **☰ > 集群管理**。 1. 转到要将角色分配给成员的集群，然后单击 **Explore**。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/about-the-api.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/about-the-api.md index 055a0ce761e..db0ad233862 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/about-the-api.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/about-the-api.md @@ -14,7 +14,7 @@ API 有自己的用户界面，你可以从 Web 浏览器访问它。这是查 1. 在 **API 密钥**下，找到 **API 端点**字段并单击链接。该链接类似于 `https:///v3`，其中 `` 是 Rancher deployment 的完全限定域名。 - + 转到位于 `https:///v3` 的 URL 端点，其中 `` 是你的 Rancher deployment 的完全限定域名。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/monitoring-v2-configuration/receivers.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/monitoring-v2-configuration/receivers.md index 3c47e3cf6e5..ef27b89de42 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/monitoring-v2-configuration/receivers.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/monitoring-v2-configuration/receivers.md @@ -33,7 +33,7 @@ title: 接收器配置 1. 单击**创建**。 - + 1. 转到要创建接收器的集群。单击**监控**，然后单击**接收器**。 2. 输入接收器的名称。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/monitoring-v2-configuration/routes.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/monitoring-v2-configuration/routes.md index 9ce122dff60..2672bb7a9c6 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/monitoring-v2-configuration/routes.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/monitoring-v2-configuration/routes.md @@ -57,7 +57,7 @@ Alerting Drivers 为 Alertmanager 将告警代理到非原生接收器，例如 | 重复间隔 | 4h | 等待多长时间后，才重新发送已发送的告警。 | - + | 字段 | 默认 | 描述 | |-------|--------------|---------| From 6c4da196feca659f9f19b9f69ed1d2419c856414 Mon Sep 17 00:00:00 2001 From: vickyhella Date: Thu, 8 Dec 2022 15:57:03 +0800 Subject: [PATCH 2/2] Redirect root/zh/v2.7 to root/zh --- i18n/zh/docusaurus-plugin-content-docs/current/v2.7.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/v2.7.md b/i18n/zh/docusaurus-plugin-content-docs/current/v2.7.md index 36108500ded..4e36ad8730b 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/v2.7.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/v2.7.md @@ -12,5 +12,5 @@ description: Dummy file used to redirect to the base url import {Redirect} from '@docusaurus/router'; const Home = () => { -return ; +return ; }; \ No newline at end of file