diff --git a/dev-resources/file-mappings/rancher_v2.6_mappings.csv b/dev-resources/file-mappings/rancher_v2.6_mappings.csv index 98cd23e0305..02b0da3577b 100644 --- a/dev-resources/file-mappings/rancher_v2.6_mappings.csv +++ b/dev-resources/file-mappings/rancher_v2.6_mappings.csv @@ -186,7 +186,6 @@ how-to-guides/advanced-user-guides/authentication-permissions-and-global-configu how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates, admin-settings/rke-templates/applying-templates how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure, admin-settings/rke-templates/rke-templates-and-hardware how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases, admin-settings/rke-templates/example-scenarios -how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates, admin-settings/cluster-templates how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies, admin-settings/pod-security-policies how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry, admin-settings/config-private-registry how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding, admin-settings/branding @@ -213,6 +212,7 @@ how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces, clus how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration, cluster-admin/cloning-clusters how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates, cluster-admin/certificate-rotation how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key, cluster-admin/encryption-key-rotation +how-to-guides/advanced-user-guides/manage-clusters/manage-cluster-templates, cluster-admin/cluster-templates how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools, cluster-admin/nodes how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes, cluster-admin/cleaning-cluster-nodes how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy, cluster-admin/pod-security-policy diff --git a/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md b/docs/how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md similarity index 100% rename from docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md rename to docs/how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md diff --git a/docs/pages-for-subheaders/about-rke1-templates.md b/docs/pages-for-subheaders/about-rke1-templates.md index 15cdbb24543..44e73fd794a 100644 --- a/docs/pages-for-subheaders/about-rke1-templates.md +++ b/docs/pages-for-subheaders/about-rke1-templates.md @@ -101,7 +101,7 @@ You can [save the configuration of an existing cluster as an RKE template.](../h RKE templates are designed to standardize Kubernetes and Rancher settings. If you want to standardize your infrastructure as well, one option is to use RKE templates [in conjunction with other tools](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md). -Another option is to use [cluster templates,](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md) which include node pool configuration options, but don't provide configuration enforcement. +Another option is to use [cluster templates,](../how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md) which include node pool configuration options, but don't provide configuration enforcement. ## YAML Customization diff --git a/docs/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md b/docs/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md index 80772e5f5c7..f96d4fed8c2 100644 --- a/docs/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md +++ b/docs/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md @@ -133,7 +133,7 @@ Rancher v2.6 introduces provisioning for [RKE2](https://docs.rke2.io/) clusters :::note -For RKE2 cluster templates, please refer to [this page](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md#rke2-cluster-template) for additional information. +For RKE2 cluster templates, please refer to [this page](../how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md#rke2-cluster-template) for additional information. ::: diff --git a/docusaurus.config.js b/docusaurus.config.js index f795f064aab..8e7817f6cd1 100644 --- a/docusaurus.config.js +++ b/docusaurus.config.js @@ -335,10 +335,6 @@ module.exports = { to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases', from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases' }, - { - to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates', - from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates' - }, { to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies', from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies' @@ -415,6 +411,10 @@ module.exports = { to: '/how-to-guides/new-user-guides/manage-clusters/rotate-encryption-key', from: '/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key' }, + { + to: '/how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates', + from: '/how-to-guides/advanced-user-guides/manage-clusters/manage-cluster-templates' + }, { to: '/how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools', from: '/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools' diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md similarity index 100% rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-rke1-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-rke1-templates.md index c067136a114..3f4012ac5dd 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-rke1-templates.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-rke1-templates.md @@ -101,7 +101,7 @@ RKE 模板更新通过修订系统处理。如果要更改或更新模板，请 RKE 模板的目的是标准化 Kubernetes 和 Rancher 设置。如果你还想标准化你的基础设施，一个选择是将 RKE 模板与[其他工具](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md)一起使用。 -另一种选择是使用包含节点池配置选项，但不强制执行配置的[集群模板](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md)。 +另一种选择是使用包含节点池配置选项，但不强制执行配置的[集群模板](../how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md)。 ## YAML 定制 diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md index a71deb70574..9e990b85cab 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md @@ -133,7 +133,7 @@ Rancher 2.6 支持直接使用 Rancher UI 配置 [RKE2](https://docs.rke2.io/) :::note -对于 RKE2 集群模板，请参阅[此页面](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md#rke2-集群模板)了解更多信息。 +对于 RKE2 集群模板，请参阅[此页面](../how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md#rke2-集群模板)了解更多信息。 ::: diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md similarity index 100% rename from i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md rename to i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/about-rke1-templates.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/about-rke1-templates.md index c067136a114..3f4012ac5dd 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/about-rke1-templates.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/about-rke1-templates.md @@ -101,7 +101,7 @@ RKE 模板更新通过修订系统处理。如果要更改或更新模板，请 RKE 模板的目的是标准化 Kubernetes 和 Rancher 设置。如果你还想标准化你的基础设施，一个选择是将 RKE 模板与[其他工具](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md)一起使用。 -另一种选择是使用包含节点池配置选项，但不强制执行配置的[集群模板](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md)。 +另一种选择是使用包含节点池配置选项，但不强制执行配置的[集群模板](../how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md)。 ## YAML 定制 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md index a71deb70574..9e990b85cab 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md @@ -133,7 +133,7 @@ Rancher 2.6 支持直接使用 Rancher UI 配置 [RKE2](https://docs.rke2.io/) :::note -对于 RKE2 集群模板，请参阅[此页面](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md#rke2-集群模板)了解更多信息。 +对于 RKE2 集群模板，请参阅[此页面](../how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md#rke2-集群模板)了解更多信息。 ::: diff --git a/sidebars.js b/sidebars.js index cfec4b666b1..fbe1ae8419a 100644 --- a/sidebars.js +++ b/sidebars.js @@ -313,8 +313,6 @@ const sidebars = { "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases", ] }, - "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates", - "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies", "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry", @@ -389,6 +387,8 @@ const sidebars = { "how-to-guides/new-user-guides/manage-clusters/rotate-encryption-key", + "how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates", + "how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools", "how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes", diff --git a/versioned_docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md b/versioned_docs/version-2.6/how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md similarity index 100% rename from versioned_docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md rename to versioned_docs/version-2.6/how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md diff --git a/versioned_docs/version-2.6/pages-for-subheaders/about-rke1-templates.md b/versioned_docs/version-2.6/pages-for-subheaders/about-rke1-templates.md index 15cdbb24543..44e73fd794a 100644 --- a/versioned_docs/version-2.6/pages-for-subheaders/about-rke1-templates.md +++ b/versioned_docs/version-2.6/pages-for-subheaders/about-rke1-templates.md @@ -101,7 +101,7 @@ You can [save the configuration of an existing cluster as an RKE template.](../h RKE templates are designed to standardize Kubernetes and Rancher settings. If you want to standardize your infrastructure as well, one option is to use RKE templates [in conjunction with other tools](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md). -Another option is to use [cluster templates,](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md) which include node pool configuration options, but don't provide configuration enforcement. +Another option is to use [cluster templates,](../how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md) which include node pool configuration options, but don't provide configuration enforcement. ## YAML Customization diff --git a/versioned_docs/version-2.6/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md b/versioned_docs/version-2.6/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md index 80772e5f5c7..f96d4fed8c2 100644 --- a/versioned_docs/version-2.6/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md +++ b/versioned_docs/version-2.6/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md @@ -133,7 +133,7 @@ Rancher v2.6 introduces provisioning for [RKE2](https://docs.rke2.io/) clusters :::note -For RKE2 cluster templates, please refer to [this page](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md#rke2-cluster-template) for additional information. +For RKE2 cluster templates, please refer to [this page](../how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates.md#rke2-cluster-template) for additional information. ::: diff --git a/versioned_sidebars/version-2.6-sidebars.json b/versioned_sidebars/version-2.6-sidebars.json index b2b0b8c6f4c..7f8963f74eb 100644 --- a/versioned_sidebars/version-2.6-sidebars.json +++ b/versioned_sidebars/version-2.6-sidebars.json @@ -292,7 +292,6 @@ "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases" ] }, - "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates", "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies", "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry", "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding" @@ -362,6 +361,7 @@ "how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces", "how-to-guides/new-user-guides/manage-clusters/rotate-certificates", "how-to-guides/new-user-guides/manage-clusters/rotate-encryption-key", + "how-to-guides/new-user-guides/manage-clusters/manage-cluster-templates", "how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools", "how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes", "how-to-guides/new-user-guides/manage-clusters/add-a-pod-security-policy",