diff --git a/docs/backups/docker-installs/docker-installs.md b/docs/backups/docker-installs/docker-installs.md
index 162dec39a6b..cc211cee5e0 100644
--- a/docs/backups/docker-installs/docker-installs.md
+++ b/docs/backups/docker-installs/docker-installs.md
@@ -1,7 +1,5 @@
---
title: Backup and Restore for Rancher Installed with Docker
-shortTitle: Docker Installs
-weight: 10
---
- [Backups](../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md)
diff --git a/docs/cluster-provisioning/rke-clusters/options/options.md b/docs/cluster-provisioning/rke-clusters/options/options.md
index aeaf493d3bb..4cb7e51109e 100644
--- a/docs/cluster-provisioning/rke-clusters/options/options.md
+++ b/docs/cluster-provisioning/rke-clusters/options/options.md
@@ -1,6 +1,5 @@
---
title: RKE Cluster Configuration
-weight: 2300
---
This page has moved [here.](../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
diff --git a/docs/contribute-to-rancher.md b/docs/contribute-to-rancher.md
index 8610c3d88b1..2d5e97ab3e6 100644
--- a/docs/contribute-to-rancher.md
+++ b/docs/contribute-to-rancher.md
@@ -1,6 +1,5 @@
---
title: Contributing to Rancher
-weight: 700
---
This section explains the repositories used for Rancher, how to build the repositories, and what information to include when you file an issue.
@@ -88,7 +87,7 @@ Please remove any sensitive data as it will be publicly viewable.
- Kubernetes install using `kubectl`
:::note
-
+
Make sure you configured the correct kubeconfig (for example, `export KUBECONFIG=$PWD/kube_config_cluster.yml` if Rancher is installed on a Kubernetes cluster) or are using the embedded kubectl via the UI.
:::
@@ -109,7 +108,7 @@ Please remove any sensitive data as it will be publicly viewable.
- Kubernetes Install with RKE Add-On
:::note
-
+
Make sure you configured the correct kubeconfig (for example, `export KUBECONFIG=$PWD/kube_config_cluster.yml` if the Rancher server is installed on a Kubernetes cluster) or are using the embedded kubectl via the UI.
:::
diff --git a/docs/explanations.md b/docs/explanations.md
index a8ce4af1e5a..838ff422a26 100644
--- a/docs/explanations.md
+++ b/docs/explanations.md
@@ -1,6 +1,5 @@
---
title: Explanations
-weight: 400
---
**Explanatory docs** are concerned primarily with providing theoretical knowledge for the "why" behind a task or a topic. Explanations are "understanding-oriented" in nature and will clarify a topic in order to broaden the user's knowledge. In this section, users can find additional context and background, alternatives or even opinions on topics, and often historical reasons, constraints, and insights into why a process works the way that it does.
\ No newline at end of file
diff --git a/docs/explanations/integrations-in-rancher/cis-scans/configuration-reference.md b/docs/explanations/integrations-in-rancher/cis-scans/configuration-reference.md
index ee6c737d8ea..fa9012e6ed8 100644
--- a/docs/explanations/integrations-in-rancher/cis-scans/configuration-reference.md
+++ b/docs/explanations/integrations-in-rancher/cis-scans/configuration-reference.md
@@ -1,6 +1,5 @@
---
title: Configuration
-weight: 3
---
This configuration reference is intended to help you manage the custom resources created by the `rancher-cis-benchmark` application. These resources are used for performing CIS scans on a cluster, skipping tests, setting the test profile that will be used during a scan, and other customization.
diff --git a/docs/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md b/docs/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md
index 66582cab1c2..8ba63bbe8f7 100644
--- a/docs/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md
+++ b/docs/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md
@@ -1,16 +1,15 @@
---
title: Creating a Custom Benchmark Version for Running a Cluster Scan
-weight: 4
---
Each Benchmark Version defines a set of test configuration files that define the CIS tests to be run by the kube-bench tool.
The `rancher-cis-benchmark` application installs a few default Benchmark Versions which are listed under CIS Benchmark application menu.
-
+
But there could be some Kubernetes cluster setups that require custom configurations of the Benchmark tests. For example, the path to the Kubernetes config files or certs might be different than the standard location where the upstream CIS Benchmarks look for them.
It is now possible to create a custom Benchmark Version for running a cluster scan using the `rancher-cis-benchmark` application.
-When a cluster scan is run, you need to select a Profile which points to a specific Benchmark Version.
+When a cluster scan is run, you need to select a Profile which points to a specific Benchmark Version.
Follow all the steps below to add a custom Benchmark Version and run a scan using it.
@@ -21,7 +20,7 @@ To create a custom benchmark version, first you need to create a ConfigMap conta
To prepare a custom benchmark version ConfigMap, suppose we want to add a custom Benchmark Version named `foo`.
1. Create a directory named `foo` and inside this directory, place all the config YAML files that the kube-bench tool looks for. For example, here are the config YAML files for a Generic CIS 1.5 Benchmark Version https://github.com/aquasecurity/kube-bench/tree/master/cfg/cis-1.5
-1. Place the complete `config.yaml` file, which includes all the components that should be tested.
+1. Place the complete `config.yaml` file, which includes all the components that should be tested.
1. Add the Benchmark version name to the `target_mapping` section of the `config.yaml`:
```yaml
diff --git a/docs/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md b/docs/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
index 0eaaaccd2ce..8a88240d963 100644
--- a/docs/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
+++ b/docs/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
@@ -1,7 +1,5 @@
---
title: Roles-based Access Control
-shortTitle: RBAC
-weight: 3
---
This section describes the permissions required to use the rancher-cis-benchmark App.
@@ -13,7 +11,7 @@ However, the `rancher-cis-benchmark` chart installs these two default `ClusterRo
- cis-admin
- cis-view
-In Rancher, only cluster owners and global administrators have `cis-admin` access by default.
+In Rancher, only cluster owners and global administrators have `cis-admin` access by default.
Note: If you were using the `cis-edit` role added in Rancher v2.5 setup, it has now been removed since
Rancher v2.5.2 because it essentially is same as `cis-admin`. If you happen to create any clusterrolebindings
diff --git a/docs/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md b/docs/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
index 4aae02fa330..b11887c76c1 100644
--- a/docs/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
+++ b/docs/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
@@ -1,6 +1,5 @@
---
title: Skipped and Not Applicable Tests
-weight: 3
---
This section lists the tests that are skipped in the permissive test profile for RKE.
diff --git a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md b/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
index 720e602a268..d0dbcde86df 100644
--- a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
+++ b/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
@@ -1,6 +1,5 @@
---
title: Prerequisites
-weight: 1
---
### 1. Setting Up License Manager and Purchasing Support
diff --git a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md b/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md
index b9bdeba217b..02e6bb86340 100644
--- a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md
+++ b/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md
@@ -1,6 +1,5 @@
---
title: Common Issues
-weight: 4
---
**After installing the adapter, a banner message appears in Rancher that says "AWS Marketplace Adapter: Unable to run the adapter, please check the adapter logs"**
diff --git a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md b/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
index afcb0ac1a9e..54898c13e36 100644
--- a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
+++ b/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
@@ -1,6 +1,5 @@
---
title: Installing the Adapter
-weight: 2
---
import Tabs from '@theme/Tabs';
diff --git a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md b/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md
index c904647c2c0..16e0ac3443e 100644
--- a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md
+++ b/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md
@@ -1,6 +1,5 @@
---
title: Uninstalling The Adapter
-weight: 3
---
### 1. Uninstall the adapter chart using helm.
diff --git a/docs/explanations/integrations-in-rancher/cloud-marketplace/supportconfig.md b/docs/explanations/integrations-in-rancher/cloud-marketplace/supportconfig.md
index 102c6cc39ea..9d87830a82e 100644
--- a/docs/explanations/integrations-in-rancher/cloud-marketplace/supportconfig.md
+++ b/docs/explanations/integrations-in-rancher/cloud-marketplace/supportconfig.md
@@ -1,6 +1,5 @@
---
title: Supportconfig bundle
-weight: 100
---
After installing the CSP adapter, you will have the ability to generate a supportconfig bundle. This bundle is a tar file which can be used to quickly provide information to support.
diff --git a/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md b/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
index f7725ddddde..f012a3a9921 100644
--- a/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
+++ b/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
@@ -1,6 +1,5 @@
---
title: Architecture
-weight: 1
---
Fleet can manage deployments from git of raw Kubernetes YAML, Helm charts, or Kustomize or any combination of the three. Regardless of the source, all resources are dynamically turned into Helm charts, and Helm is used as the engine to deploy everything in the cluster. This gives you a high degree of control, consistency, and auditability. Fleet focuses not only on the ability to scale, but to give one a high degree of control and visibility to exactly what is installed on the cluster.
diff --git a/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md b/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
index 5710c1564ab..6c500a9758e 100644
--- a/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
+++ b/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
@@ -1,6 +1,5 @@
---
title: Using Fleet Behind a Proxy
-weight: 3
---
In this section, you'll learn how to enable Fleet in a setup that has a Rancher server with a public IP a Kubernetes cluster that has no public IP, but is configured to use a proxy.
diff --git a/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md b/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
index a2cb842fc0b..edb26fffd7f 100644
--- a/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
+++ b/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
@@ -1,6 +1,5 @@
---
title: Windows Support
-weight: 2
---
diff --git a/docs/explanations/integrations-in-rancher/harvester.md b/docs/explanations/integrations-in-rancher/harvester.md
index 5bee9547a7e..1e261690bed 100644
--- a/docs/explanations/integrations-in-rancher/harvester.md
+++ b/docs/explanations/integrations-in-rancher/harvester.md
@@ -1,6 +1,5 @@
---
title: Harvester Integration
-weight: 10
---
Introduced in Rancher v2.6.1, [Harvester](https://docs.harvesterhci.io/) is an open-source hyper-converged infrastructure (HCI) software built on Kubernetes. Harvester installs on bare metal servers and provides integrated virtualization and distributed storage capabilities. Although Harvester operates using Kubernetes, it does not require users to know Kubernetes concepts, making it a more user-friendly application.
@@ -15,15 +14,15 @@ Harvester is GA. Please refer to the [Harvester release notes](https://github.co
The Harvester feature flag is used to manage access to the Virtualization Management (VM) page in Rancher where users can navigate directly to Harvester clusters and access the Harvester UI. The Harvester feature flag is enabled by default. Click [here](../../pages-for-subheaders/enable-experimental-features.md) for more information on feature flags in Rancher.
-To navigate to the Harvester cluster, click **☰ > Virtualization Management**. From Harvester Clusters page, click one of the clusters listed to go to the single Harvester cluster view.
+To navigate to the Harvester cluster, click **☰ > Virtualization Management**. From Harvester Clusters page, click one of the clusters listed to go to the single Harvester cluster view.
* If the Harvester feature flag is enabled, Harvester clusters will be filtered out from any pages or apps (such as Fleet and the multi-cluster app) that list Kubernetes clusters.
* If the Harvester feature flag is disabled, and a Harvester cluster is imported, the Harvester cluster will be shown in the Rancher cluster list in the Cluster Management page. Harvester clusters will only be shown on the cluster list when the feature flag is off.
-* With the Harvester integration, Harvester clusters can now be imported into Rancher as a cluster type `Harvester`.
+* With the Harvester integration, Harvester clusters can now be imported into Rancher as a cluster type `Harvester`.
-* Users may import a Harvester cluster only on the Virtualization Management page. Importing a cluster on the Cluster Management page is not supported, and a warning will advise you to return to the VM page to do so.
+* Users may import a Harvester cluster only on the Virtualization Management page. Importing a cluster on the Cluster Management page is not supported, and a warning will advise you to return to the VM page to do so.
### Harvester Node Driver
diff --git a/docs/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md b/docs/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
index 03615c85b63..6fee2660116 100644
--- a/docs/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
+++ b/docs/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
@@ -1,6 +1,5 @@
---
title: Additional Steps for Installing Istio on an RKE2 Cluster
-weight: 3
---
When installing or upgrading the Istio Helm chart through **Apps & Marketplace,**
diff --git a/docs/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md b/docs/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
index 08d2db68831..0d6fca0b150 100644
--- a/docs/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
+++ b/docs/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
@@ -1,16 +1,15 @@
---
title: Enable Istio with Pod Security Policies
-weight: 1
---
-If you have restrictive Pod Security Policies enabled, then Istio may not be able to function correctly, because it needs certain permissions in order to install itself and manage pod infrastructure. In this section, we will configure a cluster with PSPs enabled for an Istio install, and also set up the Istio CNI plugin.
+If you have restrictive Pod Security Policies enabled, then Istio may not be able to function correctly, because it needs certain permissions in order to install itself and manage pod infrastructure. In this section, we will configure a cluster with PSPs enabled for an Istio install, and also set up the Istio CNI plugin.
The Istio CNI plugin removes the need for each application pod to have a privileged `NET_ADMIN` container. For further information, see the [Istio CNI Plugin docs](https://istio.io/docs/setup/additional-setup/cni). Please note that the [Istio CNI Plugin is in alpha](https://istio.io/about/feature-stages/).
:::note Prerequisites:
- The cluster must be an RKE Kubernetes cluster.
-- The cluster must have been created with a default PodSecurityPolicy.
+- The cluster must have been created with a default PodSecurityPolicy.
To enable pod security policy support when creating a Kubernetes cluster in the Rancher UI, go to Advanced Options. In the Pod Security Policy Support section, click Enabled. Then select a default pod security policy.
diff --git a/docs/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md b/docs/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
index a1718986b00..16fde314183 100644
--- a/docs/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
+++ b/docs/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
@@ -1,6 +1,5 @@
---
title: Additional Steps for Project Network Isolation
-weight: 4
---
In clusters where:
diff --git a/docs/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md b/docs/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
index 3545da226ad..10907f4718c 100644
--- a/docs/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
+++ b/docs/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
@@ -1,11 +1,10 @@
---
title: Selectors and Scrape Configs
-weight: 2
---
The Monitoring app sets `prometheus.prometheusSpec.ignoreNamespaceSelectors=false`, which enables monitoring across all namespaces by default.
-This ensures you can view traffic, metrics and graphs for resources deployed in a namespace with `istio-injection=enabled` label.
+This ensures you can view traffic, metrics and graphs for resources deployed in a namespace with `istio-injection=enabled` label.
If you would like to limit Prometheus to specific namespaces, set `prometheus.prometheusSpec.ignoreNamespaceSelectors=true`. Once you do this, you will need to add additional configuration to continue to monitor your resources.
@@ -21,20 +20,20 @@ To limit monitoring to specific namespaces, you will edit the `ignoreNamespaceSe
### Enabling Prometheus to Detect Resources in Other Namespaces
-There are two different ways to enable Prometheus to detect resources in other namespaces when `prometheus.prometheusSpec.ignoreNamespaceSelectors=true`:
+There are two different ways to enable Prometheus to detect resources in other namespaces when `prometheus.prometheusSpec.ignoreNamespaceSelectors=true`:
- **Monitoring specific namespaces:** Add a Service Monitor or Pod Monitor in the namespace with the targets you want to scrape.
- **Monitoring across namespaces:** Add an `additionalScrapeConfig` to your rancher-monitoring instance to scrape all targets in all namespaces.
### Monitoring Specific Namespaces: Create a Service Monitor or Pod Monitor
-This option allows you to define which specific services or pods you would like monitored in a specific namespace.
+This option allows you to define which specific services or pods you would like monitored in a specific namespace.
The usability tradeoff is that you have to create the service monitor or pod monitor per namespace since you cannot monitor across namespaces.
:::note Prerequisite:
-Define a ServiceMonitor or PodMonitor for ``. An example ServiceMonitor is provided below.
+Define a ServiceMonitor or PodMonitor for ``. An example ServiceMonitor is provided below.
:::
@@ -42,10 +41,10 @@ Define a ServiceMonitor or PodMonitor for ``. An example Service
1. Go to the cluster that you created and click **Explore**.
1. In the top navigation bar, open the kubectl shell.
1. If the ServiceMonitor or PodMonitor file is stored locally in your cluster, in `kubectl create -f .yaml`.
-1. If the ServiceMonitor or PodMonitor is not stored locally, run `cat<< EOF | kubectl apply -f -`, paste the file contents into the terminal, then run `EOF` to complete the command.
+1. If the ServiceMonitor or PodMonitor is not stored locally, run `cat<< EOF | kubectl apply -f -`, paste the file contents into the terminal, then run `EOF` to complete the command.
1. Run `kubectl label namespace istio-injection=enabled` to enable the envoy sidecar injection.
-**Result:** `` can be scraped by prometheus.
+**Result:** `` can be scraped by prometheus.
Example Service Monitor for Istio Proxies
@@ -84,11 +83,11 @@ spec:
### Monitoring across namespaces: Set ignoreNamespaceSelectors to False
-This enables monitoring across namespaces by giving Prometheus additional scrape configurations.
+This enables monitoring across namespaces by giving Prometheus additional scrape configurations.
-The usability tradeoff is that all of Prometheus' `additionalScrapeConfigs` are maintained in a single Secret. This could make upgrading difficult if monitoring is already deployed with additionalScrapeConfigs before installing Istio.
+The usability tradeoff is that all of Prometheus' `additionalScrapeConfigs` are maintained in a single Secret. This could make upgrading difficult if monitoring is already deployed with additionalScrapeConfigs before installing Istio.
-1. When installing or upgrading the Monitoring Helm chart, edit the values.yml and set the `prometheus.prometheusSpec.additionalScrapeConfigs` array to the **Additional Scrape Config** provided below.
+1. When installing or upgrading the Monitoring Helm chart, edit the values.yml and set the `prometheus.prometheusSpec.additionalScrapeConfigs` array to the **Additional Scrape Config** provided below.
1. Complete the install or upgrade.
**Result:** All namespaces with the `istio-injection=enabled` label will be scraped by prometheus.
@@ -118,4 +117,4 @@ The usability tradeoff is that all of Prometheus' `additionalScrapeConfigs` are
- source_labels: [__meta_kubernetes_pod_name]
action: replace
target_label: pod_name
-```
+```
diff --git a/docs/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md b/docs/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
index ac90240960a..cf493771d19 100644
--- a/docs/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
+++ b/docs/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
@@ -1,6 +1,5 @@
---
title: CPU and Memory Allocations
-weight: 1
---
This section describes the minimum recommended computing resources for the Istio components in a cluster.
diff --git a/docs/explanations/integrations-in-rancher/istio/disable-istio.md b/docs/explanations/integrations-in-rancher/istio/disable-istio.md
index d063c938a2b..65da8f122ce 100644
--- a/docs/explanations/integrations-in-rancher/istio/disable-istio.md
+++ b/docs/explanations/integrations-in-rancher/istio/disable-istio.md
@@ -1,6 +1,5 @@
---
title: Disabling Istio
-weight: 4
---
This section describes how to uninstall Istio in a cluster or disable a namespace, or workload.
@@ -15,7 +14,7 @@ To uninstall Istio,
1. In the `istio-system` namespace, go to `rancher-istio` and click **⋮ > Delete**.
1. After `rancher-istio` is deleted, you can then select all the remaining apps in the `istio-system` namespace and click **Delete**.
-**Result:** The `rancher-istio` app in the cluster gets removed. The Istio sidecar cannot be deployed on any workloads in the cluster.
+**Result:** The `rancher-istio` app in the cluster gets removed. The Istio sidecar cannot be deployed on any workloads in the cluster.
:::note
diff --git a/docs/explanations/integrations-in-rancher/istio/rbac-for-istio.md b/docs/explanations/integrations-in-rancher/istio/rbac-for-istio.md
index f2d6a91ac19..e33bdb72540 100644
--- a/docs/explanations/integrations-in-rancher/istio/rbac-for-istio.md
+++ b/docs/explanations/integrations-in-rancher/istio/rbac-for-istio.md
@@ -1,6 +1,5 @@
---
title: Role-based Access Control
-weight: 3
---
This section describes the permissions required to access Istio features.
diff --git a/docs/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md b/docs/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
index bdce1655d8d..93632d45003 100644
--- a/docs/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
+++ b/docs/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
@@ -1,6 +1,5 @@
---
title: Flows and ClusterFlows
-weight: 1
---
For the full details on configuring `Flows` and `ClusterFlows`, see the [Banzai Cloud Logging operator documentation.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/)
@@ -12,7 +11,7 @@ A `Flow` defines which logs to collect and filter and which output to send the l
The `Flow` is a namespaced resource, which means logs will only be collected from the namespace that the `Flow` is deployed in.
-`Flows` can be configured by filling out forms in the Rancher UI.
+`Flows` can be configured by filling out forms in the Rancher UI.
For more details about the `Flow` custom resource, see [FlowSpec.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/flow_types/)
diff --git a/docs/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md b/docs/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
index 36c6c451e8d..18643b3f00f 100644
--- a/docs/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
+++ b/docs/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
@@ -1,6 +1,5 @@
---
title: Outputs and ClusterOutputs
-weight: 2
---
For the full details on configuring `Outputs` and `ClusterOutputs`, see the [Banzai Cloud Logging operator documentation.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/output/)
@@ -11,7 +10,7 @@ The `Output` resource defines where your `Flows` can send the log messages. `Out
The `Output` is a namespaced resource, which means only a `Flow` within the same namespace can access it.
-You can use secrets in these definitions, but they must also be in the same namespace.
+You can use secrets in these definitions, but they must also be in the same namespace.
`Outputs` can be configured by filling out forms in the Rancher UI.
diff --git a/docs/explanations/integrations-in-rancher/logging/logging-architecture.md b/docs/explanations/integrations-in-rancher/logging/logging-architecture.md
index d977b279819..1613d9f0311 100644
--- a/docs/explanations/integrations-in-rancher/logging/logging-architecture.md
+++ b/docs/explanations/integrations-in-rancher/logging/logging-architecture.md
@@ -1,6 +1,5 @@
---
title: Architecture
-weight: 1
---
This section summarizes the architecture of the Rancher logging application.
@@ -9,15 +8,15 @@ For more details about how the Banzai Cloud Logging operator works, see the [off
### How the Banzai Cloud Logging Operator Works
-The Logging operator automates the deployment and configuration of a Kubernetes logging pipeline. It deploys and configures a Fluent Bit DaemonSet on every node to collect container and application logs from the node file system.
+The Logging operator automates the deployment and configuration of a Kubernetes logging pipeline. It deploys and configures a Fluent Bit DaemonSet on every node to collect container and application logs from the node file system.
Fluent Bit queries the Kubernetes API and enriches the logs with metadata about the pods, and transfers both the logs and the metadata to Fluentd. Fluentd receives, filters, and transfers logs to multiple `Outputs`.
-The following custom resources are used to define how logs are filtered and sent to their `Outputs`:
+The following custom resources are used to define how logs are filtered and sent to their `Outputs`:
-- A `Flow` is a namespaced custom resource that uses filters and selectors to route log messages to the appropriate `Outputs`.
+- A `Flow` is a namespaced custom resource that uses filters and selectors to route log messages to the appropriate `Outputs`.
- A `ClusterFlow` is used to route cluster-level log messages.
-- An `Output` is a namespaced resource that defines where the log messages are sent.
+- An `Output` is a namespaced resource that defines where the log messages are sent.
- A `ClusterOutput` defines an `Output` that is available from all `Flows` and `ClusterFlows`.
Each `Flow` must reference an `Output`, and each `ClusterFlow` must reference a `ClusterOutput`.
diff --git a/docs/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md b/docs/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md
index 2ccea6a311a..2d97864a09c 100644
--- a/docs/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md
+++ b/docs/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md
@@ -1,7 +1,5 @@
---
title: rancher-logging Helm Chart Options
-shortTitle: Helm Chart Options
-weight: 4
---
@@ -73,7 +71,7 @@ If you're already using a cloud provider's own logging solution such as AWS Clou
### Systemd Configuration
-In Rancher logging, `SystemdLogPath` must be configured for K3s and RKE2 Kubernetes distributions.
+In Rancher logging, `SystemdLogPath` must be configured for K3s and RKE2 Kubernetes distributions.
K3s and RKE2 Kubernetes distributions log to journald, which is the subsystem of systemd that is used for logging. In order to collect these logs, the `systemdLogPath` needs to be defined. While the `run/log/journal` directory is used by default, some Linux distributions do not default to this path. For example, Ubuntu defaults to `var/log/journal`. To determine your `systemdLogPath` configuration, see steps below.
@@ -81,10 +79,10 @@ K3s and RKE2 Kubernetes distributions log to journald, which is the subsystem of
* Run `cat /etc/systemd/journald.conf | grep -E ^\#?Storage | cut -d"=" -f2` on one of your nodes.
* If `persistent` is returned, your `systemdLogPath` should be `/var/log/journal`.
-* If `volatile` is returned, your `systemdLogPath` should be `/run/log/journal`.
-* If `auto` is returned, check if `/var/log/journal` exists.
- * If `/var/log/journal` exists, then use `/var/log/journal`.
- * If `/var/log/journal` does not exist, then use `/run/log/journal`.
+* If `volatile` is returned, your `systemdLogPath` should be `/run/log/journal`.
+* If `auto` is returned, check if `/var/log/journal` exists.
+ * If `/var/log/journal` exists, then use `/var/log/journal`.
+ * If `/var/log/journal` does not exist, then use `/run/log/journal`.
:::note Notes:
diff --git a/docs/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md b/docs/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
index 770a0586d4f..80e7b753c38 100644
--- a/docs/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
+++ b/docs/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
@@ -1,10 +1,9 @@
---
title: Migrating to Rancher v2.5 Logging
-weight: 2
---
Starting in v2.5, the logging feature available within Rancher has been completely overhauled. The [logging operator](https://github.com/banzaicloud/logging-operator) from Banzai Cloud has been adopted; Rancher configures this tooling for use when deploying logging.
-Among the many features and changes in the new logging functionality is the removal of project-specific logging configurations. Instead, one now configures logging at the namespace level. Cluster-level logging remains available, but configuration options differ.
+Among the many features and changes in the new logging functionality is the removal of project-specific logging configurations. Instead, one now configures logging at the namespace level. Cluster-level logging remains available, but configuration options differ.
## Installation
@@ -12,27 +11,27 @@ To install logging in Rancher v2.5+, refer to the [installation instructions](..
### Terminology
-In v2.5+, logging configuration in the **Cluster Dashboard**. To configure logging custom resources after the Logging application is installed, go to the left navigation bar and click **Logging**. It is from this menu option that logging for both cluster and namespace is configured.
+In v2.5+, logging configuration in the **Cluster Dashboard**. To configure logging custom resources after the Logging application is installed, go to the left navigation bar and click **Logging**. It is from this menu option that logging for both cluster and namespace is configured.
:::note
-Logging is installed on a per-cluster basis. You will need to navigate between clusters to configure logging for each cluster.
+Logging is installed on a per-cluster basis. You will need to navigate between clusters to configure logging for each cluster.
:::
There are four key concepts to understand for v2.5+ logging:
1. Outputs
-
+
`Outputs` are a configuration resource that determine a destination for collected logs. This is where settings for aggregators such as ElasticSearch, Kafka, etc. are stored. `Outputs` are namespaced resources.
2. Flows
- `Flows` are a configuration resource that determine collection, filtering, and destination rules for logs. It is within a flow that one will configure what logs to collect, how to mutate or filter them, and which `Outputs` to send the logs to. `Flows` are namespaced resources, and can connect either to an `Output` in the same namespace, or a `ClusterOutput`.
+ `Flows` are a configuration resource that determine collection, filtering, and destination rules for logs. It is within a flow that one will configure what logs to collect, how to mutate or filter them, and which `Outputs` to send the logs to. `Flows` are namespaced resources, and can connect either to an `Output` in the same namespace, or a `ClusterOutput`.
3. ClusterOutputs
- `ClusterOutputs` serve the same functionality as `Outputs`, except they are a cluster-scoped resource. `ClusterOutputs` are necessary when collecting logs cluster-wide, or if you wish to provide an `Output` to all namespaces in your cluster.
+ `ClusterOutputs` serve the same functionality as `Outputs`, except they are a cluster-scoped resource. `ClusterOutputs` are necessary when collecting logs cluster-wide, or if you wish to provide an `Output` to all namespaces in your cluster.
4. ClusterFlows
@@ -40,7 +39,7 @@ There are four key concepts to understand for v2.5+ logging:
## Cluster Logging
-To configure cluster-wide logging for v2.5+ logging, one needs to set up a `ClusterFlow`. This object defines the source of logs, any transformations or filters to be applied, and finally the `Output` (or `Outputs`) for the logs.
+To configure cluster-wide logging for v2.5+ logging, one needs to set up a `ClusterFlow`. This object defines the source of logs, any transformations or filters to be applied, and finally the `Output` (or `Outputs`) for the logs.
:::note Important:
@@ -56,17 +55,17 @@ In legacy logging, in order to collect logs from across the entire cluster, one
2. You do not need to configure any filters if you do not wish - default behavior does not require their creation
3. Define your cluster `Output` or `Outputs`
-This will result in logs from all sources in the cluster (all pods, and all system components) being collected and sent to the `Output` or `Outputs` you defined in the `ClusterFlow`.
+This will result in logs from all sources in the cluster (all pods, and all system components) being collected and sent to the `Output` or `Outputs` you defined in the `ClusterFlow`.
## Project Logging
-Logging in v2.5+ is not project-aware. This means that in order to collect logs from pods running in project namespaces, you will need to define `Flows` for those namespaces.
+Logging in v2.5+ is not project-aware. This means that in order to collect logs from pods running in project namespaces, you will need to define `Flows` for those namespaces.
To collect logs from a specific namespace, follow these steps:
1. Define an `Output` or `ClusterOutput` according to the instructions found under [Output Configuration](#output-configuration)
2. Create a `Flow`, ensuring that it is set to be created in the namespace in which you want to gather logs.
- 1. If you wish to define _Include_ or _Exclude_ rules, you may do so. Otherwise, removal of all rules will result in all pods in the target namespace having their logs collected.
+ 1. If you wish to define _Include_ or _Exclude_ rules, you may do so. Otherwise, removal of all rules will result in all pods in the target namespace having their logs collected.
2. You do not need to configure any filters if you do not wish - default behavior does not require their creation
3. Define your outputs - these can be either `ClusterOutput` or `Output` objects.
@@ -79,7 +78,7 @@ To collect logs from a project, repeat the above steps for every namespace withi
:::
## Output Configuration
-In legacy logging, there are five logging destinations to choose from: Elasticsearch, Splunk, Kafka, Fluentd, and Syslog. With the exception of Syslog, all of these destinations are available in logging v2.5+.
+In legacy logging, there are five logging destinations to choose from: Elasticsearch, Splunk, Kafka, Fluentd, and Syslog. With the exception of Syslog, all of these destinations are available in logging v2.5+.
### Elasticsearch
@@ -164,7 +163,7 @@ _(1) These values are to be specified as paths to files. Those files must be mou
### Syslog
-As of v2.5.2, syslog is not currently supported for `Outputs` using v2.5+ logging.
+As of v2.5.2, syslog is not currently supported for `Outputs` using v2.5+ logging.
## Custom Log Fields
@@ -185,5 +184,5 @@ spec:
In legacy logging, collecting logs from system components was accomplished by checking a box labeled "Include System Log" when setting up cluster logging. In v2.5+ logging, system logs are gathered in one of two ways:
-1. Gather all cluster logs, not specifying any match or exclusion rules. This results in all container logs from the cluster being collected, which includes system logs.
-2. Specifically target system logs by adding match rules for system components. Specific match rules depend on the component being collected.
\ No newline at end of file
+1. Gather all cluster logs, not specifying any match or exclusion rules. This results in all container logs from the cluster being collected, which includes system logs.
+2. Specifically target system logs by adding match rules for system components. Specific match rules depend on the component being collected.
\ No newline at end of file
diff --git a/docs/explanations/integrations-in-rancher/logging/rbac-for-logging.md b/docs/explanations/integrations-in-rancher/logging/rbac-for-logging.md
index 8065e16d964..627e3533c2c 100644
--- a/docs/explanations/integrations-in-rancher/logging/rbac-for-logging.md
+++ b/docs/explanations/integrations-in-rancher/logging/rbac-for-logging.md
@@ -1,7 +1,5 @@
---
-shortTitle: Role-based Access Control
title: Role-based Access Control for Logging
-weight: 3
---
Rancher logging has two roles, `logging-admin` and `logging-view`.
diff --git a/docs/explanations/integrations-in-rancher/logging/taints-and-tolerations.md b/docs/explanations/integrations-in-rancher/logging/taints-and-tolerations.md
index 00cee550a8d..4d663b5ef3a 100644
--- a/docs/explanations/integrations-in-rancher/logging/taints-and-tolerations.md
+++ b/docs/explanations/integrations-in-rancher/logging/taints-and-tolerations.md
@@ -1,13 +1,12 @@
---
title: Working with Taints and Tolerations
-weight: 6
---
"Tainting" a Kubernetes node causes pods to repel running on that node.
Unless the pods have a `toleration` for that node's taint, they will run on other nodes in the cluster.
-[Taints and tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) can work in conjunction with the `nodeSelector` [field](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) within the `PodSpec`, which enables the *opposite* effect of a taint.
+[Taints and tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) can work in conjunction with the `nodeSelector` [field](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) within the `PodSpec`, which enables the *opposite* effect of a taint.
Using `nodeSelector` gives pods an affinity towards certain nodes.
diff --git a/docs/explanations/integrations-in-rancher/longhorn.md b/docs/explanations/integrations-in-rancher/longhorn.md
index d77d62fcfdf..0eae32bffbf 100644
--- a/docs/explanations/integrations-in-rancher/longhorn.md
+++ b/docs/explanations/integrations-in-rancher/longhorn.md
@@ -1,7 +1,5 @@
---
title: Longhorn - Cloud native distributed block storage for Kubernetes
-shortTitle: Longhorn Storage
-weight: 19
---
[Longhorn](https://longhorn.io/) is a lightweight, reliable, and easy-to-use distributed block storage system for Kubernetes.
diff --git a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md b/docs/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
index 202aa40a6fa..5f3a1e75b12 100644
--- a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
+++ b/docs/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
@@ -1,6 +1,5 @@
---
title: Built-in Dashboards
-weight: 3
---
diff --git a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md b/docs/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
index 5f9cd11cf73..7cee8c0f35e 100644
--- a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
+++ b/docs/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
@@ -1,6 +1,5 @@
---
title: How Monitoring Works
-weight: 1
---
diff --git a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md b/docs/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
index 5b9fd3a3449..e301620d92a 100644
--- a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
+++ b/docs/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
@@ -1,6 +1,5 @@
---
title: PromQL Expression Reference
-weight: 6
---
The PromQL expressions in this doc can be used to configure alerts.
diff --git a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md b/docs/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
index f7419b29670..50a52a896e8 100644
--- a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
+++ b/docs/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
@@ -1,7 +1,5 @@
---
title: Role-based Access Control
-shortTitle: RBAC
-weight: 2
---
This section describes the expectations for RBAC for Rancher Monitoring.
@@ -77,10 +75,10 @@ Monitoring also creates additional `ClusterRoles` that are not assigned to users
### Assigning Roles and ClusterRoles with kubectl
-An alternative method to using Rancher to attach a `Role` or `ClusterRole` to a user or group is by defining bindings in YAML files that you create. You must first configure the `RoleBinding` with the YAML file, then you apply the config changes by running the `kubectl apply` command.
+An alternative method to using Rancher to attach a `Role` or `ClusterRole` to a user or group is by defining bindings in YAML files that you create. You must first configure the `RoleBinding` with the YAML file, then you apply the config changes by running the `kubectl apply` command.
-* **Roles**: Below is an example of a YAML file to help you configure `RoleBindings` in Kubernetes. You will need to fill in the name below, and name is case-sensitive.
+* **Roles**: Below is an example of a YAML file to help you configure `RoleBindings` in Kubernetes. You will need to fill in the name below, and name is case-sensitive.
```yaml
# monitoring-config-view-role-binding.yaml
@@ -102,7 +100,7 @@ subjects:
* **kubectl**: Below is an example of a `kubectl` command used to apply the binding you've created in the YAML file. As noted, you will need to fill in your YAML filename accordingly.
* **`kubectl apply -f monitoring-config-view-role-binding.yaml`
-
+
## Users with Rancher Based Permissions
diff --git a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md b/docs/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md
index eed7a3f7c4f..d36e2e66768 100644
--- a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md
+++ b/docs/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md
@@ -1,7 +1,5 @@
---
title: Windows Cluster Support for Monitoring V2
-shortTitle: Windows Support
-weight: 5
---
_Available as of v2.5.8_
@@ -32,22 +30,22 @@ To facilitate this upgrade, Rancher 2.5.8 has released a brand new Helm chart ca
1. Deploy `rancher-wins-upgrader` with the following override:
```yaml
# Masquerading bootstraps the wins-upgrader installation via
- # a previously whitelisted process path since the normal install path,
- # c:\etc\rancher\wins\wins-upgrade.exe is not normally whitelisted.
- # In this case, we are using the previously whitelisted process
+ # a previously whitelisted process path since the normal install path,
+ # c:\etc\rancher\wins\wins-upgrade.exe is not normally whitelisted.
+ # In this case, we are using the previously whitelisted process
# path used by Monitoring V1.
masquerade:
enabled: true
as: c:\\etc\wmi-exporter\wmi-exporter.exe
```
:::note Note for Non-Default Windows Prefix Path:
-
- - If you set up the RKE cluster with a `cluster.yml` that has a non-default `win_prefix_path`, you will need to update the `masquerade.as` field with your prefix path in place of `c:\\`.
-
+
+ - If you set up the RKE cluster with a `cluster.yml` that has a non-default `win_prefix_path`, you will need to update the `masquerade.as` field with your prefix path in place of `c:\\`.
+
- For example, if you have `win_prefix_path: 'c:\host\opt\'`, then you will need to set `as: c:\host\opt\etc\wmi-exporter\wmi-exporter.exe`.
:::
-
+
2. Once all your hosts have been successfully upgraded, please ensure that you deploy the Helm chart once again with default values to avoid conflicts with the following settings:
```yaml
masquerade:
diff --git a/docs/explanations/integrations-in-rancher/neuvector.md b/docs/explanations/integrations-in-rancher/neuvector.md
index 4d46158e68e..328179e063d 100644
--- a/docs/explanations/integrations-in-rancher/neuvector.md
+++ b/docs/explanations/integrations-in-rancher/neuvector.md
@@ -1,6 +1,5 @@
---
title: NeuVector Integration
-weight: 22
---
import Tabs from '@theme/Tabs';
diff --git a/docs/explanations/integrations-in-rancher/opa-gatekeeper.md b/docs/explanations/integrations-in-rancher/opa-gatekeeper.md
index 4ae2e407bab..6f1f685811c 100644
--- a/docs/explanations/integrations-in-rancher/opa-gatekeeper.md
+++ b/docs/explanations/integrations-in-rancher/opa-gatekeeper.md
@@ -1,9 +1,8 @@
---
title: OPA Gatekeeper
-weight: 16
---
-To ensure consistency and compliance, every organization needs the ability to define and enforce policies in its environment in an automated way. [OPA (Open Policy Agent)](https://www.openpolicyagent.org/) is a policy engine that facilitates policy-based control for cloud native environments. Rancher provides the ability to enable OPA Gatekeeper in Kubernetes clusters, and also installs a couple of built-in policy definitions, which are also called constraint templates.
+To ensure consistency and compliance, every organization needs the ability to define and enforce policies in its environment in an automated way. [OPA (Open Policy Agent)](https://www.openpolicyagent.org/) is a policy engine that facilitates policy-based control for cloud native environments. Rancher provides the ability to enable OPA Gatekeeper in Kubernetes clusters, and also installs a couple of built-in policy definitions, which are also called constraint templates.
OPA provides a high-level declarative language that lets you specify policy as code and ability to extend simple APIs to offload policy decision-making.
@@ -57,7 +56,7 @@ When OPA Gatekeeper is enabled, Rancher installs some templates by default.
To list the constraint templates installed in the cluster, go to the left side menu under OPA Gatekeeper and click on **Templates**.
Rancher also provides the ability to create your own constraint templates by importing YAML definitions.
-
+
## Creating and Configuring Constraints
[Constraints](https://github.com/open-policy-agent/gatekeeper#constraints) are Kubernetes custom resources that define the scope of objects to which a specific constraint template applies to. The complete policy is defined by constraint templates and constraints together.
@@ -83,14 +82,14 @@ When a constraint is created, ensure that it does not apply to any Rancher or Ku
To limit the scope of the constraint only to user namespaces, always specify these namespaces under the **Match** field of the constraint.
Also, the constraint may interfere with other Rancher functionality and deny system workloads from being deployed. To avoid this, exclude all Rancher-specific namespaces from your constraints.
-
+
## Enforcing Constraints in your Cluster
When the **Enforcement Action** is **Deny,** the constraint is immediately enabled and will deny any requests that violate the policy defined. By default, the enforcement value is **Deny**.
When the **Enforcement Action** is **Dryrun,** then any resources that violate the policy are only recorded under the constraint's status field.
-To enforce constraints, create a constraint using the form. In the **Enforcement Action** field, choose **Deny**.
+To enforce constraints, create a constraint using the form. In the **Enforcement Action** field, choose **Deny**.
## Audit and Violations in your Cluster
diff --git a/docs/faq.md b/docs/faq.md
index 50a2901350c..5221ad9b6af 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -1,6 +1,5 @@
---
title: FAQ
-weight: 500
---
This FAQ is a work in progress designed to answers the questions our users most frequently ask about Rancher v2.x.
diff --git a/docs/faq/container-network-interface-providers.md b/docs/faq/container-network-interface-providers.md
index 42669226695..b741c84f337 100644
--- a/docs/faq/container-network-interface-providers.md
+++ b/docs/faq/container-network-interface-providers.md
@@ -1,7 +1,6 @@
---
title: Container Network Interface (CNI) Providers
description: Learn about Container Network Interface (CNI), the CNI providers Rancher provides, the features they offer, and how to choose a provider for you
-weight: 2300
---
## What is CNI?
diff --git a/docs/faq/deprecated-features-in-v2.5.md b/docs/faq/deprecated-features-in-v2.5.md
index 0815fd29044..d901807423b 100644
--- a/docs/faq/deprecated-features-in-v2.5.md
+++ b/docs/faq/deprecated-features-in-v2.5.md
@@ -1,6 +1,5 @@
---
title: Deprecated Features in Rancher
-weight: 100
---
### What is Rancher's Deprecation policy?
@@ -14,7 +13,7 @@ Rancher will publish deprecated features as part of the [release notes](https://
| Patch Version | Release Date |
|---------------|---------------|
| [2.6.0](https://github.com/rancher/rancher/releases/tag/v2.6.0) | Aug 31, 2021 |
-| [2.6.1](https://github.com/rancher/rancher/releases/tag/v2.6.1) | Oct 11, 2021 |
+| [2.6.1](https://github.com/rancher/rancher/releases/tag/v2.6.1) | Oct 11, 2021 |
| [2.6.2](https://github.com/rancher/rancher/releases/tag/v2.6.2) | Oct 19, 2021 |
| [2.6.3](https://github.com/rancher/rancher/releases/tag/v2.6.3) | Dec 21, 2021 |
| [2.6.4](https://github.com/rancher/rancher/releases/tag/v2.6.4) | Mar 31, 2022 |
diff --git a/docs/faq/dockershim.md b/docs/faq/dockershim.md
index d9ce2fe6437..0921678a728 100644
--- a/docs/faq/dockershim.md
+++ b/docs/faq/dockershim.md
@@ -1,6 +1,5 @@
---
title: Dockershim
-weight: 300
---
The Dockershim is the CRI compliant layer between the Kubelet and the Docker daemon. As part of the Kubernetes 1.20 release, the [deprecation of the in-tree Dockershim was announced](https://kubernetes.io/blog/2020/12/02/dont-panic-kubernetes-and-docker/). Removal is currently scheduled for Kubernetes 1.24. For more information on the deprecation and its timelines, see the [Kubernetes Dockershim Deprecation FAQ](https://kubernetes.io/blog/2020/12/02/dockershim-faq/#when-will-dockershim-be-removed).
diff --git a/docs/faq/install-and-configure-kubectl.md b/docs/faq/install-and-configure-kubectl.md
index cd74d7c0591..861e1b7b1eb 100644
--- a/docs/faq/install-and-configure-kubectl.md
+++ b/docs/faq/install-and-configure-kubectl.md
@@ -1,6 +1,5 @@
---
title: Installing and Configuring kubectl
-weight: 100
---
`kubectl` is a CLI utility for running commands against Kubernetes clusters. It's required for many maintenance and administrative tasks in Rancher 2.x.
diff --git a/docs/faq/networking/networking.md b/docs/faq/networking/networking.md
index 149ff4853a3..1626e70c264 100644
--- a/docs/faq/networking/networking.md
+++ b/docs/faq/networking/networking.md
@@ -1,6 +1,5 @@
---
title: Networking
-weight: 8005
---
Networking FAQ's
diff --git a/docs/faq/rancher-is-no-longer-needed.md b/docs/faq/rancher-is-no-longer-needed.md
index 7e59ee8e3d6..0b41b23d694 100644
--- a/docs/faq/rancher-is-no-longer-needed.md
+++ b/docs/faq/rancher-is-no-longer-needed.md
@@ -1,6 +1,5 @@
---
title: Rancher is No Longer Needed
-weight: 8010
---
This page is intended to answer questions about what happens if you don't want Rancher anymore, if you don't want a cluster to be managed by Rancher anymore, or if the Rancher server is deleted.
diff --git a/docs/faq/security.md b/docs/faq/security.md
index aee42e0fb93..14fdc2e5a77 100644
--- a/docs/faq/security.md
+++ b/docs/faq/security.md
@@ -1,6 +1,5 @@
---
title: Security
-weight: 8007
---
diff --git a/docs/faq/technical-items.md b/docs/faq/technical-items.md
index e29731d486b..56492420f60 100644
--- a/docs/faq/technical-items.md
+++ b/docs/faq/technical-items.md
@@ -1,6 +1,5 @@
---
title: Technical
-weight: 8006
---
### How can I reset the administrator password?
diff --git a/docs/faq/telemetry.md b/docs/faq/telemetry.md
index 6ab582667e1..f0866ac2b55 100644
--- a/docs/faq/telemetry.md
+++ b/docs/faq/telemetry.md
@@ -1,6 +1,5 @@
---
title: Telemetry
-weight: 8008
---
### What is Telemetry?
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md b/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
index c978f08243c..07e5320f516 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
+++ b/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
@@ -1,6 +1,5 @@
---
title: Docker Install with TLS Termination at Layer-7 NGINX Load Balancer
-weight: 252
---
For development and testing environments that have a special requirement to terminate TLS/SSL at a load balancer instead of your Rancher Server container, deploy Rancher and configure a load balancer to work with it conjunction.
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md b/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
index d42f6bb902b..1500401eeb4 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
+++ b/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
@@ -1,6 +1,5 @@
---
title: Enabling the API Audit Log to Record System Events
-weight: 4
---
You can enable the API audit log to record the sequence of system events initiated by individual users. You can know what happened, when it happened, who initiated it, and what cluster it affected. When you enable this feature, all requests to the Rancher API and all responses from it are written to a log.
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md b/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
index 689b0a2809d..a3ffcb2a1a5 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
+++ b/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
@@ -1,6 +1,5 @@
---
title: Opening Ports with firewalld
-weight: 1
---
> We recommend disabling firewalld. For Kubernetes 1.19.x and higher, firewalld must be turned off.
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md b/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
index af2f6829773..28ba391c403 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
+++ b/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
@@ -1,6 +1,5 @@
---
title: Tuning etcd for Large Installations
-weight: 2
---
When running larger Rancher installations with 15 or more clusters it is recommended to increase the default keyspace for etcd from the default 2GB. The maximum setting is 8GB and the host should have enough RAM to keep the entire dataset in memory. When increasing this value you should also increase the size of the host. The keyspace size can also be adjusted in smaller installations if you anticipate a high rate of change of pods during the garbage collection interval.
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md b/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md
index 2451705a993..f95d0f737fc 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md
+++ b/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md
@@ -1,6 +1,5 @@
---
title: Continuous Delivery
-weight: 3
---
As of Rancher v2.5, [Fleet](../../../../how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md) comes preinstalled in Rancher, and as of Rancher v2.6, Fleet can no longer be fully disabled. However, the Fleet feature for GitOps continuous delivery may be disabled using the `continuous-delivery` feature flag.
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md b/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
index e4fdcb01252..7347b5b5ba6 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
+++ b/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
@@ -1,6 +1,5 @@
---
title: UI for Istio Virtual Services and Destination Rules
-weight: 2
---
This feature enables a UI that lets you create, read, update and delete virtual services and destination rules, which are traffic management features of Istio.
@@ -20,7 +19,7 @@ A central advantage of Istio's traffic management features is that they allow dy
When enabled, this feature turns on a page that lets you configure some traffic management features of Istio using the Rancher UI. Without this feature, you need to use `kubectl` to manage traffic with Istio.
-The feature enables two UI tabs: one tab for **Virtual Services** and another for **Destination Rules**.
+The feature enables two UI tabs: one tab for **Virtual Services** and another for **Destination Rules**.
- **Virtual services** intercept and direct traffic to your Kubernetes services, allowing you to direct percentages of traffic from a request to different services. You can use them to define a set of routing rules to apply when a host is addressed. For details, refer to the [Istio documentation.](https://istio.io/docs/reference/config/networking/v1alpha3/virtual-service/)
- **Destination rules** serve as the single source of truth about which service versions are available to receive traffic from virtual services. You can use these resources to define policies that apply to traffic that is intended for a service after routing has occurred. For details, refer to the [Istio documentation.](https://istio.io/docs/reference/config/networking/v1alpha3/destination-rule)
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md b/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
index c7d99a8eb38..6c73c8fe79f 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
+++ b/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
@@ -1,6 +1,5 @@
---
title: "Running on ARM64 (Experimental)"
-weight: 3
---
:::caution
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md b/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
index 3d8c86b8c5a..cb580ec5614 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
+++ b/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
@@ -1,6 +1,5 @@
---
title: Allow Unsupported Storage Drivers
-weight: 1
---
This feature allows you to use types for storage providers and provisioners that are not enabled by default.
diff --git a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md
index 8828ac328dc..85bf16d827e 100644
--- a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md
+++ b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md
@@ -1,7 +1,5 @@
---
title: Rendering the Helm Template in an Air-Gapped Environment
-shortTitle: Air Gap Upgrade
-weight: 1
---
:::note
diff --git a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks.md b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks.md
index f7ee72a2bf9..299ac95b6d0 100644
--- a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks.md
+++ b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks.md
@@ -1,7 +1,5 @@
---
title: Installing Rancher on Azure Kubernetes Service
-shortTitle: AKS
-weight: 3
---
This page covers how to install Rancher on Microsoft's Azure Kubernetes Service (AKS).
diff --git a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md
index 00fcbcba5af..e38c4c4936e 100644
--- a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md
+++ b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md
@@ -1,7 +1,5 @@
---
title: Installing Rancher on Amazon EKS
-shortTitle: Amazon EKS
-weight: 3
---
This page covers two ways to install Rancher on EKS.
diff --git a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-gke.md b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-gke.md
index fd5c861472d..bceaba5a40e 100644
--- a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-gke.md
+++ b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-gke.md
@@ -1,7 +1,5 @@
---
title: Installing Rancher on a Google Kubernetes Engine Cluster
-shortTitle: GKE
-weight: 3
---
import Tabs from '@theme/Tabs';
diff --git a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md
index 0c97a8c27c8..44131fdb158 100644
--- a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md
+++ b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md
@@ -1,6 +1,5 @@
---
title: Rollbacks
-weight: 3
---
diff --git a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md
index 8a2b6a45e92..96a509960c7 100644
--- a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md
+++ b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md
@@ -1,6 +1,5 @@
---
title: Troubleshooting the Rancher Server Kubernetes Cluster
-weight: 276
---
This section describes how to troubleshoot an installation of Rancher on a Kubernetes cluster.
diff --git a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
index ec362cc26ce..13b5619e59e 100644
--- a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
+++ b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
@@ -1,6 +1,5 @@
---
title: Upgrades
-weight: 2
---
The following instructions will guide you through upgrading a Rancher server that was installed on a Kubernetes cluster with Helm. These steps also apply to air-gapped installs with Helm.
diff --git a/docs/getting-started/installation-and-upgrade/installation-requirements/dockershim.md b/docs/getting-started/installation-and-upgrade/installation-requirements/dockershim.md
index 36edce951d7..146818a4ba1 100644
--- a/docs/getting-started/installation-and-upgrade/installation-requirements/dockershim.md
+++ b/docs/getting-started/installation-and-upgrade/installation-requirements/dockershim.md
@@ -1,6 +1,5 @@
---
title: Dockershim
-weight: 300
---
The Dockershim is the CRI compliant layer between the Kubelet and the Docker daemon. As part of the Kubernetes 1.20 release, the [deprecation of the in-tree Dockershim was announced](https://kubernetes.io/blog/2020/12/02/dont-panic-kubernetes-and-docker/). For more information on the deprecation and its timelines, see the [Kubernetes Dockershim Deprecation FAQ](https://kubernetes.io/blog/2020/12/02/dockershim-faq/#when-will-dockershim-be-removed).
diff --git a/docs/getting-started/installation-and-upgrade/installation-requirements/install-docker.md b/docs/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
index 8b16d157505..6708944238a 100644
--- a/docs/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
+++ b/docs/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
@@ -1,6 +1,5 @@
---
title: Installing Docker
-weight: 1
---
Docker is required to be installed on nodes where the Rancher server will be installed with Helm or Docker.
diff --git a/docs/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md b/docs/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
index 46f3cb96569..6fbd61e71c3 100644
--- a/docs/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
+++ b/docs/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
@@ -1,7 +1,6 @@
---
title: Port Requirements
description: Read about port requirements needed in order for Rancher to operate properly, both for Rancher nodes and downstream Kubernetes cluster nodes
-weight: 300
---
import Tabs from '@theme/Tabs';
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
index fb111ff1063..f6b401ffe23 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
@@ -1,6 +1,5 @@
---
title: Docker Install Commands
-weight: 1
---
The Docker installation is for Rancher users who want to test out Rancher.
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
index 151ecb98223..44fd2c5e337 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
@@ -1,6 +1,5 @@
---
title: '1. Set up Infrastructure and Private Registry'
-weight: 100
---
import Tabs from '@theme/Tabs';
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
index 9d239348d19..a0bac13caff 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
@@ -1,6 +1,5 @@
---
title: '3. Install Kubernetes (Skip for Docker Installs)'
-weight: 300
---
import Tabs from '@theme/Tabs';
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
index 6d4d3fcb2f9..85ebbf1324a 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
@@ -1,6 +1,5 @@
---
title: 4. Install Rancher
-weight: 400
---
This section is about how to deploy Rancher for your air gapped environment in a high-availability Kubernetes installation. An air gapped environment could be where Rancher server will be installed offline, behind a firewall, or behind a proxy.
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md
index 6418c531eb0..6e274ef1620 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md
@@ -1,6 +1,5 @@
---
title: '2. Collect and Publish Images to your Private Registry'
-weight: 200
---
import Tabs from '@theme/Tabs';
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md
index 284d4fb2dd0..1e3783e036d 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md
@@ -1,6 +1,5 @@
---
title: '2. Install Kubernetes'
-weight: 200
---
Once the infrastructure is ready, you can continue with setting up an RKE cluster to install Rancher in.
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
index 9b9e365ae67..52c59805f35 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
@@ -1,6 +1,5 @@
---
title: 3. Install Rancher
-weight: 300
---
Now that you have a running RKE cluster, you can install Rancher in it. For security reasons all traffic to Rancher must be encrypted with TLS. For this tutorial you are going to automatically issue a self-signed certificate through [cert-manager](https://cert-manager.io/). In a real-world use-case you will likely use Let's Encrypt or provide your own certificate.
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
index 945dca55a61..bf4c69b69f9 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
@@ -1,6 +1,5 @@
---
title: '1. Set up Infrastructure'
-weight: 100
---
In this section, you will provision the underlying infrastructure for your Rancher management server with internete access through a HTTP proxy.
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md
index 9a1fc02ee8d..7e91622ab4d 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md
@@ -1,6 +1,5 @@
---
title: Certificate Troubleshooting
-weight: 4
---
### How Do I Know if My Certificates are in PEM Format?
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md
index 4e9a3a1abd2..7aea42171ff 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md
@@ -1,6 +1,5 @@
---
title: Rolling Back Rancher Installed with Docker
-weight: 1015
---
If a Rancher upgrade does not complete successfully, you'll have to roll back to your Rancher setup that you were using before [Docker Upgrade](upgrade-docker-installed-rancher.md). Rolling back restores:
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
index 0b6806ada7c..751866de062 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
@@ -1,6 +1,5 @@
---
title: Upgrading Rancher Installed with Docker
-weight: 1010
---
import Tabs from '@theme/Tabs';
@@ -55,7 +54,7 @@ Write down or copy this information before starting the upgrade.
You can obtain `` and `` by logging into your Rancher server by remote connection and entering the command to view the containers that are running: `docker ps`. You can also view containers that are stopped using a different command: `docker ps -a`. Use these commands for help anytime during while creating backups.
-## Upgrade
+## Upgrade
During upgrade, you create a copy of the data from your current Rancher container and a backup in case something goes wrong. Then you deploy the new version of Rancher in a new container using your existing data.
### 1. Create a copy of the data from your Rancher server container
diff --git a/docs/getting-started/installation-and-upgrade/resources/add-tls-secrets.md b/docs/getting-started/installation-and-upgrade/resources/add-tls-secrets.md
index 9cfdd524752..17423a59154 100644
--- a/docs/getting-started/installation-and-upgrade/resources/add-tls-secrets.md
+++ b/docs/getting-started/installation-and-upgrade/resources/add-tls-secrets.md
@@ -1,13 +1,12 @@
---
title: Adding TLS Secrets
-weight: 2
---
Kubernetes will create all the objects and services for Rancher, but it will not become available until we populate the `tls-rancher-ingress` secret in the `cattle-system` namespace with the certificate and key.
Combine the server certificate followed by any intermediate certificate(s) needed into a file named `tls.crt`. Copy your certificate key into a file named `tls.key`.
-For example, [acme.sh](https://acme.sh) provides server certificate and CA chains in `fullchain.cer` file.
+For example, [acme.sh](https://acme.sh) provides server certificate and CA chains in `fullchain.cer` file.
This `fullchain.cer` should be renamed to `tls.crt` & certificate key file as `tls.key`.
Use `kubectl` with the `tls` secret type to create the secrets.
diff --git a/docs/getting-started/installation-and-upgrade/resources/bootstrap-password.md b/docs/getting-started/installation-and-upgrade/resources/bootstrap-password.md
index f0875b5e8a2..ccfb8de1d57 100644
--- a/docs/getting-started/installation-and-upgrade/resources/bootstrap-password.md
+++ b/docs/getting-started/installation-and-upgrade/resources/bootstrap-password.md
@@ -1,6 +1,5 @@
---
title: Bootstrap Password
-weight: 800
---
When Rancher starts for the first time, a password is randomly generated for the first admin user. When the admin first logs in to Rancher, the UI shows commands that can be used to retrieve the bootstrap password. The admin needs to run those commands and log in with the bootstrap password. Then Rancher gives the admin an opportunity to reset the password.
diff --git a/docs/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md b/docs/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md
index 88c9b792f0e..440226fd154 100644
--- a/docs/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md
+++ b/docs/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md
@@ -1,6 +1,5 @@
---
title: Choosing a Rancher Version
-weight: 1
---
import Tabs from '@theme/Tabs';
diff --git a/docs/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md b/docs/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
index a45fb23afa5..5d5dee35d7c 100644
--- a/docs/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
+++ b/docs/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
@@ -1,6 +1,5 @@
---
title: About Custom CA Root Certificates
-weight: 1
---
If you're using Rancher in an internal production environment where you aren't exposing apps publicly, use a certificate from a private certificate authority (CA).
diff --git a/docs/getting-started/installation-and-upgrade/resources/helm-version-requirements.md b/docs/getting-started/installation-and-upgrade/resources/helm-version-requirements.md
index 407aabba1ca..58e03ea6c9d 100644
--- a/docs/getting-started/installation-and-upgrade/resources/helm-version-requirements.md
+++ b/docs/getting-started/installation-and-upgrade/resources/helm-version-requirements.md
@@ -1,6 +1,5 @@
---
title: Helm Version Requirements
-weight: 3
---
This section contains the requirements for Helm, which is the tool used to install Rancher on a high-availability Kubernetes cluster.
diff --git a/docs/getting-started/installation-and-upgrade/resources/local-system-charts.md b/docs/getting-started/installation-and-upgrade/resources/local-system-charts.md
index 49d5b18af53..b2c1fd6dd9e 100644
--- a/docs/getting-started/installation-and-upgrade/resources/local-system-charts.md
+++ b/docs/getting-started/installation-and-upgrade/resources/local-system-charts.md
@@ -1,6 +1,5 @@
---
title: Setting up Local System Charts for Air Gapped Installations
-weight: 120
---
The [System Charts](https://github.com/rancher/system-charts) repository contains all the catalog items required for features such as monitoring, logging, alerting and global DNS.
diff --git a/docs/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md b/docs/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md
index d7e111af1cf..8bf7bd86b2a 100644
--- a/docs/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md
+++ b/docs/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md
@@ -1,6 +1,5 @@
---
title: Updating the Rancher Certificate
-weight: 10
---
# Updating a Private CA Certificate
@@ -81,7 +80,7 @@ Also get the version string of the currently deployed Rancher chart:
$ helm ls -A
```
-Upgrade the Helm application instance using the original configuration values and making sure to specify `ingress.tls.source=secret` as well as the current chart version to prevent an application upgrade.
+Upgrade the Helm application instance using the original configuration values and making sure to specify `ingress.tls.source=secret` as well as the current chart version to prevent an application upgrade.
If the certificate was signed by a private CA, add the `set privateCA=true` argument as well. Also make sure to read the documentation describing the initial installation using custom certificates.
@@ -228,7 +227,7 @@ Also get the version string of the currently deployed Rancher chart:
$ helm ls -A
```
-Upgrade the Helm application instance using the original configuration values and making sure to specify the current chart version to prevent an application upgrade.
+Upgrade the Helm application instance using the original configuration values and making sure to specify the current chart version to prevent an application upgrade.
Also make sure to read the documentation describing the initial installation using custom certificates.
@@ -240,9 +239,9 @@ helm upgrade rancher rancher-stable/rancher \
--set ...
```
-On upgrade, you can either
+On upgrade, you can either
-- remove `--set ingress.tls.source=secret \` from the Helm upgrade command, as shown above, or
+- remove `--set ingress.tls.source=secret \` from the Helm upgrade command, as shown above, or
- remove the `privateCA` parameter or set it to `false` because the CA is valid:
diff --git a/docs/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md b/docs/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md
index 3cb767496a7..181aca14109 100644
--- a/docs/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md
+++ b/docs/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md
@@ -1,6 +1,5 @@
---
title: Upgrading Cert-Manager
-weight: 4
---
Rancher uses cert-manager to automatically generate and renew TLS certificates for HA deployments of Rancher. As of Fall 2019, three important changes to cert-manager are set to occur that you need to take action on if you have an HA deployment of Rancher:
diff --git a/docs/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md b/docs/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
index 61413064f3f..f42e13ac575 100644
--- a/docs/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
+++ b/docs/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
@@ -1,6 +1,5 @@
---
title: Upgrading and Rolling Back Kubernetes
-weight: 70
---
Following an upgrade to the latest version of Rancher, downstream Kubernetes clusters can be upgraded to use the latest supported version of Kubernetes.
diff --git a/docs/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md b/docs/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
index 18d7dd505a5..3c945df1359 100644
--- a/docs/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
+++ b/docs/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
@@ -1,6 +1,5 @@
---
title: Upgrading Kubernetes without Upgrading Rancher
-weight: 30
---
The RKE metadata feature allows you to provision clusters with new versions of Kubernetes as soon as they are released, without upgrading Rancher. This feature is useful for taking advantage of patch versions of Kubernetes, for example, if you want to upgrade to Kubernetes v1.14.7 when your Rancher server originally supported v1.14.6.
@@ -13,9 +12,9 @@ The Kubernetes API can change between minor versions. Therefore, we don't suppor
Rancher's Kubernetes metadata contains information specific to the Kubernetes version that Rancher uses to provision [RKE clusters](../../pages-for-subheaders/launch-kubernetes-with-rancher.md). Rancher syncs the data periodically and creates custom resource definitions (CRDs) for **system images,** **service options** and **addon templates**. Consequently, when a new Kubernetes version is compatible with the Rancher server version, the Kubernetes metadata makes the new version available to Rancher for provisioning clusters. The metadata gives you an overview of the information that the [Rancher Kubernetes Engine](https://rancher.com/docs/rke/latest/en/) (RKE) uses for deploying various Kubernetes versions.
-This table below describes the CRDs that are affected by the periodic data sync.
+This table below describes the CRDs that are affected by the periodic data sync.
-:::note
+:::note
Only administrators can edit metadata CRDs. It is recommended not to update existing objects unless explicitly advised.
diff --git a/docs/getting-started/introduction/overview.md b/docs/getting-started/introduction/overview.md
index eb16c45361b..247598c0a0a 100644
--- a/docs/getting-started/introduction/overview.md
+++ b/docs/getting-started/introduction/overview.md
@@ -1,6 +1,5 @@
---
title: Overview
-weight: 1
---
Rancher is a container management platform built for organizations that deploy containers in production. Rancher makes it easy to run Kubernetes everywhere, meet IT requirements, and empower DevOps teams.
diff --git a/docs/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md b/docs/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md
index bac47239b49..b467cb05030 100644
--- a/docs/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md
+++ b/docs/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md
@@ -1,7 +1,6 @@
---
title: Rancher AWS Marketplace Quick Start
description: Use Amazon EKS to deploy Rancher server.
-weight: 110
---
There is now an additional way for you to deploy the Rancher server in AWS by using Amazon EKS. To learn more, see our [Amazon Marketplace listing](https://aws.amazon.com/marketplace/pp/prodview-2yzbnvagmi4as).
\ No newline at end of file
diff --git a/docs/getting-started/quick-start-guides/deploy-rancher-manager/aws.md b/docs/getting-started/quick-start-guides/deploy-rancher-manager/aws.md
index 9ef522c64fd..0e16d8905ab 100644
--- a/docs/getting-started/quick-start-guides/deploy-rancher-manager/aws.md
+++ b/docs/getting-started/quick-start-guides/deploy-rancher-manager/aws.md
@@ -1,7 +1,6 @@
---
title: Rancher AWS Quick Start Guide
description: Read this step by step Rancher AWS guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached.
-weight: 100
---
The following steps will quickly deploy a Rancher server on AWS in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached.
diff --git a/docs/getting-started/quick-start-guides/deploy-rancher-manager/azure.md b/docs/getting-started/quick-start-guides/deploy-rancher-manager/azure.md
index 925bbeb56e4..f1bc8bbeb81 100644
--- a/docs/getting-started/quick-start-guides/deploy-rancher-manager/azure.md
+++ b/docs/getting-started/quick-start-guides/deploy-rancher-manager/azure.md
@@ -1,7 +1,6 @@
---
title: Rancher Azure Quick Start Guide
description: Read this step by step Rancher Azure guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached.
-weight: 115
---
The following steps will quickly deploy a Rancher server on Azure in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached.
diff --git a/docs/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md b/docs/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md
index 68a40ca475b..50a3c201dba 100644
--- a/docs/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md
+++ b/docs/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md
@@ -1,7 +1,6 @@
---
title: Rancher DigitalOcean Quick Start Guide
description: Read this step by step Rancher DigitalOcean guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached.
-weight: 120
---
The following steps will quickly deploy a Rancher server on DigitalOcean in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached.
diff --git a/docs/getting-started/quick-start-guides/deploy-rancher-manager/equinix-metal.md b/docs/getting-started/quick-start-guides/deploy-rancher-manager/equinix-metal.md
index 011fae0deb6..096677d68fc 100644
--- a/docs/getting-started/quick-start-guides/deploy-rancher-manager/equinix-metal.md
+++ b/docs/getting-started/quick-start-guides/deploy-rancher-manager/equinix-metal.md
@@ -1,6 +1,5 @@
---
title: Rancher Equinix Metal Quick Start
-weight: 250
---
## This tutorial walks you through the following:
diff --git a/docs/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md b/docs/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md
index 78dd49ff065..9e29ed96802 100644
--- a/docs/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md
+++ b/docs/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md
@@ -1,7 +1,6 @@
---
title: Rancher GCP Quick Start Guide
description: Read this step by step Rancher GCP guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached.
-weight: 130
---
The following steps will quickly deploy a Rancher server on GCP in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached.
diff --git a/docs/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md b/docs/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md
index 6d2dc9190bb..7ae7dca7da2 100644
--- a/docs/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md
+++ b/docs/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md
@@ -1,6 +1,5 @@
---
title: Helm CLI Quick Start
-weight: 300
---
import Tabs from '@theme/Tabs';
diff --git a/docs/getting-started/quick-start-guides/deploy-rancher-manager/hetzner-cloud.md b/docs/getting-started/quick-start-guides/deploy-rancher-manager/hetzner-cloud.md
index 2bfa4133ad2..365f956c33f 100644
--- a/docs/getting-started/quick-start-guides/deploy-rancher-manager/hetzner-cloud.md
+++ b/docs/getting-started/quick-start-guides/deploy-rancher-manager/hetzner-cloud.md
@@ -1,7 +1,6 @@
---
title: Rancher Hetzner Cloud Quick Start Guide
description: Read this step by step Rancher Hetzner Cloud guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached.
-weight: 140
---
The following steps will quickly deploy a Rancher server on Hetzner Cloud in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached.
diff --git a/docs/getting-started/quick-start-guides/deploy-rancher-manager/outscale-qs.md b/docs/getting-started/quick-start-guides/deploy-rancher-manager/outscale-qs.md
index 9f41b777e0d..6d1bbde8ab0 100644
--- a/docs/getting-started/quick-start-guides/deploy-rancher-manager/outscale-qs.md
+++ b/docs/getting-started/quick-start-guides/deploy-rancher-manager/outscale-qs.md
@@ -1,7 +1,6 @@
---
title: Rancher Outscale Quick Start Guide
description: Read this step by step Rancher Outscale guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached.
-weight: 140
---
The following steps will quickly deploy a Rancher server on Outscale in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached.
diff --git a/docs/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md b/docs/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md
index 5c2be8ffdf4..23520f816b9 100644
--- a/docs/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md
+++ b/docs/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md
@@ -1,6 +1,5 @@
---
title: Vagrant Quick Start
-weight: 200
---
The following steps quickly deploy a Rancher Server with a single node cluster attached.
diff --git a/docs/getting-started/quick-start-guides/deploy-workloads/nodeports.md b/docs/getting-started/quick-start-guides/deploy-workloads/nodeports.md
index b295f7fdafe..2cd5f99d3e9 100644
--- a/docs/getting-started/quick-start-guides/deploy-workloads/nodeports.md
+++ b/docs/getting-started/quick-start-guides/deploy-workloads/nodeports.md
@@ -1,6 +1,5 @@
---
title: Workload with NodePort Quick Start
-weight: 200
---
### Prerequisite
diff --git a/docs/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md b/docs/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md
index d7d368c830f..b293b362b04 100644
--- a/docs/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md
+++ b/docs/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md
@@ -1,6 +1,5 @@
---
title: Workload with Ingress Quick Start
-weight: 100
---
### Prerequisite
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
index c1e4a05a3b0..3ea150abea4 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
@@ -1,6 +1,5 @@
---
title: Configure Active Directory (AD)
-weight: 1112
---
If your organization uses Microsoft Active Directory as central user repository, you can configure Rancher to communicate with an Active Directory server to authenticate users. This allows Rancher admins to control access to clusters and projects based on users and groups managed externally in the Active Directory, while allowing end-users to authenticate with their AD credentials when logging in to the Rancher UI.
@@ -25,9 +24,9 @@ Note however, that in some locked-down Active Directory configurations this defa
- If the certificate used by the AD server is self-signed or not from a recognized certificate authority, make sure have at hand the CA certificate (concatenated with any intermediate certificates) in PEM format. You will have to paste in this certificate during the configuration so that Rancher is able to validate the certificate chain.
-- Upon an upgrade to v2.6.0, authenticating via Rancher against an active directory using TLS can fail if the certificates on the AD server do not support SAN attributes. This is a check enabled by default in Go v1.15.
+- Upon an upgrade to v2.6.0, authenticating via Rancher against an active directory using TLS can fail if the certificates on the AD server do not support SAN attributes. This is a check enabled by default in Go v1.15.
- - The error received is "Error creating SSL connection: LDAP Result Code 200 "Network Error": x509: certificate relies on legacy Common Name field, use SANs or temporarily enable Common Name matching with GODEBUG=x509ignoreCN=0".
+ - The error received is "Error creating SSL connection: LDAP Result Code 200 "Network Error": x509: certificate relies on legacy Common Name field, use SANs or temporarily enable Common Name matching with GODEBUG=x509ignoreCN=0".
- To resolve the error, update or replace the certificates on the AD server with new ones that support the SAN attribute. Alternatively, this error can be ignored by setting `GODEBUG=x509ignoreCN=0` as an environment variable to Rancher server container.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
index 3035e98c56f..a9c609f9f58 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
@@ -1,6 +1,5 @@
---
title: Configure Azure AD
-weight: 1115
---
import Tabs from '@theme/Tabs';
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
index 15ddf16ddfb..697c5399905 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
@@ -1,6 +1,5 @@
---
title: Configure FreeIPA
-weight: 1114
---
If your organization uses FreeIPA for user authentication, you can configure Rancher to allow your users to login using their FreeIPA credentials.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
index 7e4baf95a83..9fdc0985220 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
@@ -1,6 +1,5 @@
---
title: Configure GitHub
-weight: 1116
---
In environments using GitHub, you can configure Rancher to allow sign on using GitHub credentials.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
index e442c7582d0..d0d6f11ed08 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
@@ -1,6 +1,5 @@
---
title: Configure Google OAuth
-weight: 10
---
If your organization uses G Suite for user authentication, you can configure Rancher to allow your users to log in using their G Suite credentials.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md
index 146e834e48f..0e6d09963de 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md
@@ -1,7 +1,6 @@
---
title: Configure Keycloak (OIDC)
description: Create a Keycloak OpenID Connect (OIDC) client and configure Rancher to work with Keycloak. By the end your users will be able to sign into Rancher using their Keycloak logins
-weight: 1200
---
If your organization uses [Keycloak Identity Provider (IdP)](https://www.keycloak.org) for user authentication, you can configure Rancher to allow your users to log in using their IdP credentials. Rancher supports integration with Keycloak using the OpenID Connect (OIDC) protocol and the SAML protocol. Both implementations are functionally equivalent when used with Rancher. This page describes the process to configure Rancher to work with Keycloak using the OIDC protocol.
@@ -22,7 +21,7 @@ If you have an existing configuration using the SAML protocol and want to switch
`Client Protocol` | `openid-connect`
`Access Type` | `confidential`
`Valid Redirect URI` | `https://yourRancherHostURL/verify-auth`
-
+
- In the new OIDC client, create [Mappers](https://www.keycloak.org/docs/latest/server_admin/#_protocol-mappers) to expose the users fields.
- Create a new "Groups Mapper" with the settings below.
@@ -65,7 +64,7 @@ If you have an existing configuration using the SAML protocol and want to switch
Rancher redirects you to the IdP login page. Enter credentials that authenticate with Keycloak IdP to validate your Rancher Keycloak configuration.
:::note
-
+
You may need to disable your popup blocker to see the IdP login page.
:::
@@ -109,7 +108,7 @@ This section describes the process to transition from using Rancher with Keycloa
### Reconfigure Rancher
-Before configuring Rancher to use Keycloak (OIDC), Keycloak (SAML) must be first disabled.
+Before configuring Rancher to use Keycloak (OIDC), Keycloak (SAML) must be first disabled.
1. In the Rancher UI, click **☰ > Users & Authentication**.
1. In the left navigation bar, click **Auth Provider**.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md
index 59edcd72683..e13be347a2c 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md
@@ -1,7 +1,6 @@
---
title: Configure Keycloak (SAML)
description: Create a Keycloak SAML client and configure Rancher to work with Keycloak. By the end your users will be able to sign into Rancher using their Keycloak logins
-weight: 1200
---
import Tabs from '@theme/Tabs';
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
index 96de7afcf60..69e0d75a57e 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
@@ -1,6 +1,5 @@
---
title: Configure Okta (SAML)
-weight: 1210
---
If your organization uses Okta Identity Provider (IdP) for user authentication, you can configure Rancher to allow your users to log in using their IdP credentials.
@@ -14,7 +13,7 @@ Okta integration only supports Service Provider initiated logins.
In Okta, create a SAML Application with the settings below. See the [Okta documentation](https://developer.okta.com/standards/SAML/setting_up_a_saml_application_in_okta) for help.
-Setting | Value
+Setting | Value
------------|------------
`Single Sign on URL` | `https://yourRancherHostURL/v1-saml/okta/saml/acs`
`Audience URI (SP Entity ID)` | `https://yourRancherHostURL/v1-saml/okta/saml/metadata`
@@ -37,9 +36,9 @@ Setting | Value
| Metadata XML | The `Identity Provider metadata` file that you find in the application `Sign On` section. |
:::tip
-
+
You can generate a key/certificate pair using an openssl command. For example:
-
+
```
openssl req -x509 -sha256 -nodes -days 365 -newkey rsa:2048 -keyout myservice.key -out myservice.crt
```
@@ -52,11 +51,11 @@ Setting | Value
Rancher redirects you to the IdP login page. Enter credentials that authenticate with Okta IdP to validate your Rancher Okta configuration.
:::note
-
+
If nothing seems to happen, it's likely because your browser blocked the pop-up. Make sure you disable the pop-up blocker for your rancher domain and whitelist it in any other extensions you might utilize.
:::
-
+
**Result:** Rancher is configured to work with Okta. Your users can now sign into Rancher using their Okta logins.
:::note SAML Provider Caveats:
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
index f165655328c..9af6e3f212b 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
@@ -1,6 +1,5 @@
---
title: Configure PingIdentity (SAML)
-weight: 1200
---
If your organization uses Ping Identity Provider (IdP) for user authentication, you can configure Rancher to allow your users to log in using their IdP credentials.
@@ -46,11 +45,11 @@ Note that these URLs will not return valid data until the authentication configu
Rancher redirects you to the IdP login page. Enter credentials that authenticate with Ping IdP to validate your Rancher PingIdentity configuration.
:::note
-
+
You may have to disable your popup blocker to see the IdP login page.
:::
-
+
**Result:** Rancher is configured to work with PingIdentity. Your users can now sign into Rancher using their PingIdentity logins.
:::note SAML Provider Caveats:
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
index b7dea954681..4abe2c60131 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
@@ -1,6 +1,5 @@
---
title: Local Authentication
-weight: 1111
---
Local authentication is the default until you configure an external authentication provider. Local authentication is where Rancher stores the user information, i.e. names and passwords, of who can log in to Rancher. By default, the `admin` user that logs in to Rancher for the first time is a local user.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
index 8d9ebd1f42e..7affc79bf1e 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
@@ -1,6 +1,5 @@
---
title: Users and Groups
-weight: 1
---
Rancher relies on users and groups to determine who is allowed to log in to Rancher and which resources they can access. When you configure an external authentication provider, users from that provider will be able to log in to your Rancher server. When a user logs in, the authentication provider will supply your Rancher server with a list of groups to which the user belongs.
@@ -30,7 +29,7 @@ Whenever a user logs in to the UI using an authentication provider, Rancher auto
### Automatically Refreshing User Information
-Rancher will periodically refresh the user information even before a user logs in through the UI. You can control how often Rancher performs this refresh.
+Rancher will periodically refresh the user information even before a user logs in through the UI. You can control how often Rancher performs this refresh.
Two settings control this behavior:
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
index 9bde44ef331..c280d653eb9 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
@@ -1,66 +1,65 @@
---
title: 1. Configuring Microsoft AD FS for Rancher
-weight: 1205
---
-Before configuring Rancher to support AD FS users, you must add Rancher as a [relying party trust](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/technical-reference/understanding-key-ad-fs-concepts) in AD FS.
+Before configuring Rancher to support AD FS users, you must add Rancher as a [relying party trust](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/technical-reference/understanding-key-ad-fs-concepts) in AD FS.
1. Log into your AD server as an administrative user.
1. Open the **AD FS Management** console. Select **Add Relying Party Trust..**. from the **Actions** menu and click **Start**.
-
+

1. Select **Enter data about the relying party manually** as the option for obtaining data about the relying party.

-
+
1. Enter your desired **Display name** for your Relying Party Trust. For example, `Rancher`.

-
+
1. Select **AD FS profile** as the configuration profile for your relying party trust.
-
+

-
+
1. Leave the **optional token encryption certificate** empty, as Rancher AD FS will not be using one.
-
+

-
+
1. Select **Enable support for the SAML 2.0 WebSSO protocol**
and enter `https:///v1-saml/adfs/saml/acs` for the service URL.
-
+

-
+
1. Add `https:///v1-saml/adfs/saml/metadata` as the **Relying party trust identifier**.
-
+

-
+
1. This tutorial will not cover multi-factor authentication; please refer to the [Microsoft documentation](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/operations/configure-additional-authentication-methods-for-ad-fs) if you would like to configure multi-factor authentication.
-
+

-
+
1. From **Choose Issuance Authorization RUles**, you may select either of the options available according to use case. However, for the purposes of this guide, select **Permit all users to access this relying party**.
-
+

1. After reviewing your settings, select **Next** to add the relying party trust.
-
+

-
+
1. Select **Open the Edit Claim Rules..**. and click **Close**.
-
+

-
+
1. On the **Issuance Transform Rules** tab, click **Add Rule..**..
-
+

-
+
1. Select **Send LDAP Attributes as Claims** as the **Claim rule template**.

-
+
1. Set the **Claim rule name** to your desired name (for example, `Rancher Attributes`) and select **Active Directory** as the **Attribute store**. Create the following mapping to reflect the table below:
| LDAP Attribute | Outgoing Claim Type |
@@ -72,7 +71,7 @@ Before configuring Rancher to support AD FS users, you must add Rancher as a [re

-1. Download the `federationmetadata.xml` from your AD server at:
+1. Download the `federationmetadata.xml` from your AD server at:
```
https:///federationmetadata/2007-06/federationmetadata.xml
```
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
index 313b6b842b4..fc7227f38e9 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
@@ -1,12 +1,11 @@
---
title: 2. Configuring Rancher for Microsoft AD FS
-weight: 1205
---
After you complete [Configuring Microsoft AD FS for Rancher](configure-ms-adfs-for-rancher.md), enter your AD FS information into Rancher to allow AD FS users to authenticate with Rancher.
:::note Important Notes For Configuring Your ADFS Server:
-
+
- The SAML 2.0 WebSSO Protocol Service URL is: `https:///v1-saml/adfs/saml/acs`
- The Relying Party Trust identifier URL is: `https:///v1-saml/adfs/saml/metadata`
- You must export the `federationmetadata.xml` file from your AD FS server. This can be found at: `https:///federationmetadata/2007-06/federationmetadata.xml`
@@ -21,12 +20,12 @@ After you complete [Configuring Microsoft AD FS for Rancher](configure-ms-adfs-f
Rancher redirects you to the AD FS login page. Enter credentials that authenticate with Microsoft AD FS to validate your Rancher AD FS configuration.
- :::note
-
+ :::note
+
You may have to disable your popup blocker to see the AD FS login page.
:::
-
+
**Result:** Rancher is configured to work with MS FS. Your users can now sign into Rancher using their MS FS logins.
# Configuration
@@ -42,7 +41,7 @@ After you complete [Configuring Microsoft AD FS for Rancher](configure-ms-adfs-f
| Metadata XML | The `federationmetadata.xml` file exported from your AD FS server.
You can find this file at `https:///federationmetadata/2007-06/federationmetadata.xml`. |
-
+
:::tip
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
index 746cb06ae73..edeb387c61f 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
@@ -1,9 +1,8 @@
---
title: Group Permissions with Shibboleth and OpenLDAP
-weight: 1
---
-This page provides background information and context for Rancher users who intend to set up the Shibboleth authentication provider in Rancher.
+This page provides background information and context for Rancher users who intend to set up the Shibboleth authentication provider in Rancher.
Because Shibboleth is a SAML provider, it does not support searching for groups. While a Shibboleth integration can validate user credentials, it can't be used to assign permissions to groups in Rancher without additional configuration.
@@ -29,4 +28,3 @@ When a member of the OpenLDAP group logs in to Rancher, she is redirected to Shi
Shibboleth validates her credentials, and retrieves user attributes from OpenLDAP, including groups. Then Shibboleth sends a SAML assertion to Rancher including the user attributes. Rancher uses the group data so that she can access all of the resources and permissions that her groups have permissions for.

-
\ No newline at end of file
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
index 7803f1f6b8a..9cc723c101a 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
@@ -1,6 +1,5 @@
---
title: Cluster Drivers
-weight: 1
---
Cluster drivers are used to create clusters in a [hosted Kubernetes provider](../../../../pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md), such as Google GKE. The availability of which cluster driver to display when creating clusters is defined by the cluster driver's status. Only `active` cluster drivers will be displayed as an option for creating clusters. By default, Rancher is packaged with several existing cloud provider cluster drivers, but you can also add custom cluster drivers to Rancher.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
index 71e2af898b3..696da5032e8 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
@@ -1,6 +1,5 @@
---
title: Node Drivers
-weight: 2
---
Node drivers are used to provision hosts, which Rancher uses to launch and manage Kubernetes clusters. A node driver is the same as a [Docker Machine driver](https://docs.docker.com/machine/drivers/). The availability of which node driver to display when creating node templates is defined based on the node driver's status. Only `active` node drivers will be displayed as an option for creating node templates. By default, Rancher is packaged with many existing Docker Machine drivers, but you can also create custom node drivers to add to Rancher.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
index 2d0f8d92ca3..a0dfc043354 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
@@ -1,6 +1,5 @@
---
title: Access and Sharing
-weight: 31
---
If you are an RKE template owner, you can share it with users or groups of users, who can then use the template to create clusters.
@@ -12,7 +11,7 @@ When you share a template, each user can have one of two access levels:
- **Owner:** This user can update, delete, and share the templates that they own. The owner can also share the template with other users.
- **User:** These users can create clusters using the template. They can also upgrade those clusters to new revisions of the same template. When you share a template as **Make Public (read-only),** all users in your Rancher setup have the User access level for the template.
-If you create a template, you automatically become an owner of that template.
+If you create a template, you automatically become an owner of that template.
If you want to delegate responsibility for updating the template, you can share ownership of the template. For details on how owners can modify templates, refer to the [documentation about revising templates.](manage-rke1-templates.md)
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
index 1e292ea4f9d..a8f7a7b8b62 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
@@ -1,6 +1,5 @@
---
title: Applying Templates
-weight: 50
---
You can create a cluster from an RKE template that you created, or from a template that has been [shared with you.](access-or-share-templates.md)
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
index 8326c06c401..ce0a3e8e8d1 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
@@ -1,6 +1,5 @@
---
title: Template Creator Permissions
-weight: 10
---
Administrators have the permission to create RKE templates, and only administrators can give that permission to other users.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
index ac1a2f21597..4b64553171a 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
@@ -1,6 +1,5 @@
---
title: Template Enforcement
-weight: 32
---
This section describes how template administrators can enforce templates in Rancher, restricting the ability of users to create clusters without a template.
@@ -26,11 +25,11 @@ To require new clusters to use an RKE template, administrators can turn on RKE t
1. Set the value to **True** and click **Save**.
:::note Important:
-
+
When the admin sets the `cluster-template-enforcement` to True, they also need to share the `clusterTemplates` with users so that users can select one of these templates to create the cluster.
:::
-
+
**Result:** All clusters provisioned by Rancher must use a template, unless the creator is an administrator.
## Disabling RKE Template Enforcement
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
index 81b8015dc6c..a3d5da6081a 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
@@ -1,6 +1,5 @@
---
title: Example Scenarios
-weight: 5
---
These example scenarios describe how an organization could use templates to standardize cluster creation.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
index 749f2173717..1a224d34b87 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
@@ -1,6 +1,5 @@
---
title: RKE Templates and Infrastructure
-weight: 90
---
In Rancher, RKE templates are used to provision Kubernetes and define Rancher settings, while node templates are used to provision nodes.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
index 0edcf638c63..d40856a7ee4 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
@@ -1,6 +1,5 @@
---
title: Creating and Revising RKE Templates
-weight: 32
---
This section describes how to manage RKE templates and revisions. You an create, share, update, and delete templates from the **Cluster Management** view under **RKE1 Configuration > RKE Templates**.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
index 3efe34d5ea7..31762ada3d7 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
@@ -1,6 +1,5 @@
---
title: Overriding Template Settings
-weight: 33
---
When a user creates an RKE template, each setting in the template has a switch in the Rancher UI that indicates if users can override the setting. This switch marks those settings as **Allow User Override**.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
index 2e0f61a571d..c88a8725755 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
@@ -1,6 +1,5 @@
---
title: Pod Security Policies
-weight: 60
---
_Pod Security Policies_ (or PSPs) are objects that control security-sensitive aspects of pod specification (like root privileges).
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding.md
index fbfafbc3bfa..20e1efa9941 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding.md
@@ -1,6 +1,5 @@
---
title: Custom Branding
-weight: 90
---
import Tabs from '@theme/Tabs';
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
index 3051988697a..0b909ab1dae 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
@@ -1,6 +1,5 @@
---
title: Configuring a Global Default Private Registry
-weight: 40
---
You might want to use a private container registry to share your custom base images within your organization. With a private registry, you can keep a private, consistent, and centralized source of truth for the container images that are used in your clusters.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md
index 5097a049aa7..fadc95c8f69 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md
@@ -1,6 +1,5 @@
---
title: Cluster Templates
-weight: 100
---
Cluster templates encompass both Kubernetes configuration and node pool configuration, allowing a single template to contain all the information Rancher needs to provision new nodes in a cloud provider and install Kubernetes on those nodes.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
index 8657dad1c72..96d99ba51d9 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
@@ -1,6 +1,5 @@
---
title: Cluster and Project Roles
-weight: 1127
---
import Tabs from '@theme/Tabs';
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
index fcacb047c6f..aa9c4a9a90a 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
@@ -1,6 +1,5 @@
---
title: Custom Roles
-weight: 1128
---
Within Rancher, _roles_ determine what actions a user can make within a cluster or project.
@@ -44,7 +43,7 @@ The steps to add custom roles differ depending on the version of Rancher.
1. Use the **Grant Resources** options to assign individual [Kubernetes API endpoints](https://kubernetes.io/docs/reference/) to the role.
> When viewing the resources associated with default roles created by Rancher, if there are multiple Kubernetes API resources on one line item, the resource will have `(Custom)` appended to it. These are not custom resources but just an indication that there are multiple Kubernetes API resources as one resource.
-
+
> The Resource text field provides a method to search for pre-defined Kubernetes API resources, or enter a custom resource name for the grant. The pre-defined or `(Custom)` resource must be selected from the dropdown, after entering a resource name into this field.
You can also choose the individual cURL methods (`Create`, `Delete`, `Get`, etc.) available for use with each endpoint you assign.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
index 73d98c50167..2351eb2b072 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
@@ -1,6 +1,5 @@
---
title: Global Permissions
-weight: 1126
---
_Permissions_ are individual access rights that you can assign when selecting a custom permission for a user.
@@ -35,8 +34,8 @@ CATTLE_RESTRICTED_DEFAULT_ADMIN=true
The following table lists the permissions and actions that a `restricted-admin` should have in comparison with the `Administrator` and `Standard User` roles:
| Category | Action | Global Admin | Standard User | Restricted Admin | Notes for Restricted Admin role |
-| -------- | ------ | ------------ | ------------- | ---------------- | ------------------------------- |
-| Local Cluster functions | Manage Local Cluster (List, Edit, Import Host) | Yes | No | No | |
+| -------- | ------ | ------------ | ------------- | ---------------- | ------------------------------- |
+| Local Cluster functions | Manage Local Cluster (List, Edit, Import Host) | Yes | No | No | |
| | Create Projects/namespaces | Yes | No | No | |
| | Add cluster/project members | Yes | No | No | |
| | Deploy MulticlusterApp in local cluster | Yes | No | No | |
@@ -111,7 +110,7 @@ You can [change the default global permissions to meet your needs.](#configuring
When a user logs into Rancher using an external authentication provider for the first time, they are automatically assigned the **New User Default** global permissions. By default, Rancher assigns the **Standard User** permission for new users.
-To see the default permissions for new users,
+To see the default permissions for new users,
1. In the upper left corner, click **☰ > Users & Authentication**.
1. In the left navigation bar, click **Roles**.
@@ -214,7 +213,7 @@ For new users, the new permissions take effect when the users log in to Rancher
If a user is removed from the external authentication provider group, they would lose their permissions from the custom global role that was assigned to the group. They would continue to have any remaining roles that were assigned to them, which would typically include the roles marked as **New User Default**. Rancher will remove the permissions that are associated with the group when the user logs out, or when an administrator [refreshes group memberships,](#refreshing-group-memberships) whichever comes first.
-:::note Prerequisites:
+:::note Prerequisites:
You can only assign a global role to a group if:
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
index e91770b429a..5f08462fb8b 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
@@ -1,6 +1,5 @@
---
title: Locked Roles
-weight: 1129
---
You can set roles to a status of `locked`. Locking roles prevent them from being assigned to users in the future.
diff --git a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
index 9c438d9b2b2..11661ec90c3 100644
--- a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
+++ b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
@@ -1,6 +1,5 @@
---
title: 1. Enable Istio in the Cluster
-weight: 1
---
:::note Prerequisites:
@@ -17,7 +16,7 @@ weight: 1
1. Click **Apps & Marketplace**.
1. Click **Charts**.
1. Click **Istio**.
-1. If you have not already installed your own monitoring app, you will be prompted to install the rancher-monitoring app. Optional: Set your Selector or Scrape config options on rancher-monitoring app install.
+1. If you have not already installed your own monitoring app, you will be prompted to install the rancher-monitoring app. Optional: Set your Selector or Scrape config options on rancher-monitoring app install.
1. Optional: Configure member access and [resource limits](../../../explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md) for the Istio components. Ensure you have enough resources on your worker nodes to enable Istio.
1. Optional: Make additional configuration changes to values.yaml if needed.
1. Optional: Add additional resources or configuration via the [overlay file.](../../../pages-for-subheaders/configuration-options.md#overlay-file)
diff --git a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md
index ed6c93471b1..2ced1c1591b 100644
--- a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md
+++ b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md
@@ -1,6 +1,5 @@
---
title: 2. Enable Istio in a Namespace
-weight: 2
---
You will need to manually enable Istio in each namespace that you want to be tracked or controlled by Istio. When Istio is enabled in a namespace, the Envoy sidecar proxy will be automatically injected into all new workloads that are deployed in the namespace.
diff --git a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
index da00a48ea04..741130d49a7 100644
--- a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
+++ b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
@@ -1,6 +1,5 @@
---
title: 6. Generate and View Traffic
-weight: 7
---
This section describes how to view the traffic that is being managed by Istio.
@@ -20,7 +19,7 @@ To see the traffic graph,
1. In the cluster where Istio is installed, click **Istio** in the left navigation bar.
1. Click the **Kiali** link.
1. Click on **Graph** in the side nav.
-1. Change the namespace in the **Namespace** dropdown to view the traffic for each namespace.
+1. Change the namespace in the **Namespace** dropdown to view the traffic for each namespace.
If you refresh the URL to the BookInfo app several times, you should be able to see green arrows on the Kiali graph showing traffic to `v1` and `v3` of the `reviews` service. The control panel on the right side of the graph lets you configure details including how many minutes of the most recent traffic should be shown on the graph.
diff --git a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md
index d80ea26e648..0e932884787 100644
--- a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md
+++ b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md
@@ -1,9 +1,8 @@
---
title: 4. Set up the Istio Gateway
-weight: 5
---
-The gateway to each cluster can have its own port or load balancer, which is unrelated to a service mesh. By default, each Rancher-provisioned cluster has one NGINX ingress controller allowing traffic into the cluster.
+The gateway to each cluster can have its own port or load balancer, which is unrelated to a service mesh. By default, each Rancher-provisioned cluster has one NGINX ingress controller allowing traffic into the cluster.
You can use the Nginx Ingress controller with or without Istio installed. If this is the only gateway to your cluster, Istio will be able to route traffic from service to service, but Istio will not be able to receive traffic from outside the cluster.
@@ -13,13 +12,13 @@ You will also need to set up a Kubernetes gateway for your services. This Kubern
You can route traffic into the service mesh with a load balancer or use Istio's NodePort gateway. This section describes how to set up the NodePort gateway.
-For more information on the Istio gateway, refer to the [Istio documentation.](https://istio.io/docs/reference/config/networking/v1alpha3/gateway/)
+For more information on the Istio gateway, refer to the [Istio documentation.](https://istio.io/docs/reference/config/networking/v1alpha3/gateway/)

# Enable an Istio Gateway
-The ingress gateway is a Kubernetes service that will be deployed in your cluster. The Istio Gateway allows for more extensive customization and flexibility.
+The ingress gateway is a Kubernetes service that will be deployed in your cluster. The Istio Gateway allows for more extensive customization and flexibility.
1. Click **☰ > Cluster Management**.
1. Go to the cluster that you created and click **Explore**.
@@ -120,7 +119,7 @@ To get the ingress gateway URL and port,
1. Click **☰ > Cluster Management**.
1. Go to the cluster that you created and click **Explore**.
1. In the left navigation bar, click **Workload**.
-1. Scroll down to the `istio-system` namespace.
+1. Scroll down to the `istio-system` namespace.
1. Within `istio-system`, there is a workload named `istio-ingressgateway`. Under the name of this workload, you should see links, such as `80/tcp`.
1. Click one of those links. This should show you the URL of the ingress gateway in your web browser. Append `/productpage` to the URL.
@@ -141,7 +140,7 @@ In the gateway resource, the selector refers to Istio's default ingress controll
1. Click **☰ > Cluster Management**.
1. Go to the cluster that you created and click **Explore**.
1. In the left navigation bar, click **Workload**.
-1. Scroll down to the `istio-system` namespace.
+1. Scroll down to the `istio-system` namespace.
1. Within `istio-system`, there is a workload named `istio-ingressgateway`. Click the name of this workload and go to the **Labels and Annotations** section. You should see that it has the key `istio` and the value `ingressgateway`. This confirms that the selector in the Gateway resource matches Istio's default ingress controller.
### [Next: Set up Istio's Components for Traffic Management](set-up-traffic-management.md)
diff --git a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md
index 8b7bd4c233c..38e7ff642a3 100644
--- a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md
+++ b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md
@@ -1,6 +1,5 @@
---
title: 5. Set up Istio's Components for Traffic Management
-weight: 6
---
A central advantage of traffic management in Istio is that it allows dynamic request routing. Some common applications for dynamic request routing include canary deployments and blue/green deployments. The two key resources in Istio traffic management are *virtual services* and *destination rules*.
diff --git a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md
index 9eb7ed930c0..e885762ba9e 100644
--- a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md
+++ b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md
@@ -1,11 +1,10 @@
---
title: 3. Add Deployments and Services with the Istio Sidecar
-weight: 4
---
:::note Prerequisite:
-To enable Istio for a workload, the cluster and namespace must have the Istio app installed.
+To enable Istio for a workload, the cluster and namespace must have the Istio app installed.
:::
@@ -30,7 +29,7 @@ There are a few ways to add new **Deployments** in your namespace:
1. Click **Create**.
1. Click **Deployment**.
1. Fill out the form, or **Edit as Yaml**.
-1. Click **Create**.
+1. Click **Create**.
To add a **Service** to your namespace:
@@ -40,12 +39,12 @@ To add a **Service** to your namespace:
1. Click **Create**.
1. Select the type of service that you want.
1. Fill out the form, or **Edit as Yaml**.
-1. Click **Create**
+1. Click **Create**
You can also create deployments and services using the kubectl **shell**
1. Run `kubectl create -f .yaml` if your file is stored locally in the cluster
-1. Or run `cat<< EOF | kubectl apply -f -`, paste the file contents into the terminal, then run `EOF` to complete the command.
+1. Or run `cat<< EOF | kubectl apply -f -`, paste the file contents into the terminal, then run `EOF` to complete the command.
### Example Deployments and Services
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
index 11a3f812588..15f63656164 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
@@ -1,6 +1,5 @@
---
title: Adding Users to Clusters
-weight: 2020
---
If you want to provide a user with access and permissions to _all_ projects, nodes, and resources within a cluster, assign the user a cluster membership.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
index 203747cf301..07cfbf72dc5 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
@@ -1,6 +1,5 @@
---
title: How the Authorized Cluster Endpoint Works
-weight: 2015
---
This section describes how the kubectl CLI, the kubeconfig file, and the authorized cluster endpoint work together to allow you to access a downstream Kubernetes cluster directly, without authenticating through the Rancher server. It is intended to provide background information and context to the instructions for [how to set up kubectl to directly access a cluster.](use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster)
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
index c9dce4866f0..32fd0519bb5 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
@@ -1,7 +1,6 @@
---
title: "Access a Cluster with Kubectl and kubeconfig"
description: "Learn how you can access and manage your Kubernetes clusters using kubectl with kubectl Shell or with kubectl CLI and kubeconfig file. A kubeconfig file is used to configure access to Kubernetes. When you create a cluster with Rancher, it automatically creates a kubeconfig for your cluster."
-weight: 2010
---
This section describes how to manipulate your downstream Kubernetes cluster with kubectl from the Rancher UI or from your workstation.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
index 574eba390bf..b249eacc8a2 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
@@ -1,11 +1,10 @@
---
title: Adding a Pod Security Policy
-weight: 80
---
:::note Prerequisite:
-The options below are available only for clusters that are [launched using RKE.](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md)
+The options below are available only for clusters that are [launched using RKE.](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md)
:::
@@ -18,7 +17,7 @@ You can assign a pod security policy when you provision a cluster. However, if y
1. From **Pod Security Policy Support**, select **Enabled**.
:::note
-
+
This option is only available for clusters [provisioned by RKE](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md).
:::
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
index 0118b990014..d3b71098f63 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
@@ -1,6 +1,5 @@
---
title: Assigning Pod Security Policies
-weight: 2260
---
_Pod Security Policies_ are objects that control security-sensitive aspects of pod specification (like root privileges).
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
index 61128cf0300..c712761724e 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
@@ -1,7 +1,6 @@
---
title: Removing Kubernetes Components from Nodes
description: Learn about cluster cleanup when removing nodes from your Rancher-launched Kubernetes cluster. What is removed, how to do it manually
-weight: 2055
---
import Tabs from '@theme/Tabs';
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
index 6e1f87e79e1..88661107d97 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
@@ -1,6 +1,5 @@
---
title: Cloning Clusters
-weight: 2035
---
If you have a cluster in Rancher that you want to use as a template for creating similar clusters, you can use Rancher CLI to clone the cluster's configuration, edit it, and then use it to quickly launch the cloned cluster.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
index 29d5a38aa93..da276061637 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
@@ -1,6 +1,5 @@
---
title: GlusterFS Volumes
-weight: 5000
---
:::note
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
index b008843be52..27dff941ce7 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
@@ -1,6 +1,5 @@
---
title: How Persistent Storage Works
-weight: 1
---
A persistent volume (PV) is a piece of storage in the Kubernetes cluster, while a persistent volume claim (PVC) is a request for storage.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
index 232511bb339..23487786daf 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
@@ -1,6 +1,5 @@
---
title: Dynamically Provisioning New Storage in Rancher
-weight: 2
---
This section describes how to provision new persistent storage for workloads in Rancher.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
index 12f8d0f8e22..b99efdba76b 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
@@ -1,6 +1,5 @@
---
title: iSCSI Volumes
-weight: 6000
---
In [Rancher Launched Kubernetes clusters](../../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) that store data on iSCSI volumes, you may experience an issue where kubelets fail to automatically connect with iSCSI volumes. This failure is likely due to an incompatibility issue involving the iSCSI initiator tool. You can resolve this issue by installing the iSCSI initiator tool on each of your cluster nodes.
@@ -18,7 +17,7 @@ If you encounter this issue, you can work around it by installing the initiator
After installing the initiator tool on your nodes, edit the YAML for your cluster, editing the kubelet configuration to mount the iSCSI binary and configuration, as shown in the sample below.
:::note Notes
-
+
- Before updating your Kubernetes YAML to mount the iSCSI binary and configuration, make sure either the `open-iscsi` (deb) or `iscsi-initiator-utils` (yum) package is installed on your cluster nodes. If this package isn't installed _before_ the bind mounts are created in your Kubernetes YAML, Docker will automatically create the directories and files on each node and will not allow the package install to succeed.
- The example YAML below does not apply to K3s, but only to RKE clusters. Since the K3s kubelet does not run in a container, adding extra binds is not necessary. However, all iSCSI tools must still be installed on your K3s nodes.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
index 53fe7c9297b..7e1365e9963 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
@@ -1,6 +1,5 @@
---
title: Setting up Existing Storage
-weight: 1
---
This section describes how to set up existing persistent storage for workloads in Rancher.
@@ -26,7 +25,7 @@ To set up storage, follow these steps:
Creating a persistent volume in Rancher will not create a storage volume. It only creates a Kubernetes resource that maps to an existing volume. Therefore, before you can create a persistent volume as a Kubernetes resource, you must have storage provisioned.
-The steps to set up a persistent storage device will differ based on your infrastructure. We provide examples of how to set up storage using [vSphere,](../provisioning-storage-examples/vsphere-storage.md) [NFS,](../provisioning-storage-examples/nfs-storage.md) or Amazon's [EBS.](../provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)
+The steps to set up a persistent storage device will differ based on your infrastructure. We provide examples of how to set up storage using [vSphere,](../provisioning-storage-examples/vsphere-storage.md) [NFS,](../provisioning-storage-examples/nfs-storage.md) or Amazon's [EBS.](../provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)
If you have a pool of block storage, and you don't want to use a cloud provider, Longhorn could help you provide persistent storage to your Kubernetes cluster. For more information, see [this page.](../../../../../explanations/integrations-in-rancher/longhorn.md)
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
index 2f93372cb41..f54eb84df0a 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
@@ -1,6 +1,5 @@
---
title: Using an External Ceph Driver
-weight: 10
---
These instructions are about using the external Ceph driver in an RKE2 cluster. If you are using RKE, additional steps are required. For details, refer to [this section.](#using-the-ceph-driver-with-rke)
@@ -207,7 +206,7 @@ spec:
fsType: ext4
readOnly: false
EOF
-
+
kubectl apply -f ceph-rbd-pod-inline.yaml
kubectl get pod
kubectl exec pod/ceph-rbd-pod-inline -- df -k | grep rbd
@@ -232,9 +231,9 @@ spec:
- 10.85.8.118:6789
- 10.85.8.123:6789
- 10.85.8.124:6789
- pool: myPool
+ pool: myPool
image: image
- user: myPoolUser
+ user: myPoolUser
secretRef:
name: ceph-user
fsType: ext4
@@ -268,13 +267,13 @@ spec:
persistentVolumeClaim:
claimName: ceph-rbd-pvc
EOF
-
+
kubectl apply -f ceph-rbd-pod-pvc-pv-allinone.yaml
kubectl get pv,pvc,pod
kubectl exec pod/ceph-rbd-pod-pvc-pv -- df -k | grep rbd
```
-### Using RBD in Storage Classes
+### Using RBD in Storage Classes
This example is for dynamic provisioning. The ceph-csi driver is needed.
@@ -314,7 +313,7 @@ spec:
requests:
storage: 2Gi
storageClassName: ceph-rbd-sc
----
+---
apiVersion: v1
kind: Pod
metadata:
@@ -332,7 +331,7 @@ spec:
persistentVolumeClaim:
claimName: ceph-rbd-sc-pvc
EOF
-
+
kubectl apply -f ceph-rbd-pod-pvc-sc-allinone.yaml
kubectl get pv,pvc,sc,pod
kubectl exec pod/ceph-rbd-pod-pvc-sc -- df -k | grep rbd
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
index ff3707aa1cd..28c7b820aa2 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
@@ -1,6 +1,5 @@
---
title: NFS Storage
-weight: 3054
---
Before you can use the NFS storage volume plug-in with Rancher deployments, you need to provision an NFS server.
@@ -45,11 +44,11 @@ To simplify the process of managing firewall rules, use NFSv4.
```
:::tip
-
+
You can replace the IP addresses with a subnet. For example: `10.212.50.12/24`
:::
-
+
1. Update the NFS table by entering the following command:
```
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
index 97b725a39f9..3361af6b930 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
@@ -1,6 +1,5 @@
---
title: Creating Persistent Storage in Amazon's EBS
-weight: 3053
---
This section describes how to set up Amazon's Elastic Block Store in EC2.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
index 8c2b4abe82c..d2246589701 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
@@ -1,6 +1,5 @@
---
title: vSphere Storage
-weight: 3055
---
To provide stateful workloads with vSphere storage, we recommend creating a vSphereVolume StorageClass. This practice dynamically provisions vSphere storage when workloads request volumes through a PersistentVolumeClaim.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
index 3c0b9d1e19a..67954e9c237 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
@@ -1,6 +1,5 @@
---
title: Cluster Autoscaler with AWS EC2 Auto Scaling Groups
-weight: 1
---
This guide will show you how to install and use [Kubernetes cluster-autoscaler](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/) on Rancher custom clusters using AWS EC2 Auto Scaling Groups.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
index 0e7c221ad5c..43725ddb0a0 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
@@ -1,6 +1,5 @@
---
title: Nodes and Node Pools
-weight: 2030
---
After you launch a Kubernetes cluster in Rancher, you can manage individual nodes from the cluster's **Node** tab. Depending on the [option used](../../../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md) to provision the cluster, there are different node options available.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
index b822932a9de..f8a1eb535dd 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
@@ -1,7 +1,6 @@
---
title: Projects and Kubernetes Namespaces with Rancher
description: Rancher Projects ease the administrative burden of your cluster and support multi-tenancy. Learn to create projects and divide projects into Kubernetes namespaces
-weight: 2032
---
A namespace is a Kubernetes concept that allows a virtual cluster within a cluster, which is useful for dividing the cluster into separate "virtual clusters" that each have their own access control and resource quotas.
@@ -56,7 +55,7 @@ This means that when standard users with project-scoped permissions create a nam
If your permissions are restricted to the project level, it is better to [create a namespace through Rancher](../manage-projects/manage-namespaces.md) to ensure that you will have permission to access the namespace.
-If a standard user is a project owner, the user will be able to create namespaces within that project. The Rancher UI will prevent that user from creating namespaces outside the scope of the projects they have access to.
+If a standard user is a project owner, the user will be able to create namespaces within that project. The Rancher UI will prevent that user from creating namespaces outside the scope of the projects they have access to.
## About Projects
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
index e4bf50dad49..f52ecaa7408 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
@@ -1,6 +1,5 @@
---
title: Certificate Rotation
-weight: 2040
---
import Tabs from '@theme/Tabs';
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key.md b/docs/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key.md
index f2507a7d243..e637eed10f1 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key.md
@@ -1,6 +1,5 @@
---
title: Encryption Key Rotation
-weight: 2043
---
### RKE1 Encryption Key Rotation
diff --git a/docs/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md b/docs/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
index c5233655f4c..6b73c3c5ce9 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
@@ -1,6 +1,5 @@
---
title: Adding Users to Projects
-weight: 2505
---
If you want to provide a user with access and permissions to _specific_ projects and resources within a cluster, assign the user a project membership.
@@ -30,33 +29,33 @@ Following project creation, you can add users as project members so that they ca
If external authentication is configured:
- - Rancher returns users from your external authentication source as you type.
+ - Rancher returns users from your external authentication source as you type.
- A drop-down allows you to add groups instead of individual users. The dropdown only lists groups that you, the logged in user, are included in.
:::note
-
+
If you are logged in as a local user, external users do not display in your search results.
:::
-1. Assign the user or group **Project** roles.
+1. Assign the user or group **Project** roles.
[What are Project Roles?](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)
:::note Notes:
-
+
- Users assigned the `Owner` or `Member` role for a project automatically inherit the `namespace creation` role. However, this role is a [Kubernetes ClusterRole](https://kubernetes.io/docs/reference/access-authn-authz/rbac/#role-and-clusterrole), meaning its scope extends to all projects in the cluster. Therefore, users explicitly assigned the `Owner` or `Member` role for a project can create or delete namespaces in other projects they're assigned to, even with only the `Read Only` role assigned.
-
- - By default, the Rancher role of `project-member` inherits from the `Kubernetes-edit` role, and the `project-owner` role inherits from the `Kubernetes-admin` role. As such, both `project-member` and `project-owner` roles will allow for namespace management, including the ability to create and delete namespaces.
-
+
+ - By default, the Rancher role of `project-member` inherits from the `Kubernetes-edit` role, and the `project-owner` role inherits from the `Kubernetes-admin` role. As such, both `project-member` and `project-owner` roles will allow for namespace management, including the ability to create and delete namespaces.
+
- For `Custom` roles, you can modify the list of individual roles available for assignment.
-
+
- To add roles to the list, [Add a Custom Role](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md).
- To remove roles from the list, [Lock/Unlock Roles](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md).
:::
-
+
**Result:** The chosen users are added to the project.
- To revoke project membership, select the user and click **Delete**. This action deletes membership, not the user.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md b/docs/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md
index 91216961798..a52e1cb135c 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md
@@ -1,7 +1,6 @@
---
title: Rancher's CI/CD Pipelines
description: Use Rancher’s CI/CD pipeline to automatically checkout code, run builds or scripts, publish Docker images, and deploy software to users
-weight: 4000
---
Using Rancher, you can integrate with a GitHub repository to setup a continuous integration (CI) pipeline.
@@ -10,7 +9,7 @@ After configuring Rancher and GitHub, you can deploy containers running Jenkins
- Build your application from code to image.
- Validate your builds.
- Deploy your build images to your cluster.
-- Run unit tests.
+- Run unit tests.
- Run regression tests.
For details, refer to the [pipelines](../../../pages-for-subheaders/pipelines.md) section.
\ No newline at end of file
diff --git a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
index 9d7753a24f0..ef429f0509c 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
@@ -1,6 +1,5 @@
---
title: Namespaces
-weight: 2520
---
Within Rancher, you can further divide projects into different [namespaces](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/), which are virtual clusters within a project backed by a physical cluster. Should you require another level of organization beyond projects and the `default` namespace, you can use multiple namespaces to isolate applications and resources.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
index 6fa3506c692..78b9f078e86 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
@@ -1,11 +1,10 @@
---
title: Pod Security Policies
-weight: 5600
---
:::note
-These cluster options are only available for [clusters in which Rancher has launched Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md).
+These cluster options are only available for [clusters in which Rancher has launched Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md).
:::
@@ -14,7 +13,7 @@ You can always assign a pod security policy (PSP) to an existing project if you
### Prerequisites
- Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies](../authentication-permissions-and-global-configuration/create-pod-security-policies.md).
-- Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [the documentation about adding a pod security policy to a cluster](../manage-clusters/add-a-pod-security-policy.md).
+- Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [the documentation about adding a pod security policy to a cluster](../manage-clusters/add-a-pod-security-policy.md).
### Applying a Pod Security Policy
diff --git a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
index 14b26d203d2..eb00082e98b 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
@@ -1,6 +1,5 @@
---
title: How Resource Quotas Work in Rancher Projects
-weight: 1
---
Resource quotas in Rancher include the same functionality as the [native version of Kubernetes](https://kubernetes.io/docs/concepts/policy/resource-quotas/). However, in Rancher, resource quotas have been extended so that you can apply them to projects.
@@ -27,7 +26,7 @@ The resource quota includes two limits, which you set while creating or editing
This set of values configures the default quota limit available for each namespace for each specified resource.
When a namespace is created in the project without overrides, this limit is automatically bound to the namespace and enforced.
-
+
In the following diagram, a Rancher administrator wants to apply a resource quota that sets the same CPU and memory limit for every namespace in their project (`Namespace 1-4`). However, in Rancher, the administrator can set a resource quota for the project (`Project Resource Quota`) rather than individual namespaces. This quota includes resource limits for both the entire project (`Project Limit`) and individual namespaces (`Namespace Default Limit`). Rancher then propagates the `Namespace Default Limit` quotas to each namespace (`Namespace Resource Quota`) when created.
Rancher: Resource Quotas Propagating to Each Namespace
diff --git a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
index ae0e5a48b50..be183865a78 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
@@ -1,6 +1,5 @@
---
title: Overriding the Default Limit for a Namespace
-weight: 2
---
Although the **Namespace Default Limit** propagates from the project to each namespace when created, in some cases, you may need to increase (or decrease) the quotas for a specific namespace. In this situation, you can override the default limits by editing the namespace.
@@ -26,10 +25,10 @@ If there is a resource quota configured for a project, you can override the name
For more information about each **Resource Type**, see [the type reference](resource-quota-types.md).
:::note
-
+
- If a resource quota is not configured for the project, these options will not be available.
- If you enter limits that exceed the configured project limits, Rancher will not let you save your edits.
:::
-
+
**Result:** Your override is applied to the namespace's resource quota.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md
index f111346b07c..ea629b510db 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md
@@ -1,6 +1,5 @@
---
title: Resource Quota Type Reference
-weight: 4
---
When you create a resource quota, you are configuring the pool of resources available to the project. You can set the following resource limits for the following resource types.
diff --git a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md
index f059b7b51f1..4ebf4700c6c 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md
@@ -1,6 +1,5 @@
---
title: Setting Container Default Resource Limits
-weight: 3
---
When setting resource quotas, if you set anything related to CPU or Memory (i.e. limits or reservations) on a project / namespace, all containers will require a respective CPU or Memory field set during creation. See the [Kubernetes documentation](https://kubernetes.io/docs/concepts/policy/resource-quotas/#requests-vs-limits) for more details on why this is required.
@@ -24,7 +23,7 @@ Edit the container default resource limit when:
When the default container resource limit is set at a project level, the parameter will be propagated to any namespace created in the project after the limit has been set. For any existing namespace in a project, this limit will not be automatically propagated. You will need to manually set the default container resource limit for any existing namespaces in the project in order for it to be used when creating any containers.
-You can set a default container resource limit on a project and launch any catalog applications.
+You can set a default container resource limit on a project and launch any catalog applications.
Once a container default resource limit is configured on a namespace, the default will be pre-populated for any containers created in that namespace. These limits/reservations can always be overridden during workload creation.
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md
index beff555c84e..bf38a406fe8 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md
@@ -1,6 +1,5 @@
---
title: Persistent Grafana Dashboards
-weight: 6
---
import Tabs from '@theme/Tabs';
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
index 2b038be9c46..20c1a7296fb 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
@@ -1,6 +1,5 @@
---
title: Customizing Grafana Dashboards
-weight: 5
---
In this section, you'll learn how to customize the Grafana dashboard to show metrics that apply to a certain container.
@@ -27,12 +26,12 @@ For any panel, you can click the title and click **Explore** to get the PromQL q
For this example, we would like to get the CPU usage for the Alertmanager container, so we click **CPU Utilization > Inspect.**
The **Data** tab shows the underlying data as a time series, with the time in first column and the PromQL query result in the second column. Copy the PromQL query.
-
+
```
(1 - (avg(irate({__name__=~"node_cpu_seconds_total|windows_cpu_time_total",mode="idle"}[5m])))) * 100
```
-You can then modify the query in the Grafana panel or create a new Grafana panel using the query.
+You can then modify the query in the Grafana panel or create a new Grafana panel using the query.
See also:
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/debug-high-memory-usage.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/debug-high-memory-usage.md
index 9583570c444..d411a0d92fc 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/debug-high-memory-usage.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/debug-high-memory-usage.md
@@ -1,6 +1,5 @@
---
title: Debugging High Memory Usage
-weight: 8
---
Every time series in Prometheus is uniquely identified by its [metric name](https://prometheus.io/docs/practices/naming/#metric-names) and optional key-value pairs called [labels.](https://prometheus.io/docs/practices/naming/#labels)
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
index 2244470709f..977efdac6ab 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
@@ -1,6 +1,5 @@
---
title: Enable Monitoring
-weight: 1
---
As an [administrator](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md) or [cluster owner](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles), you can configure Rancher to deploy Prometheus to monitor your Kubernetes cluster.
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
index ad178cfa58a..4aced111bbc 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
@@ -1,6 +1,5 @@
---
title: Migrating to Rancher v2.5+ Monitoring
-weight: 9
---
If you previously enabled Monitoring, Alerting, or Notifiers in Rancher before v2.5, there is no automatic upgrade path for switching to the new monitoring/alerting solution. Before deploying the new monitoring solution via Cluster Explore, you will need to disable and remove all existing custom alerts, notifiers and monitoring installations for the whole cluster and in all projects.
@@ -8,7 +7,7 @@ If you previously enabled Monitoring, Alerting, or Notifiers in Rancher before v
## Monitoring Before Rancher v2.5
-As of v2.2.0, the global view in the legacy Rancher UI allowed users to enable Monitoring & Alerting V1 (both powered by [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator)) independently within a cluster.
+As of v2.2.0, the global view in the legacy Rancher UI allowed users to enable Monitoring & Alerting V1 (both powered by [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator)) independently within a cluster.
When Monitoring is enabled, Monitoring V1 deploys [Prometheus](https://prometheus.io/) and [Grafana](https://grafana.com/docs/grafana/latest/getting-started/what-is-grafana/) onto a cluster to monitor the state of processes of your cluster nodes, Kubernetes components, and software deployments and create custom dashboards to make it easy to visualize collected metrics.
@@ -18,7 +17,7 @@ When Alerts or Notifiers are enabled, Alerting V1 deploys [Prometheus Alertmanag
## Monitoring and Alerting via Cluster Explorer in Rancher 2.5
-As of v2.5.0, Rancher's Cluster Explorer now allows users to enable Monitoring & Alerting V2 (both powered by [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator)) together within a cluster.
+As of v2.5.0, Rancher's Cluster Explorer now allows users to enable Monitoring & Alerting V2 (both powered by [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator)) together within a cluster.
Unlike in Monitoring & Alerting V1, both features are packaged in a single Helm chart found [here](https://github.com/rancher/charts/blob/main/charts/rancher-monitoring). The behavior of this chart and configurable fields closely matches [kube-prometheus-stack](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack), a Prometheus Community Helm chart, and any deviations from the upstream chart can be found in the [CHANGELOG.md](https://github.com/rancher/charts/blob/main/charts/rancher-monitoring/CHANGELOG.md) maintained with the chart.
@@ -78,8 +77,8 @@ metadata:
grafana_dashboard: "1"
data:
custom-dashboard.json: |
- {
- ...
+ {
+ ...
}
```
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/customize-grafana-dashboards.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/customize-grafana-dashboards.md
index fa13cc4c523..8763447dfa4 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/customize-grafana-dashboards.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/customize-grafana-dashboards.md
@@ -1,6 +1,5 @@
---
title: Customizing Grafana Dashboards
-weight: 3
---
Grafana dashboards are customized the same way whether it's for rancher-monitoring or for Prometheus Federator.
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/enable-prometheus-federator.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/enable-prometheus-federator.md
index 8db8b9c1801..611cafa61a1 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/enable-prometheus-federator.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/enable-prometheus-federator.md
@@ -1,6 +1,5 @@
---
title: Enable Prometheus Federator
-weight: 1
---
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/project-monitors.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/project-monitors.md
index e37b442aa23..dc6a1fdb710 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/project-monitors.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/project-monitors.md
@@ -1,6 +1,5 @@
---
title: Installing Project Monitors
-weight: 5
---
Install **Project Monitors** in each project where you want to enable project monitoring.
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/set-up-workloads.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/set-up-workloads.md
index d4c5fcb384a..b3d39f9cc51 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/set-up-workloads.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/set-up-workloads.md
@@ -1,6 +1,5 @@
---
title: Setting up Prometheus Federator for a Workload
-weight: 4
---
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/uninstall-prometheus-federator.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/uninstall-prometheus-federator.md
index 2db6cdda414..9a8b690b862 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/uninstall-prometheus-federator.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/uninstall-prometheus-federator.md
@@ -1,6 +1,5 @@
---
title: Uninstall Prometheus Federator
-weight: 2
---
1. Click **☰ > Cluster Management**.
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/set-up-monitoring-for-workloads.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/set-up-monitoring-for-workloads.md
index 7c7c4e999a6..46def632e1b 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/set-up-monitoring-for-workloads.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/set-up-monitoring-for-workloads.md
@@ -1,6 +1,5 @@
---
title: Setting up Monitoring for a Workload
-weight: 4
---
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/uninstall-monitoring.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/uninstall-monitoring.md
index 66da5a42fe5..e8973222877 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/uninstall-monitoring.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/uninstall-monitoring.md
@@ -1,6 +1,5 @@
---
title: Uninstall Monitoring
-weight: 2
---
1. Click **☰ > Cluster Management**.
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
index 5c610745d13..51e9bec5bdb 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
@@ -1,6 +1,5 @@
---
title: Alertmanager Configuration
-weight: 1
---
It is usually not necessary to directly edit the Alertmanager custom resource. For most use cases, you will only need to edit the Receivers and Routes to configure notifications.
@@ -28,9 +27,9 @@ While the Rancher UI only supports a routing tree that is two levels deep, you c
### Multiple Alertmanager Replicas
As part of the chart deployment options, you can opt to increase the number of replicas of the Alertmanager deployed onto your cluster. The replicas can all be managed using the same underlying Alertmanager Config Secret.
-
+
This Secret should be updated or modified any time you want to:
-
+
- Add in new notifiers or receivers
- Change the alerts that should be sent to specific notifiers or receivers
- Change the group of alerts that are sent out
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
index da04c259320..09072a8ba15 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
@@ -1,6 +1,5 @@
---
title: Prometheus Configuration
-weight: 1
---
It is usually not necessary to directly edit the Prometheus custom resource because the monitoring application automatically updates it based on changes to ServiceMonitors and PodMonitors.
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
index e0ceeac4f15..bf4b1b749db 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
@@ -1,6 +1,5 @@
---
title: Configuring PrometheusRules
-weight: 3
---
A PrometheusRule defines a group of Prometheus alerting and/or recording rules.
diff --git a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md
index 261a1a86f68..f231e7f72c9 100644
--- a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md
+++ b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md
@@ -1,7 +1,5 @@
---
title: Backing up Rancher Installed with Docker
-shortTitle: Backups
-weight: 3
---
After completing your Docker installation of Rancher, we recommend creating backups of it on a regular basis. Having a recent backup will let you recover quickly from an unexpected disaster.
diff --git a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md
index c46f953fe1c..140a26384a6 100644
--- a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md
+++ b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md
@@ -1,6 +1,5 @@
---
title: Backing up a Cluster
-weight: 2045
---
In the Rancher UI, etcd backup and recovery for [Rancher launched Kubernetes clusters](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) can be easily performed.
@@ -13,7 +12,7 @@ Snapshots of the etcd database are taken and saved either [locally onto the etcd
### Snapshot Components
-When Rancher creates a snapshot, it includes three components:
+When Rancher creates a snapshot, it includes three components:
- The cluster data in etcd
- The Kubernetes version
@@ -141,7 +140,7 @@ The list of all available snapshots for the cluster is available in the Rancher
# Safe Timestamps
-Snapshot files are timestamped to simplify processing the files using external tools and scripts, but in some S3 compatible backends, these timestamps were unusable.
+Snapshot files are timestamped to simplify processing the files using external tools and scripts, but in some S3 compatible backends, these timestamps were unusable.
The option `safe_timestamp` is added to support compatible file names. When this flag is set to `true`, all special characters in the snapshot filename timestamp are replaced.
diff --git a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md
index 4e12a50a376..51ed21c5a99 100644
--- a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md
+++ b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md
@@ -1,6 +1,5 @@
---
title: Backing up Rancher
-weight: 1
---
In this section, you'll learn how to back up Rancher running on any Kubernetes cluster. To backup Rancher installed with Docker, refer the instructions for [single node backups](back-up-docker-installed-rancher.md)
diff --git a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
index bb7af198240..d86d00f3753 100644
--- a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
+++ b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
@@ -1,6 +1,5 @@
---
title: Migrating Rancher to a New Cluster
-weight: 3
---
If you are migrating Rancher to a new Kubernetes cluster, you don't need to install Rancher on the new cluster first. If Rancher is restored to a new cluster with Rancher already installed, it can cause problems.
diff --git a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md
index d5ca32d6afc..a1afc34b71f 100644
--- a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md
+++ b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md
@@ -1,7 +1,5 @@
---
title: Restoring Backups—Docker Installs
-shortTitle: Restores
-weight: 3
---
If you encounter a disaster scenario, you can restore your Rancher Server to your most recent backup.
diff --git a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
index 6ced2eee31f..07bacdf4efa 100644
--- a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
+++ b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
@@ -1,6 +1,5 @@
---
-title: Restoring a Cluster from Backup
-weight: 2050
+title: Restoring a Cluster from Backup
---
etcd backup and recovery for [Rancher launched Kubernetes clusters](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) can be easily performed. Snapshots of the etcd database are taken and saved either locally onto the etcd nodes or to a S3 compatible target. The advantages of configuring S3 is that if all etcd nodes are lost, your snapshot is saved remotely and can be used to restore the cluster.
@@ -37,7 +36,7 @@ To restore snapshots from S3, the cluster needs to be configured to [take recurr
1. In the upper left corner, click **☰ > Cluster Management**.
1. In the **Clusters** page, go to the cluster where you want to view the snapshots and click the name of the cluster.
-1. Click the **Snapshots** tab to view the list of saved snapshots.
+1. Click the **Snapshots** tab to view the list of saved snapshots.
1. Go to the snapshot you want to restore and click **⋮ > Restore Snapshot**.
1. Click **Restore**.
@@ -71,7 +70,7 @@ If the group of etcd nodes loses quorum, the Kubernetes cluster will report a fa
5. Run the revised command.
-6. After the single nodes is up and running, Rancher recommends adding additional etcd nodes to your cluster. If you have a [custom cluster](../../../pages-for-subheaders/use-existing-nodes.md) and you want to reuse an old node, you are required to [clean up the nodes](../../advanced-user-guides/manage-clusters/clean-cluster-nodes.md) before attempting to add them back into a cluster.
+6. After the single nodes is up and running, Rancher recommends adding additional etcd nodes to your cluster. If you have a [custom cluster](../../../pages-for-subheaders/use-existing-nodes.md) and you want to reuse an old node, you are required to [clean up the nodes](../../advanced-user-guides/manage-clusters/clean-cluster-nodes.md) before attempting to add them back into a cluster.
# Enabling Snapshot Features for Clusters Created Before Rancher v2.2.0
diff --git a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md
index 189568e42bb..19c8197f512 100644
--- a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md
+++ b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md
@@ -1,6 +1,5 @@
---
title: Restoring Rancher
-weight: 2
---
This page outlines how to perform a restore with Rancher.
diff --git a/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md b/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
index e23bed7bd13..5eb118609c6 100644
--- a/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
+++ b/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
@@ -1,6 +1,5 @@
---
title: Fleet - GitOps at Scale
-weight: 1
---
Fleet is GitOps at scale. Fleet is designed to manage up to a million clusters. It's also lightweight enough that it works great for a [single cluster](https://fleet.rancher.io/single-cluster-install/) too, but it really shines when you get to a [large scale.](https://fleet.rancher.io/multi-cluster-install/) By large scale we mean either a lot of clusters, a lot of deployments, or a lot of teams in a single organization.
diff --git a/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md b/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
index 098c6eeefc8..3ea3d93724d 100644
--- a/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
+++ b/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
@@ -1,6 +1,5 @@
---
title: Multi-cluster Apps
-weight: 2
---
> As of Rancher v2.5, multi-cluster apps are deprecated. We now recommend using [Fleet](fleet.md) for deploying apps across clusters.
@@ -112,7 +111,7 @@ By default, multi-cluster applications can only be managed by the user who creat
- **Read-only**: This access type cannot modify any configuration option for the multi-cluster application. Users can only view these applications.
:::caution
-
+
Please ensure only trusted users are given _Owner_ or _Member_ access as they will automatically be able to manage applications created for this multi-cluster application in target projects they might not have direct access to.
:::
@@ -172,7 +171,7 @@ The `legacy` feature flag needs to be enabled.
2. Choose the multi-cluster application you want to delete and click the **⋮ > Delete**. When deleting the multi-cluster application, all applications and namespaces are deleted in all of the target projects.
:::note
-
+
The applications in the target projects, that are created for a multi-cluster application, cannot be deleted individually. The applications can only be deleted when the multi-cluster application is deleted.
- :::
\ No newline at end of file
+ :::
\ No newline at end of file
diff --git a/docs/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md b/docs/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md
index 7c18158dde7..1bf7a6c36ba 100644
--- a/docs/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md
+++ b/docs/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md
@@ -1,6 +1,5 @@
---
title: Creating Apps
-weight: 400
---
Rancher's App Marketplace is based on Helm Repositories and Helm Charts. You can add HTTP based standard Helm Repositories as well as any Git Repository which contains charts.
diff --git a/docs/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md b/docs/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md
index 3736d52409b..dcaf97eb8cb 100644
--- a/docs/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md
+++ b/docs/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md
@@ -1,6 +1,5 @@
---
title: Setting up Amazon ELB Network Load Balancer
-weight: 5
---
This how-to guide describes how to set up a Network Load Balancer (NLB) in Amazon's EC2 service that will direct traffic to multiple instances on EC2.
diff --git a/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md b/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
index 2301e4f7eda..ba1b871d740 100644
--- a/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
+++ b/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
@@ -1,6 +1,5 @@
---
title: 'Set up Infrastructure for a High Availability K3s Kubernetes Cluster'
-weight: 1
---
This tutorial is intended to help you provision the underlying infrastructure for a Rancher management server.
diff --git a/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md b/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
index ef68da140b7..ac5406a1a8b 100644
--- a/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
+++ b/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
@@ -1,6 +1,5 @@
---
title: 'Set up Infrastructure for a High Availability RKE Kubernetes Cluster'
-weight: 2
---
This tutorial is intended to help you create a high-availability RKE cluster that can be used to install a Rancher server.
diff --git a/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md b/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
index 85b46eef9cf..473b92b5ba9 100644
--- a/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
+++ b/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
@@ -1,6 +1,5 @@
---
title: 'Set up Infrastructure for a High Availability RKE2 Kubernetes Cluster'
-weight: 1
---
This tutorial is intended to help you provision the underlying infrastructure for a Rancher management server.
diff --git a/docs/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md b/docs/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md
index f05998b800b..10ed92e7d5f 100644
--- a/docs/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md
+++ b/docs/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md
@@ -1,6 +1,5 @@
---
title: Setting up a MySQL Database in Amazon RDS
-weight: 4
---
This tutorial describes how to set up a MySQL database in Amazon's RDS.
diff --git a/docs/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md b/docs/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md
index 9edf3b610c2..e23af0532bc 100644
--- a/docs/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md
+++ b/docs/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md
@@ -1,6 +1,5 @@
---
title: Setting up an NGINX Load Balancer
-weight: 4
---
NGINX will be configured as Layer 4 load balancer (TCP) that forwards connections to one of your Rancher nodes.
@@ -30,13 +29,13 @@ After installing NGINX, you need to update the NGINX configuration file, `nginx.
2. From `nginx.conf`, replace both occurrences (port 80 and port 443) of ``, ``, and `` with the IPs of your nodes.
:::note
-
+
See [NGINX Documentation: TCP and UDP Load Balancing](https://docs.nginx.com/nginx/admin-guide/load-balancer/tcp-udp-load-balancer/) for all configuration options.
:::
Example NGINX config
-
+
```
worker_processes 4;
worker_rlimit_nofile 40000;
diff --git a/docs/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md b/docs/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md
index a244f996428..0e62fe59c8a 100644
--- a/docs/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md
+++ b/docs/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md
@@ -1,6 +1,5 @@
---
title: Setting up Nodes in Amazon EC2
-weight: 3
---
In this tutorial, you will learn one way to set up Linux nodes for the Rancher management server. These nodes will fulfill the node requirements for [OS, Docker, hardware, and networking.](../../../pages-for-subheaders/installation-requirements.md)
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md b/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md
index 77640ef7f3d..dac6692ad2c 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md
@@ -1,6 +1,5 @@
---
title: About High-availability Installations
-weight: 1
---
We recommend using Helm, a Kubernetes package manager, to install Rancher on a dedicated Kubernetes cluster. This is called a high-availability Kubernetes installation because increased availability is achieved by running Rancher on multiple nodes.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md b/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md
index 3f1110dcac4..cffa823f721 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md
@@ -1,7 +1,5 @@
---
title: Setting up a High-availability K3s Kubernetes Cluster for Rancher
-shortTitle: Set up K3s for Rancher
-weight: 2
---
This section describes how to install a Kubernetes cluster according to the [best practices for the Rancher server environment.](../../../reference-guides/rancher-manager-architecture/architecture-recommendations.md#environment-for-kubernetes-installations)
@@ -40,9 +38,9 @@ When running the command to start the K3s Kubernetes API server, you will pass i
curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=vX.Y.Z sh -s - server \
--datastore-endpoint="mysql://username:password@tcp(hostname:3306)/database-name"
```
-
+
:::note
-
+
The datastore endpoint can also be passed in using the environment variable `$K3S_DATASTORE_ENDPOINT`.
:::
@@ -61,7 +59,7 @@ Then you should see two nodes with the master role:
ubuntu@ip-172-31-60-194:~$ sudo k3s kubectl get nodes
NAME STATUS ROLES AGE VERSION
ip-172-31-60-194 Ready master 44m v1.17.2+k3s1
-ip-172-31-63-88 Ready master 6m8s v1.17.2+k3s1
+ip-172-31-63-88 Ready master 6m8s v1.17.2+k3s1
```
Then test the health of the cluster pods:
@@ -75,7 +73,7 @@ sudo k3s kubectl get pods --all-namespaces
When you installed K3s on each Rancher server node, a `kubeconfig` file was created on the node at `/etc/rancher/k3s/k3s.yaml`. This file contains credentials for full access to the cluster, and you should save this file in a secure location.
-To use this `kubeconfig` file,
+To use this `kubeconfig` file,
1. Install [kubectl,](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl) a Kubernetes command-line tool.
2. Copy the file at `/etc/rancher/k3s/k3s.yaml` and save it to the directory `~/.kube/config` on your local machine.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md b/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
index 4971baba200..c07f4b6e91a 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
@@ -1,7 +1,5 @@
---
title: Setting up a High-availability RKE Kubernetes Cluster
-shortTitle: Set up RKE Kubernetes
-weight: 3
---
@@ -87,7 +85,7 @@ ingress:
RKE has many configuration options for customizing the install to suit your specific environment.
Please see the [RKE Documentation](https://rancher.com/docs/rke/latest/en/config-options/) for the full list of options and capabilities.
-
+
For tuning your etcd cluster for larger Rancher installations, see the [etcd settings guide](../../../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md).
For more information regarding Dockershim support, refer to [this page](../../../getting-started/installation-and-upgrade/installation-requirements/dockershim.md)
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md b/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md
index 67e44d88f65..d2f6d294015 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md
@@ -1,8 +1,7 @@
---
title: Setting up a High-availability RKE2 Kubernetes Cluster for Rancher
-shortTitle: Set up RKE2 for Rancher
-weight: 2
---
+
_Tested on v2.5.6_
This section describes how to install a Kubernetes cluster according to the [best practices for the Rancher server environment.](../../../reference-guides/rancher-manager-architecture/architecture-recommendations.md#environment-for-kubernetes-installations)
@@ -85,7 +84,7 @@ Then test the health of the cluster pods:
When you installed RKE2 on each Rancher server node, a `kubeconfig` file was created on the node at `/etc/rancher/rke2/rke2.yaml`. This file contains credentials for full access to the cluster, and you should save this file in a secure location.
-To use this `kubeconfig` file,
+To use this `kubeconfig` file,
1. Install [kubectl,](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl) a Kubernetes command-line tool.
2. Copy the file at `/etc/rancher/rke2/rke2.yaml` and save it to the directory `~/.kube/config` on your local machine.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md
index 4efca77715d..814fdcc7b8e 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md
@@ -1,15 +1,14 @@
---
title: Recommended Cluster Architecture
-weight: 1
---
-There are three roles that can be assigned to nodes: `etcd`, `controlplane` and `worker`.
+There are three roles that can be assigned to nodes: `etcd`, `controlplane` and `worker`.
## Separating Worker Nodes from Nodes with Other Roles
When designing your cluster(s), you have two options:
-* Use dedicated nodes for each role. This ensures resource availability for the components needed for the specified role. It also strictly isolates network traffic between each of the roles according to the [port requirements](../node-requirements-for-rancher-managed-clusters.md#networking-requirements).
+* Use dedicated nodes for each role. This ensures resource availability for the components needed for the specified role. It also strictly isolates network traffic between each of the roles according to the [port requirements](../node-requirements-for-rancher-managed-clusters.md#networking-requirements).
* Assign the `etcd` and `controlplane` roles to the same nodes. These nodes must meet the hardware requirements for both roles.
In either case, the `worker` role should not be used or added to nodes with the `etcd` or `controlplane` role.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md
index 6b1d3c2ba46..9154ef1a0ac 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md
@@ -1,6 +1,5 @@
---
title: Roles for Nodes in Kubernetes
-weight: 1
---
This section describes the roles for etcd nodes, controlplane nodes, and worker nodes in Kubernetes, and how the roles work together in a cluster.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
index 57320cc1b2b..dffe5407d8d 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
@@ -1,6 +1,5 @@
---
title: Rancher Agents
-weight: 2400
---
There are two different agent resources deployed on Rancher managed clusters:
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md
index 99a3f18f370..ee93e35e6f3 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md
@@ -1,6 +1,5 @@
---
title: Behavior Differences Between RKE1 and RKE2
-weight: 2450
---
RKE2, also known as RKE Government, is a Kubernetes distribution that focuses on security and compliance for U.S. Federal Government entities. It is considered the next iteration of the Rancher Kubernetes Engine, now known as RKE1.
@@ -13,7 +12,7 @@ RKE1 uses Docker for deploying and managing control plane components, and it als
### Cluster API
-RKE2/K3s provisioning is built on top of the Cluster API (CAPI) upstream framework which often makes RKE2-provisioned clusters behave differently than RKE1-provisioned clusters.
+RKE2/K3s provisioning is built on top of the Cluster API (CAPI) upstream framework which often makes RKE2-provisioned clusters behave differently than RKE1-provisioned clusters.
When you make changes to your cluster configuration in RKE2, this **may** result in nodes reprovisioning. This is controlled by CAPI controllers and not by Rancher itself. Note that for etcd nodes, the same behavior does not apply.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
index 19ad0650b40..cc45f985a02 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
@@ -1,6 +1,5 @@
---
title: Setting up the Amazon Cloud Provider
-weight: 1
---
When using the `Amazon` cloud provider, you can leverage the following capabilities:
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
index e3825bf274f..cdbf3c2c204 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
@@ -1,6 +1,5 @@
---
title: Setting up the Azure Cloud Provider
-weight: 2
---
When using the `Azure` cloud provider, you can leverage the following capabilities:
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
index 86c5c6b7c13..4e8911b0ef5 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
@@ -1,6 +1,5 @@
---
title: Setting up the Google Compute Engine Cloud Provider
-weight: 3
---
In this section, you'll learn how to enable the Google Compute Engine (GCE) cloud provider for custom clusters in Rancher. A custom cluster is one in which Rancher installs Kubernetes on existing nodes.
@@ -22,7 +21,7 @@ If you are using Calico,
rancher_kubernetes_engine_config:
cloud_provider:
name: gce
- customCloudProvider: |-
+ customCloudProvider: |-
[Global]
project-id=
network-name=
@@ -30,7 +29,7 @@ If you are using Calico,
node-instance-prefix=
node-tags=
network:
- options:
+ options:
calico_cloud_provider: "gce"
plugin: "calico"
```
@@ -42,17 +41,17 @@ If you are using Canal or Flannel,
```yaml
rancher_kubernetes_engine_config:
- cloud_provider:
+ cloud_provider:
name: gce
- customCloudProvider: |-
+ customCloudProvider: |-
[Global]
project-id=
network-name=
subnetwork-name=
node-instance-prefix=
node-tags=
- services:
- kube_controller:
+ services:
+ kube_controller:
extra_args:
configure-cloud-routes: true # we need to allow the cloud provider configure the routes for the hosts
```
\ No newline at end of file
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md
index c96345bde8f..eb544817dad 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md
@@ -1,14 +1,12 @@
---
title: How to Configure In-tree vSphere Cloud Provider
-shortTitle: In-tree Cloud Provider
-weight: 10
---
To set up the in-tree vSphere cloud provider, follow these steps while creating the vSphere cluster in Rancher:
1. Set **Cloud Provider** option to `Custom` or `Custom (In-Tree)`.
1. Click on **Edit as YAML**
-1. Insert the following structure to the pre-populated cluster YAML. This structure must be placed under `rancher_kubernetes_engine_config`. Note that the `name` *must* be set to `vsphere`.
+1. Insert the following structure to the pre-populated cluster YAML. This structure must be placed under `rancher_kubernetes_engine_config`. Note that the `name` *must* be set to `vsphere`.
```yaml
rancher_kubernetes_engine_config:
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md
index 118de104559..4bf0ec1f8ea 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md
@@ -1,7 +1,5 @@
---
title: How to Configure Out-of-tree vSphere Cloud Provider
-shortTitle: Out-of-tree Cloud Provider
-weight: 10
---
Kubernetes is moving away from maintaining cloud providers in-tree. vSphere has an out-of-tree cloud provider that can be used by installing the vSphere cloud provider and cloud storage plugins.
@@ -13,7 +11,7 @@ This page covers how to install the Cloud Provider Interface (CPI) and Cloud Sto
The vSphere versions supported:
* 6.7u3
-* 7.0u1 or higher.
+* 7.0u1 or higher.
The Kubernetes version must be 1.19 or higher.
@@ -33,7 +31,7 @@ The Cloud Provider Interface (CPI) should be installed first before installing t
1. Finish creating your cluster.
### 2. Install the CPI plugin
-
+
1. Click **☰ > Cluster Management**.
1. Go to the cluster where the vSphere CPI plugin will be installed and click **Explore**.
1. Click **Apps & Marketplace > Charts**.
@@ -53,7 +51,7 @@ The Cloud Provider Interface (CPI) should be installed first before installing t
1. Click **vSphere CSI**.
1. Click **Install**.
1. Fill out the required vCenter details. On the **Features** tab, set **Enable CSI Migration** to **false**.
-3. On the **Storage** tab, fill out the details for the StorageClass. This chart creates a StorageClass with the `csi.vsphere.vmware.com` as the provisioner.
+3. On the **Storage** tab, fill out the details for the StorageClass. This chart creates a StorageClass with the `csi.vsphere.vmware.com` as the provisioner.
1. Click **Install**.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md
index 094a5b9b951..46e368a3092 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md
@@ -1,6 +1,5 @@
---
title: Migrating vSphere In-tree Volumes to CSI
-weight: 5
---
Kubernetes is moving away from maintaining cloud providers in-tree. vSphere has an out-of-tree cloud provider that can be used by installing the vSphere cloud provider and cloud storage plugins.
@@ -44,7 +43,7 @@ Before installing CPI, we need to taint all nodes with `node.cloudprovider.kuber
This can be done by running the following commands:
```
-curl -O https://raw.githubusercontent.com/rancher/helm3-charts/56b622f519728378abeddfe95074f1b87ab73b1e/charts/vsphere-cpi/taints.sh
+curl -O https://raw.githubusercontent.com/rancher/helm3-charts/56b622f519728378abeddfe95074f1b87ab73b1e/charts/vsphere-cpi/taints.sh
```
Or:
@@ -52,10 +51,10 @@ Or:
```
wget https://raw.githubusercontent.com/rancher/helm3-charts/56b622f519728378abeddfe95074f1b87ab73b1e/charts/vsphere-cpi/taints.sh
chmod +x taints.sh
-./taints.sh
+./taints.sh
```
-Once all nodes are tainted by the running the script, launch the Helm vSphere CPI chart.
+Once all nodes are tainted by the running the script, launch the Helm vSphere CPI chart.
1. Click **☰ > Cluster Management**.
1. Go to the cluster where the vSphere CPI chart will be installed and click **Explore**.
@@ -92,17 +91,17 @@ kubectl describe nodes | grep "ProviderID"
```yaml
extra_args:
- feature-gates: "CSIMigration=true,CSIMigrationvSphere=true"
+ feature-gates: "CSIMigration=true,CSIMigrationvSphere=true"
```
### 4. Drain worker nodes
-Worker nodes must be drained during the upgrade before changing the kubelet and kube-controller-manager args.
+Worker nodes must be drained during the upgrade before changing the kubelet and kube-controller-manager args.
1. Click **☰ > Cluster Management**.
1. Go to the cluster where you will drain worker nodes and click **⋮ > Edit Config**.
1. In the **Advanced Options** section, set the field **Maximum Worker Nodes Unavailable** to 1.
-1. To drain the nodes during upgrade, select **Drain Nodes > Yes**.
+1. To drain the nodes during upgrade, select **Drain Nodes > Yes**.
1. Set **Force** and **Delete Local Data** to **true**.
1. Click **Save** to upgrade the cluster.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
index e0e7a74f1b3..6a2805f9b4f 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
@@ -1,7 +1,5 @@
---
title: Creating a DigitalOcean Cluster
-shortTitle: DigitalOcean
-weight: 2215
---
import Tabs from '@theme/Tabs';
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
index f6c8336e9d0..73efb447f91 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
@@ -1,8 +1,6 @@
---
title: Creating an Amazon EC2 Cluster
-shortTitle: Amazon EC2
description: Learn the prerequisites and steps required in order for you to create an Amazon EC2 cluster using Rancher
-weight: 2210
---
import Tabs from '@theme/Tabs';
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
index 7715520e952..9988d4967ce 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
@@ -1,7 +1,5 @@
---
title: Creating an Azure Cluster
-shortTitle: Azure
-weight: 2220
---
import Tabs from '@theme/Tabs';
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
index d817bb5809c..eb248889193 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
@@ -1,13 +1,12 @@
---
title: Provisioning Kubernetes Clusters in Nutanix AOS
-weight: 1
---
To use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in Nutanix AOS (AHV):
1. Locate Rancher's built-in Nutanix [node driver and activate it](../../../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md#activating-deactivating-node-drivers).
-1. Create a node template, which Rancher will use to provision nodes in Nutanix AOS.
+1. Create a node template, which Rancher will use to provision nodes in Nutanix AOS.
1. Create a Nutanix AOS cluster in Rancher. When configuring the new cluster, you will define node pools for it. Each node pool will have a Kubernetes role of etcd, controlplane, or worker. Rancher will install RKE Kubernetes on the new nodes, and it will set up each node with the Kubernetes role defined by the node pool.
@@ -78,7 +77,7 @@ Use Rancher to create a Kubernetes cluster in Nutanix AOS.
You can access your cluster after its state is updated to **Active**.
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md
index f9b1ec302e8..edfde3e32f3 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md
@@ -1,6 +1,5 @@
---
title: Creating a vSphere Virtual Machine Template
-weight: 4
---
Creating virtual machines in a repeatable and reliable fashion can often be difficult. VMware vSphere offers the ability to build one VM that can then be converted to a template. The template can then be used to create identically configured VMs. Rancher leverages this capability within node pools to create identical RKE1 and RKE2 nodes.
@@ -22,7 +21,7 @@ If you have any specific firewall rules or configuration, you will need to add t
The packages that need to be installed on the template are listed below. These will have slightly different names based on distribution; some distributions ship these by default, for example.
-* curl
+* curl
* wget
* git
* net-tools
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
index 48faf823668..968b5845050 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
@@ -1,6 +1,5 @@
---
title: Creating Credentials in the vSphere Console
-weight: 3
---
This section describes how to create a vSphere username and password. You will need to provide these vSphere credentials to Rancher, which allows Rancher to provision resources in vSphere.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
index e71e8198bb0..28474a19ba3 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
@@ -1,6 +1,5 @@
---
title: Provisioning Kubernetes Clusters in vSphere
-weight: 1
---
In this section, you'll learn how to use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in vSphere.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
index 68059088a60..0d554d6c9b4 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
@@ -1,6 +1,5 @@
---
title: Configuration for Storage Classes in Azure
-weight: 3
---
If you are using Azure VMs for your nodes, you can use [Azure files](https://docs.microsoft.com/en-us/azure/aks/azure-files-dynamic-pv) as a StorageClass for the cluster.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
index ee075c394de..7a430ad34cf 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
@@ -1,6 +1,5 @@
---
title: Networking Requirements for Host Gateway (L2bridge)
-weight: 1000
---
This section describes how to configure custom Windows clusters that are using *Host Gateway (L2bridge)* mode.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md
index 658b48e8b18..fc88bdc3a7f 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md
@@ -1,6 +1,5 @@
---
title: Windows and Linux Cluster Feature Parity
-weight: 3
---
Windows clusters do not share the same feature support as Linux clusters.
@@ -9,14 +8,14 @@ The following chart describes the feature parity between Windows and Linux on Ra
**Component** | **Linux** | **Windows**
--- | --- | ---
-**Distributions** | |
+**Distributions** | |
RKE | Supported | Supported
RKE2 | Supported | Supported
K3S | Supported | Not Supported
EKS | Supported | Not Supported
GKE | Supported | Not Supported
AKS | Supported | Not Supported
-**Rancher Components** | |
+**Rancher Components** | |
Server | Supported | Not Supported
Agent | Supported | Supported
Fleet | Supported | Supported
@@ -35,7 +34,7 @@ OPA | Supported | Not Supported
Longhorn | Supported | Not Supported
CIS Scans | Supported | Not Supported
Backup/Restore Operator | Supported | Not Supported
-**CNI / Add-ons** | |
+**CNI / Add-ons** | |
Flannel | Supported | Supported
Canal | Supported | Not Supported
Calico | Supported | Supported (RKE2 Only)
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance.md
index a8756825f1b..0616b18d922 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance.md
@@ -1,6 +1,5 @@
---
title: RKE1 to RKE2 Windows Migration Guidance
-weight: 3
---
**Caution:** The contents of this document are not covered under SLA by Rancher Support. Please proceed with caution.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
index 6b5059a307c..7385c9656f5 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
@@ -1,6 +1,5 @@
---
title: Node Requirements for Rancher Managed Clusters
-weight: 1
---
import Tabs from '@theme/Tabs';
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
index 8a3a5694970..0df3e508024 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
@@ -1,6 +1,5 @@
---
title: Registering Existing Clusters
-weight: 6
---
The cluster registration feature replaced the feature to import clusters.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md
index 0ce23e41359..f50be72c8fc 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md
@@ -1,7 +1,5 @@
---
title: Creating an AKS Cluster
-shortTitle: Azure Kubernetes Service
-weight: 2115
---
You can use Rancher to create a cluster hosted in Microsoft Azure Kubernetes Service (AKS).
@@ -75,12 +73,12 @@ You can also follow these instructions to set up a service principal and give it
1. Enter a name. This will be the name of your service principal.
1. Optional: Choose which accounts can use the service principal.
1. Click **Register**.
-1. You should now see the name of your service principal under **Azure Active Directory > App registrations**.
+1. You should now see the name of your service principal under **Azure Active Directory > App registrations**.
1. Click the name of your service principal. Take note of the application ID (also called app ID or client ID) so that you can use it when provisioning your AKS cluster. Then click **Certificates & secrets**.
1. Click **New client secret**.
1. Enter a short description, pick an expiration time, and click **Add**. Take note of the client secret so that you can use it when provisioning the AKS cluster.
-**Result:** You have created a service principal and you should be able to see it listed in the **Azure Active Directory** section under **App registrations**. You still need to give the service principal access to AKS.
+**Result:** You have created a service principal and you should be able to see it listed in the **Azure Active Directory** section under **App registrations**. You still need to give the service principal access to AKS.
To give role-based access to your service principal,
@@ -138,7 +136,7 @@ The second way is to run a command to register the cluster with Rancher. Once th
:::note
-Please be aware that when registering an existing AKS cluster, the cluster might take some time, possibly hours, to appear in the `Cluster To register` dropdown list. This outcome will be based on region.
+Please be aware that when registering an existing AKS cluster, the cluster might take some time, possibly hours, to appear in the `Cluster To register` dropdown list. This outcome will be based on region.
:::
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
index c1bfc2751f9..408d708e940 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
@@ -1,7 +1,5 @@
---
title: Creating an Aliyun ACK Cluster
-shortTitle: Alibaba Cloud Container Service for Kubernetes
-weight: 2120
---
You can use Rancher to create a cluster hosted in Alibaba Cloud Kubernetes (ACK). Rancher has already implemented and packaged the [cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md) for ACK, but by default, this cluster driver is `inactive`. In order to launch ACK clusters, you will need to [enable the ACK cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#activating-deactivating-cluster-drivers). After enabling the cluster driver, you can start provisioning ACK clusters.
@@ -49,13 +47,13 @@ When the cluster driver is finished downloading, you will be able to create Alib
1. Click **Next: Configure Worker Nodes**, then complete the **Worker Nodes** form.
1. Review your options to confirm they're correct. Then click **Create**.
-**Result:**
+**Result:**
Your cluster is created and assigned a state of **Provisioning**. Rancher is standing up your cluster.
You can access your cluster after its state is updated to **Active**.
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md
index 6b933e122e8..b828f47603d 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md
@@ -1,7 +1,5 @@
---
title: Managing GKE Clusters
-shortTitle: Google Kubernetes Engine
-weight: 2105
---
@@ -17,7 +15,7 @@ The service account requires the following roles:
- **Compute Viewer:** `roles/compute.viewer`
- **Project Viewer:** `roles/viewer`
-- **Kubernetes Engine Admin:** `roles/container.admin`
+- **Kubernetes Engine Admin:** `roles/container.admin`
- **Service Account User:** `roles/iam.serviceAccountUser`
[Google Documentation: Creating and Enabling Service Accounts](https://cloud.google.com/compute/docs/access/create-enable-service-accounts-for-instances)
@@ -70,7 +68,7 @@ Your cluster is created and assigned a state of **Provisioning**. Rancher is sta
You can access your cluster after its state is updated to **Active**.
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
index 1fff84fc61e..f25473f60eb 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
@@ -1,7 +1,5 @@
---
title: Creating a Huawei CCE Cluster
-shortTitle: Huawei Cloud Kubernetes Service
-weight: 2130
---
You can use Rancher to create a cluster hosted in Huawei Cloud Container Engine (CCE). Rancher has already implemented and packaged the [cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md) for CCE, but by default, this cluster driver is `inactive`. In order to launch CCE clusters, you will need to [enable the CCE cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#activating-deactivating-cluster-drivers). After enabling the cluster driver, you can start provisioning CCE clusters.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
index 46bb9513cb4..d1bb42c6676 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
@@ -1,7 +1,5 @@
---
title: Creating a Tencent TKE Cluster
-shortTitle: Tencent Kubernetes Engine
-weight: 2125
---
You can use Rancher to create a cluster hosted in Tencent Kubernetes Engine (TKE). Rancher has already implemented and packaged the [cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md) for TKE, but by default, this cluster driver is `inactive`. In order to launch TKE clusters, you will need to [enable the TKE cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#activating-deactivating-cluster-drivers). After enabling the cluster driver, you can start provisioning TKE clusters.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md
index a79e40f2f3b..c10473a6c87 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md
@@ -1,6 +1,5 @@
---
title: ConfigMaps
-weight: 3061
---
While most types of Kubernetes secrets store sensitive information, [ConfigMaps](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/) store general configuration information, such as a group of config files. Because ConfigMaps don't store sensitive information, they can be updated automatically, and therefore don't require their containers to be restarted following update (unlike most secret types, which require manual updates and a container restart to take effect).
@@ -14,11 +13,11 @@ ConfigMaps accept key value pairs in common string formats, like config files or
1. Enter a **Name** for the Config Map.
:::note
-
+
Kubernetes classifies ConfigMaps as [secrets](https://kubernetes.io/docs/concepts/configuration/secret/), and no two secrets in a project or namespace can have duplicate names. Therefore, to prevent conflicts, your ConfigMaps must have a unique name among the other certificates, registries, and secrets within your workspace.
:::
-
+
1. Select the **Namespace** you want to add Config Map to.
1. On the **Data** tab, add a key-value pair to your ConfigMap. Add as many values as you need. You can add multiple key value pairs to the ConfigMap by copying and pasting. Alternatively, use **Read from File** to add the data. Note: If you need to store sensitive data, [use a secret](secrets.md), not a ConfigMap.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md
index 106bce3715d..36bae6d991b 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md
@@ -1,6 +1,5 @@
---
title: Services
-weight: 3045
---
Pod configuration is managed by Deployments, StatefulSets and Daemonsets, whereas services direct traffic to pods using selectors.
@@ -15,7 +14,7 @@ You can create additional services so that a given namespace resolves with one o
1. Click **Service Discovery > Services**.
1. Click **Create**.
1. Choose the type of service you want to create.
-1. Select a **Namespace** from the drop-down list.
+1. Select a **Namespace** from the drop-down list.
1. Enter a **Name** for the service. This name is used for DNS resolution.
1. Fill out the rest of the form. For help, refer to the upstream Kubernetes documentation about [services.](https://kubernetes.io/docs/concepts/services-networking/service/)
1. Click **Create**.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md
index 09a679d1845..6ffe303ea35 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md
@@ -1,7 +1,6 @@
---
title: Encrypting HTTP Communication
description: Learn how to add an SSL (Secure Sockets Layer) certificate or TLS (Transport Layer Security) certificate
-weight: 3060
---
When you create an ingress within Rancher/Kubernetes, you must provide it with a secret that includes a TLS private key and certificate, which are used to encrypt and decrypt communications that come through the ingress. You can make certificates available for ingress use by adding the certificate to the ingress deployment.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md
index 96f9cb54384..689581f99d8 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md
@@ -1,6 +1,5 @@
---
title: Background Information on HPAs
-weight: 3027
---
The [Horizontal Pod Autoscaler](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) (HPA) is a Kubernetes feature that allows you to configure your cluster to automatically scale the services it's running up or down. This section provides explanation on how HPA works with Kubernetes.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md
index 1f7355e81af..8eb791b5acb 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md
@@ -1,6 +1,5 @@
---
title: Managing HPAs with kubectl
-weight: 3029
---
This section describes HPA management with `kubectl`. This document has instructions for how to:
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md
index a6403ffcd1d..ca3f3e8bc85 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md
@@ -1,6 +1,5 @@
---
title: Managing HPAs with the Rancher UI
-weight: 3028
---
The Rancher UI supports creating, managing, and deleting HPAs. You can configure CPU or memory usage as the metric that the HPA uses to scale.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
index 842cc434c88..255eeac4231 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
@@ -1,6 +1,5 @@
---
title: Testing HPAs with kubectl
-weight: 3031
---
This document describes how to check the status of your HPAs after scaling them up or down with your load testing tool. For information on how to check the status from the Rancher UI (at least version 2.3.x), refer to [Managing HPAs with the Rancher UI](./manage-hpas-with-kubectl.md).
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md
index ae49f7b3936..ba1068bdb4b 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md
@@ -1,9 +1,8 @@
---
title: Kubernetes Registry and Docker Registry
description: Learn about the Docker registry and Kubernetes registry, their use cases and how to use a private registry with the Rancher UI
-weight: 3063
---
-Registries are Kubernetes secrets containing credentials used to authenticate with [private Docker registries](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/).
+Registries are Kubernetes secrets containing credentials used to authenticate with [private Docker registries](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/).
The word "registry" can mean two things, depending on whether it is used to refer to a Docker or Kubernetes registry:
@@ -24,13 +23,13 @@ You must have a [private registry](https://docs.docker.com/registry/deploying/)
1. In the upper left corner, click **☰ > Cluster Management**.
1. Go to the cluster where you want to add a registry and click **Explore**.
-1. In the left navigation, click either **Storage > Secrets** or **More Resources > Core > Secrets**.
+1. In the left navigation, click either **Storage > Secrets** or **More Resources > Core > Secrets**.
1. Click **Create**.
1. Click **Registry**.
1. Enter a **Name** for the registry.
:::note
-
+
Kubernetes classifies secrets, certificates, and registries all as [secrets](https://kubernetes.io/docs/concepts/configuration/secret/), and no two secrets in a project or namespace can have duplicate names. Therefore, to prevent conflicts, your registry must have a unique name among all secrets within your workspace.
:::
@@ -39,15 +38,15 @@ You must have a [private registry](https://docs.docker.com/registry/deploying/)
1. Select the website that hosts your private registry. Then enter credentials that authenticate with the registry. For example, if you use DockerHub, provide your DockerHub username and password.
1. Click **Save**.
-**Result:**
+**Result:**
- Your secret is added to the namespace you chose.
-- You can view the secret in the Rancher UI by clicking either **Storage > Secrets** or **More Resources > Core > Secrets**.
+- You can view the secret in the Rancher UI by clicking either **Storage > Secrets** or **More Resources > Core > Secrets**.
- Any workload that you create in the Rancher UI will have the credentials to access the registry if the workload is within the registry's scope.
# Creating a Registry in Projects
-:::note Prerequisites:
+:::note Prerequisites:
You must have a [private registry](https://docs.docker.com/registry/deploying/) available to use.
@@ -60,14 +59,14 @@ Before v2.6, secrets were required to be in a project scope. Projects are no lon
1. Go to the `legacy` feature flag and click **Activate**.
1. In the upper left corner, click **☰ > Cluster Management**.
1. Go to the cluster where you want to add a registry and click **Explore**.
-1. In the left navigation, click either **Storage > Secrets** or **More Resources > Core > Secrets**.
+1. In the left navigation, click either **Storage > Secrets** or **More Resources > Core > Secrets**.
1. Click **Create**.
1. Click **Registry**.
1. In the top navigation bar, filter to see only one project.
1. Enter a **Name** for the registry.
:::note
-
+
Kubernetes classifies secrets, certificates, and registries all as [secrets](https://kubernetes.io/docs/concepts/configuration/secret/), and no two secrets in a project or namespace can have duplicate names. Therefore, to prevent conflicts, your registry must have a unique name among all secrets within your workspace.
:::
@@ -76,7 +75,7 @@ Before v2.6, secrets were required to be in a project scope. Projects are no lon
1. Select the website that hosts your private registry. Then enter credentials that authenticate with the registry. For example, if you use DockerHub, provide your DockerHub username and password.
1. Click **Save**.
-**Result:**
+**Result:**
- Your secret is added to the individual project you chose.
- You can view the secret in the Rancher UI by clicking either **Storage > Secrets** or **More Resources > Core > Secrets**.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md
index 7d8bd83a486..b14b935b1c1 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md
@@ -1,7 +1,6 @@
---
title: Adding Ingresses
description: Ingresses can be added for workloads to provide load balancing, SSL termination and host/path-based routing. Learn how to add Rancher ingress
-weight: 3042
---
Ingresses can be added for workloads to provide load balancing, SSL termination and host/path based routing. When using ingresses in a project, you can program the ingress hostname to an external DNS by setting up a Global DNS entry.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/ingress-configuration.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/ingress-configuration.md
index cd8ba561e78..d53c2b64a14 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/ingress-configuration.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/ingress-configuration.md
@@ -1,7 +1,6 @@
---
-title: Ingress Configuration
-description: Ingress configuration
-weight: 9999
+title: Ingress Configuration
+description: Ingress configuration
---
### NGINX Ingress controller changes in Kubernetes v1.21
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md
index 097dfc1232c..e77c6d76af5 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md
@@ -1,7 +1,6 @@
---
title: "Layer 4 and Layer 7 Load Balancing"
description: "Kubernetes supports load balancing in two ways: Layer-4 Load Balancing and Layer-7 Load Balancing. Learn about the support for each way in different deployments"
-weight: 3041
---
Kubernetes supports load balancing in two ways: Layer-4 Load Balancing and Layer-7 Load Balancing.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md
index afcf18d9710..d7ca8f8f76e 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md
@@ -1,6 +1,5 @@
---
title: Secrets
-weight: 3062
---
[Secrets](https://kubernetes.io/docs/concepts/configuration/secret/#overview-of-secrets) store sensitive data like passwords, tokens, or keys. They may contain one or more key value pairs.
@@ -19,14 +18,14 @@ Mounted secrets will be updated automatically unless they are mounted as subpath
1. In the upper left corner, click **☰ > Cluster Management**.
1. Go to the cluster where you want to add a secret and click **Explore**.
-1. To navigate to secrets, you may click either **Storage > Secrets** or **More Resources > Core > Secrets**.
+1. To navigate to secrets, you may click either **Storage > Secrets** or **More Resources > Core > Secrets**.
1. Click **Create**.
1. Select the type of secret you want to create.
1. Select a **Namespace** for the secret.
1. Enter a **Name** for the secret.
:::note
-
+
Kubernetes classifies secrets, certificates, and registries all as [secrets](https://kubernetes.io/docs/concepts/configuration/secret/), and no two secrets in a namespace can have duplicate names. Therefore, to prevent conflicts, your secret must have a unique name among all secrets within your workspace.
:::
@@ -34,16 +33,16 @@ Mounted secrets will be updated automatically unless they are mounted as subpath
1. From **Data**, click **Add** to add a key-value pair. Add as many values as you need.
:::tip
-
+
You can add multiple key value pairs to the secret by copying and pasting.
:::
-
+

1. Click **Save**.
-**Result:** Your secret is added to the namespace you chose. You can view the secret in the Rancher UI by clicking either **Storage > Secrets** or **More Resources > Core > Secrets**.
+**Result:** Your secret is added to the namespace you chose. You can view the secret in the Rancher UI by clicking either **Storage > Secrets** or **More Resources > Core > Secrets**.
Mounted secrets will be updated automatically unless they are mounted as subpath volumes. For details on how updated secrets are propagated, refer to the [Kubernetes documentation.](https://kubernetes.io/docs/concepts/configuration/secret/#mounted-secrets-are-updated-automatically)
@@ -62,7 +61,7 @@ Before v2.6, secrets were required to be in a project scope. Projects are no lon
1. In the left navigation bar, click **Secrets**.
1. Click **Add Secret**.
-**Result:** Your secret is added to the individual project you chose. You can view the secret in the Rancher UI by clicking either **Storage > Secrets** or **More Resources > Core > Secrets**.
+**Result:** Your secret is added to the individual project you chose. You can view the secret in the Rancher UI by clicking either **Storage > Secrets** or **More Resources > Core > Secrets**.
:::note
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
index 5086662fd35..61acf186359 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
@@ -1,7 +1,7 @@
---
title: Adding a Sidecar
-weight: 3029
---
+
A _sidecar_ is a container that extends or enhances the main container in a pod. The main container and the sidecar share a pod, and therefore share the same network space and storage. You can add sidecars to existing workloads by using the **Add a Sidecar** option.
1. In the upper left corner, click **☰ > Cluster Management**.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
index 1c4289484a3..dafc744636d 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
@@ -1,7 +1,6 @@
---
title: Deploying Workloads
description: Read this step by step guide for deploying workloads. Deploy a workload to run an application in one or more containers.
-weight: 3026
---
Deploy a workload to run an application in one or more containers.
@@ -37,15 +36,15 @@ Deploy a workload to run an application in one or more containers.
- **Scaling/Upgrade Policy**
:::note Amazon Note for Volumes:
-
+
To mount an Amazon EBS volume:
-
+
- In [Amazon AWS](https://aws.amazon.com/), the nodes must be in the same Availability Zone and possess IAM permissions to attach/unattach volumes.
-
+
- The cluster must be using the [AWS cloud provider](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/#aws) option. For more information on enabling this option see [Creating an Amazon EC2 Cluster](../../kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md) or [Creating a Custom Cluster](../../../../pages-for-subheaders/use-existing-nodes.md).
:::
-
+
1. Click **Show Advanced Options** and configure:
- **Command**
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md
index 1d8662a3d8a..8bb364d8353 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md
@@ -1,6 +1,5 @@
---
title: Rolling Back Workloads
-weight: 3027
---
Sometimes there is a need to rollback to the previous version of the application, either for debugging purposes or because an upgrade did not go as planned.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
index f6804adb2ea..40184a37fbe 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
@@ -1,7 +1,7 @@
---
title: Upgrading Workloads
-weight: 3028
---
+
When a new version of an application image is released on Docker Hub, you can upgrade any workloads running a previous version of the application to the new one.
1. In the upper left corner, click **☰ > Cluster Management**.
diff --git a/docs/pages-for-subheaders/about-authentication.md b/docs/pages-for-subheaders/about-authentication.md
index 7efcfc30791..2e8cb606b15 100644
--- a/docs/pages-for-subheaders/about-authentication.md
+++ b/docs/pages-for-subheaders/about-authentication.md
@@ -1,6 +1,5 @@
---
title: Authentication
-weight: 10
---
One of the key features that Rancher adds to Kubernetes is centralized user authentication. This feature allows your users to use one set of credentials to authenticate with any of your Kubernetes clusters.
@@ -22,8 +21,8 @@ The Rancher authentication proxy integrates with the following external authenti
| [PingIdentity](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md) |
| [Keycloak (OIDC)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md) |
| [Keycloak (SAML)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md) |
-| [Okta](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md) |
-| [Google OAuth](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md) |
+| [Okta](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md) |
+| [Google OAuth](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md) |
| [Shibboleth](configure-shibboleth-saml.md) |
diff --git a/docs/pages-for-subheaders/about-provisioning-drivers.md b/docs/pages-for-subheaders/about-provisioning-drivers.md
index 264c9d5ee8b..a281dec85fd 100644
--- a/docs/pages-for-subheaders/about-provisioning-drivers.md
+++ b/docs/pages-for-subheaders/about-provisioning-drivers.md
@@ -1,6 +1,5 @@
---
title: Provisioning Drivers
-weight: 70
---
Drivers in Rancher allow you to manage which providers can be used to deploy [hosted Kubernetes clusters](set-up-clusters-from-hosted-kubernetes-providers.md) or [nodes in an infrastructure provider](use-new-nodes-in-an-infra-provider.md) to allow Rancher to deploy and manage Kubernetes.
@@ -14,7 +13,7 @@ There are two types of drivers within Rancher:
* [Cluster Drivers](#cluster-drivers)
* [Node Drivers](#node-drivers)
-### Cluster Drivers
+### Cluster Drivers
Cluster drivers are used to provision [hosted Kubernetes clusters](set-up-clusters-from-hosted-kubernetes-providers.md), such as GKE, EKS, AKS, etc.. The availability of which cluster driver to display when creating a cluster is defined based on the cluster driver's status. Only `active` cluster drivers will be displayed as an option for creating clusters for hosted Kubernetes clusters. By default, Rancher is packaged with several existing cluster drivers, but you can also create custom cluster drivers to add to Rancher.
@@ -43,6 +42,6 @@ Rancher supports several major cloud providers, but by default, these node drive
* [Digital Ocean](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md)
* [vSphere](vsphere.md)
-There are several other node drivers that are disabled by default, but are packaged in Rancher:
+There are several other node drivers that are disabled by default, but are packaged in Rancher:
* [Harvester](../explanations/integrations-in-rancher/harvester.md#harvester-node-driver/), available in Rancher v2.6.1
diff --git a/docs/pages-for-subheaders/about-rke1-templates.md b/docs/pages-for-subheaders/about-rke1-templates.md
index cae48658872..d9235bed7e3 100644
--- a/docs/pages-for-subheaders/about-rke1-templates.md
+++ b/docs/pages-for-subheaders/about-rke1-templates.md
@@ -1,6 +1,5 @@
---
title: RKE Templates
-weight: 80
---
RKE templates are designed to allow DevOps and security teams to standardize and simplify the creation of Kubernetes clusters.
@@ -81,7 +80,7 @@ The documents in this section explain the details of RKE template management:
- [Getting permission to create templates](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md)
- [Creating and revising templates](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md)
-- [Enforcing template settings](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md#requiring-new-clusters-to-use-an-rke-template)
+- [Enforcing template settings](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md#requiring-new-clusters-to-use-an-rke-template)
- [Overriding template settings](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md)
- [Sharing templates with cluster creators](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#sharing-templates-with-specific-users-or-groups)
- [Sharing ownership of a template](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#sharing-ownership-of-templates)
diff --git a/docs/pages-for-subheaders/about-the-api.md b/docs/pages-for-subheaders/about-the-api.md
index 23cdc010023..b5d38bb0f95 100644
--- a/docs/pages-for-subheaders/about-the-api.md
+++ b/docs/pages-for-subheaders/about-the-api.md
@@ -1,6 +1,5 @@
---
title: API
-weight: 24
---
import Tabs from '@theme/Tabs';
diff --git a/docs/pages-for-subheaders/access-clusters.md b/docs/pages-for-subheaders/access-clusters.md
index 7c6eecda012..2eba1efac1c 100644
--- a/docs/pages-for-subheaders/access-clusters.md
+++ b/docs/pages-for-subheaders/access-clusters.md
@@ -1,6 +1,5 @@
---
title: Cluster Access
-weight: 1
---
This section is about what tools can be used to access clusters managed by Rancher.
diff --git a/docs/pages-for-subheaders/advanced-configuration.md b/docs/pages-for-subheaders/advanced-configuration.md
index e2386f978a4..208abcf1ea8 100644
--- a/docs/pages-for-subheaders/advanced-configuration.md
+++ b/docs/pages-for-subheaders/advanced-configuration.md
@@ -1,6 +1,5 @@
---
title: Advanced Configuration
-weight: 500
---
### Alertmanager
diff --git a/docs/pages-for-subheaders/advanced-options.md b/docs/pages-for-subheaders/advanced-options.md
index f5e42195535..4e9027dee15 100644
--- a/docs/pages-for-subheaders/advanced-options.md
+++ b/docs/pages-for-subheaders/advanced-options.md
@@ -1,6 +1,5 @@
---
title: Advanced
-weight: 1000
---
The documents in this section contain resources for less common use cases.
\ No newline at end of file
diff --git a/docs/pages-for-subheaders/air-gapped-helm-cli-install.md b/docs/pages-for-subheaders/air-gapped-helm-cli-install.md
index 717880520d0..5c4a5aec1e3 100644
--- a/docs/pages-for-subheaders/air-gapped-helm-cli-install.md
+++ b/docs/pages-for-subheaders/air-gapped-helm-cli-install.md
@@ -1,6 +1,5 @@
---
title: Air-Gapped Helm CLI Install
-weight: 1
---
This section is about using the Helm CLI to install the Rancher server in an air gapped environment. An air gapped environment could be where Rancher server will be installed offline, behind a firewall, or behind a proxy.
diff --git a/docs/pages-for-subheaders/amazon-eks-permissions.md b/docs/pages-for-subheaders/amazon-eks-permissions.md
index 17fda45001d..da6fabd5f01 100644
--- a/docs/pages-for-subheaders/amazon-eks-permissions.md
+++ b/docs/pages-for-subheaders/amazon-eks-permissions.md
@@ -1,7 +1,5 @@
---
title: Creating an EKS Cluster
-shortTitle: Amazon EKS
-weight: 2110
---
Amazon EKS provides a managed control plane for your Kubernetes cluster. Amazon EKS runs the Kubernetes control plane instances across multiple Availability Zones to ensure high availability. Rancher provides an intuitive user interface for managing and deploying the Kubernetes clusters you run in Amazon EKS. With this guide, you will use Rancher to quickly and easily launch an Amazon EKS Kubernetes cluster in your AWS account. For more information on Amazon EKS, see this [documentation](https://docs.aws.amazon.com/eks/latest/userguide/what-is-eks.html).
@@ -30,7 +28,7 @@ Rancher needs access to your AWS account in order to provision and administer yo
3. Finally, follow the steps [here](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html#Using_CreateAccessKey) to create an access key and secret key for this user.
-:::note Important:
+:::note Important:
It's important to regularly rotate your access and secret keys. See this [documentation](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html#rotating_access_keys_console) for more information.
@@ -48,16 +46,16 @@ Use Rancher to set up and configure your Kubernetes cluster.
1. Choose **Amazon EKS**.
1. Enter a **Cluster Name**.
1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
-1. Fill out the rest of the form. For help, refer to the [configuration reference.](#eks-cluster-configuration-reference)
+1. Fill out the rest of the form. For help, refer to the [configuration reference.](#eks-cluster-configuration-reference)
1. Click **Create**.
-**Result:**
+**Result:**
Your cluster is created and assigned a state of **Provisioning**. Rancher is standing up your cluster.
You can access your cluster after its state is updated to **Active**.
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
diff --git a/docs/pages-for-subheaders/authentication-permissions-and-global-configuration.md b/docs/pages-for-subheaders/authentication-permissions-and-global-configuration.md
index ca88fdadaae..229b0abd15b 100644
--- a/docs/pages-for-subheaders/authentication-permissions-and-global-configuration.md
+++ b/docs/pages-for-subheaders/authentication-permissions-and-global-configuration.md
@@ -1,6 +1,5 @@
---
title: Authentication, Permissions and Global Configuration
-weight: 6
---
After installation, the [system administrator](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md) should configure Rancher to configure authentication, authorization, security, default settings, security policies, drivers and global DNS entries.
diff --git a/docs/pages-for-subheaders/aws-cloud-marketplace.md b/docs/pages-for-subheaders/aws-cloud-marketplace.md
index 96f26dc2a1b..f81804c1c6b 100644
--- a/docs/pages-for-subheaders/aws-cloud-marketplace.md
+++ b/docs/pages-for-subheaders/aws-cloud-marketplace.md
@@ -1,6 +1,5 @@
---
title: AWS Marketplace Integration
-weight: 1
---
# Overview
diff --git a/docs/pages-for-subheaders/backup-restore-and-disaster-recovery.md b/docs/pages-for-subheaders/backup-restore-and-disaster-recovery.md
index caa8cb67950..dd8add1ac45 100644
--- a/docs/pages-for-subheaders/backup-restore-and-disaster-recovery.md
+++ b/docs/pages-for-subheaders/backup-restore-and-disaster-recovery.md
@@ -1,6 +1,5 @@
---
title: Backups and Disaster Recovery
-weight: 5
---
In this section, you'll learn how to create backups of Rancher, how to restore Rancher from backup, and how to migrate Rancher to a new Kubernetes cluster.
diff --git a/docs/pages-for-subheaders/backup-restore-configuration.md b/docs/pages-for-subheaders/backup-restore-configuration.md
index 2d4c62fa201..c6574b93600 100644
--- a/docs/pages-for-subheaders/backup-restore-configuration.md
+++ b/docs/pages-for-subheaders/backup-restore-configuration.md
@@ -1,7 +1,5 @@
---
title: Rancher Backup Configuration Reference
-shortTitle: Configuration
-weight: 4
---
- [Backup configuration](../reference-guides/backup-restore-configuration/backup-configuration.md)
diff --git a/docs/pages-for-subheaders/best-practices.md b/docs/pages-for-subheaders/best-practices.md
index 68e26b48b4d..81f14325f76 100644
--- a/docs/pages-for-subheaders/best-practices.md
+++ b/docs/pages-for-subheaders/best-practices.md
@@ -1,6 +1,5 @@
---
title: Best Practices Guide
-weight: 4
---
The purpose of this section is to consolidate best practices for Rancher implementations. This also includes recommendations for related technologies, such as Kubernetes, Docker, containers, and more. The objective is to improve the outcome of a Rancher implementation using the operational experience of Rancher and its customers.
diff --git a/docs/pages-for-subheaders/checklist-for-production-ready-clusters.md b/docs/pages-for-subheaders/checklist-for-production-ready-clusters.md
index 66ef455ff53..64b0c8a37cf 100644
--- a/docs/pages-for-subheaders/checklist-for-production-ready-clusters.md
+++ b/docs/pages-for-subheaders/checklist-for-production-ready-clusters.md
@@ -1,6 +1,5 @@
---
title: Checklist for Production-Ready Clusters
-weight: 2
---
In this section, we recommend best practices for creating the production-ready Kubernetes clusters that will run your apps and services.
@@ -32,7 +31,7 @@ For a full list of all the best practices that we recommend, refer to the [best
For more information on what each role is used for, refer to the [section on roles for nodes in Kubernetes.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md)
-For more information about the
+For more information about the
number of nodes for each Kubernetes role, refer to the section on [recommended architecture.](../reference-guides/rancher-manager-architecture/architecture-recommendations.md)
### Logging and Monitoring
diff --git a/docs/pages-for-subheaders/cis-scans.md b/docs/pages-for-subheaders/cis-scans.md
index dcd1831f15c..4422e137847 100644
--- a/docs/pages-for-subheaders/cis-scans.md
+++ b/docs/pages-for-subheaders/cis-scans.md
@@ -1,6 +1,5 @@
---
title: CIS Scans
-weight: 17
---
Rancher can run a security scan to check whether Kubernetes is deployed according to security best practices as defined in the CIS Kubernetes Benchmark. The CIS scans can run on any Kubernetes cluster, including hosted Kubernetes providers such as EKS, AKS, and GKE.
diff --git a/docs/pages-for-subheaders/cloud-marketplace.md b/docs/pages-for-subheaders/cloud-marketplace.md
index 1e20fdc9e4b..2637dd78873 100644
--- a/docs/pages-for-subheaders/cloud-marketplace.md
+++ b/docs/pages-for-subheaders/cloud-marketplace.md
@@ -1,6 +1,5 @@
---
title: Cloud Marketplace Integration
-weight: 6
---
Rancher offers integration with cloud marketplaces to easily purchase support for installations hosted on certain cloud providers. In addition, this integration also provides the ability to generate a supportconfig bundle which can be provided to rancher support.
diff --git a/docs/pages-for-subheaders/cluster-configuration.md b/docs/pages-for-subheaders/cluster-configuration.md
index f08618880bd..e2e9544fdca 100644
--- a/docs/pages-for-subheaders/cluster-configuration.md
+++ b/docs/pages-for-subheaders/cluster-configuration.md
@@ -1,6 +1,5 @@
---
title: Cluster Configuration
-weight: 2025
---
After you provision a Kubernetes cluster using Rancher, you can still edit options and settings for the cluster.
diff --git a/docs/pages-for-subheaders/configuration-options.md b/docs/pages-for-subheaders/configuration-options.md
index 998b4545bd3..9e7ad6f0ccb 100644
--- a/docs/pages-for-subheaders/configuration-options.md
+++ b/docs/pages-for-subheaders/configuration-options.md
@@ -1,6 +1,5 @@
---
title: Configuration Options
-weight: 3
---
### Egress Support
@@ -13,15 +12,15 @@ Automatic sidecar injection is disabled by default. To enable this, set the `sid
### Overlay File
-An Overlay File is designed to support extensive configuration of your Istio installation. It allows you to make changes to any values available in the [IstioOperator API](https://istio.io/latest/docs/reference/config/istio.operator.v1alpha1/). This will ensure you can customize the default installation to fit any scenario.
+An Overlay File is designed to support extensive configuration of your Istio installation. It allows you to make changes to any values available in the [IstioOperator API](https://istio.io/latest/docs/reference/config/istio.operator.v1alpha1/). This will ensure you can customize the default installation to fit any scenario.
-The Overlay File will add configuration on top of the default installation that is provided from the Istio chart installation. This means you do not need to redefine the components that already defined for installation.
+The Overlay File will add configuration on top of the default installation that is provided from the Istio chart installation. This means you do not need to redefine the components that already defined for installation.
For more information on Overlay Files, refer to the [Istio documentation.](https://istio.io/latest/docs/setup/install/istioctl/#configure-component-settings)
### Selectors and Scrape Configs
-The Monitoring app sets `prometheus.prometheusSpec.ignoreNamespaceSelectors=false` which enables monitoring across all namespaces by default. This ensures you can view traffic, metrics and graphs for resources deployed in a namespace with `istio-injection=enabled` label.
+The Monitoring app sets `prometheus.prometheusSpec.ignoreNamespaceSelectors=false` which enables monitoring across all namespaces by default. This ensures you can view traffic, metrics and graphs for resources deployed in a namespace with `istio-injection=enabled` label.
If you would like to limit Prometheus to specific namespaces, set `prometheus.prometheusSpec.ignoreNamespaceSelectors=true`. Once you do this, you will need to add additional configuration to continue to monitor your resources.
diff --git a/docs/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md b/docs/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
index 2b1e139988b..549f70444ef 100644
--- a/docs/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
+++ b/docs/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
@@ -1,6 +1,5 @@
---
title: Configuring Microsoft Active Directory Federation Service (SAML)
-weight: 1205
---
If your organization uses Microsoft Active Directory Federation Services (AD FS) for user authentication, you can configure Rancher to allow your users to log in using their AD FS credentials.
diff --git a/docs/pages-for-subheaders/configure-openldap.md b/docs/pages-for-subheaders/configure-openldap.md
index 59b2658a910..d814b391b3d 100644
--- a/docs/pages-for-subheaders/configure-openldap.md
+++ b/docs/pages-for-subheaders/configure-openldap.md
@@ -1,9 +1,8 @@
---
title: Configuring OpenLDAP
-weight: 1113
---
-If your organization uses LDAP for user authentication, you can configure Rancher to communicate with an OpenLDAP server to authenticate users. This allows Rancher admins to control access to clusters and projects based on users and groups managed externally in the organisation's central user repository, while allowing end-users to authenticate with their LDAP credentials when logging in to the Rancher UI.
+If your organization uses LDAP for user authentication, you can configure Rancher to communicate with an OpenLDAP server to authenticate users. This allows Rancher admins to control access to clusters and projects based on users and groups managed externally in the organisation's central user repository, while allowing end-users to authenticate with their LDAP credentials when logging in to the Rancher UI.
## Prerequisites
diff --git a/docs/pages-for-subheaders/configure-shibboleth-saml.md b/docs/pages-for-subheaders/configure-shibboleth-saml.md
index 7ed37f1fe4f..048b7900813 100644
--- a/docs/pages-for-subheaders/configure-shibboleth-saml.md
+++ b/docs/pages-for-subheaders/configure-shibboleth-saml.md
@@ -1,6 +1,5 @@
---
title: Configuring Shibboleth (SAML)
-weight: 1210
---
If your organization uses Shibboleth Identity Provider (IdP) for user authentication, you can configure Rancher to allow your users to log in to Rancher using their Shibboleth credentials.
@@ -56,11 +55,11 @@ If your organization uses Shibboleth for user authentication, you can configure
Rancher redirects you to the IdP login page. Enter credentials that authenticate with Shibboleth IdP to validate your Rancher Shibboleth configuration.
:::note
-
+
You may have to disable your popup blocker to see the IdP login page.
:::
-
+
**Result:** Rancher is configured to work with Shibboleth. Your users can now sign into Rancher using their Shibboleth logins.
### SAML Provider Caveats
diff --git a/docs/pages-for-subheaders/create-kubernetes-persistent-storage.md b/docs/pages-for-subheaders/create-kubernetes-persistent-storage.md
index 6d607713d1d..8980ac5ccf3 100644
--- a/docs/pages-for-subheaders/create-kubernetes-persistent-storage.md
+++ b/docs/pages-for-subheaders/create-kubernetes-persistent-storage.md
@@ -1,7 +1,6 @@
---
title: "Kubernetes Persistent Storage: Volumes and Storage Classes"
description: "Learn about the two ways with which you can create persistent storage in Kubernetes: persistent volumes and storage classes"
-weight: 2031
---
When deploying an application that needs to retain data, you'll need to create persistent storage. Persistent storage allows you to store application data external from the pod running your application. This storage practice allows you to maintain application data, even if the application's pod fails.
diff --git a/docs/pages-for-subheaders/custom-resource-configuration.md b/docs/pages-for-subheaders/custom-resource-configuration.md
index bb051c785d6..3358ebb8019 100644
--- a/docs/pages-for-subheaders/custom-resource-configuration.md
+++ b/docs/pages-for-subheaders/custom-resource-configuration.md
@@ -1,6 +1,5 @@
---
title: Custom Resource Configuration
-weight: 5
---
The following Custom Resource Definitions are used to configure logging:
diff --git a/docs/pages-for-subheaders/deploy-apps-across-clusters.md b/docs/pages-for-subheaders/deploy-apps-across-clusters.md
index bc0ebb83e33..57084c85043 100644
--- a/docs/pages-for-subheaders/deploy-apps-across-clusters.md
+++ b/docs/pages-for-subheaders/deploy-apps-across-clusters.md
@@ -1,6 +1,5 @@
---
title: Deploying Applications across Clusters
-weight: 12
---
### Fleet
diff --git a/docs/pages-for-subheaders/deploy-rancher-manager.md b/docs/pages-for-subheaders/deploy-rancher-manager.md
index 05be04756a8..e5ad6602e64 100644
--- a/docs/pages-for-subheaders/deploy-rancher-manager.md
+++ b/docs/pages-for-subheaders/deploy-rancher-manager.md
@@ -1,6 +1,5 @@
---
title: Deploying Rancher Server
-weight: 100
---
Use one of the following guides to deploy and provision Rancher and a Kubernetes cluster in the provider of your choice.
diff --git a/docs/pages-for-subheaders/deploy-rancher-workloads.md b/docs/pages-for-subheaders/deploy-rancher-workloads.md
index cf89f3341a1..3e86165a071 100644
--- a/docs/pages-for-subheaders/deploy-rancher-workloads.md
+++ b/docs/pages-for-subheaders/deploy-rancher-workloads.md
@@ -1,6 +1,5 @@
---
title: Deploying Workloads
-weight: 200
---
These guides walk you through the deployment of an application, including how to expose the application for use outside of the cluster.
diff --git a/docs/pages-for-subheaders/enable-experimental-features.md b/docs/pages-for-subheaders/enable-experimental-features.md
index d24aff21acc..1e64feee609 100644
--- a/docs/pages-for-subheaders/enable-experimental-features.md
+++ b/docs/pages-for-subheaders/enable-experimental-features.md
@@ -1,6 +1,5 @@
---
title: Enabling Experimental Features
-weight: 17
---
Rancher includes some features that are experimental and disabled by default. You might want to enable these features, for example, if you decide that the benefits of using an [unsupported storage type](../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md) outweighs the risk of using an untested feature. Feature flags were introduced to allow you to try these features that are not enabled by default.
diff --git a/docs/pages-for-subheaders/gke-cluster-configuration.md b/docs/pages-for-subheaders/gke-cluster-configuration.md
index 1c2764f5367..a611ab70462 100644
--- a/docs/pages-for-subheaders/gke-cluster-configuration.md
+++ b/docs/pages-for-subheaders/gke-cluster-configuration.md
@@ -1,7 +1,5 @@
---
title: GKE Cluster Configuration Reference
-shortTitle: GKE Cluster Configuration
-weight: 3
---
## Changes in Rancher v2.6
diff --git a/docs/pages-for-subheaders/helm-charts-in-rancher.md b/docs/pages-for-subheaders/helm-charts-in-rancher.md
index 79ec3826299..29b8f6a9781 100644
--- a/docs/pages-for-subheaders/helm-charts-in-rancher.md
+++ b/docs/pages-for-subheaders/helm-charts-in-rancher.md
@@ -1,6 +1,5 @@
---
title: Helm Charts in Rancher
-weight: 11
---
In this section, you'll learn how to manage Helm chart repositories and applications in Rancher. Helm chart repositories are managed using **Apps & Marketplace**. It uses a catalog-like system to import bundles of charts from repositories and then uses those charts to either deploy custom Helm applications or Rancher's tools such as Monitoring or Istio. Rancher tools come as pre-loaded repositories which deploy as standalone Helm charts. Any additional repositories are only added to the current cluster.
diff --git a/docs/pages-for-subheaders/horizontal-pod-autoscaler.md b/docs/pages-for-subheaders/horizontal-pod-autoscaler.md
index 6ec86016497..64d55355315 100644
--- a/docs/pages-for-subheaders/horizontal-pod-autoscaler.md
+++ b/docs/pages-for-subheaders/horizontal-pod-autoscaler.md
@@ -1,7 +1,6 @@
---
title: The Horizontal Pod Autoscaler
description: Learn about the horizontal pod autoscaler (HPA). How to manage HPAs and how to test them with a service deployment
-weight: 3026
---
The [Horizontal Pod Autoscaler](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) (HPA) is a Kubernetes feature that allows you to configure your cluster to automatically scale the services it's running up or down.
diff --git a/docs/pages-for-subheaders/infrastructure-setup.md b/docs/pages-for-subheaders/infrastructure-setup.md
index 081207021e8..f7b834992aa 100644
--- a/docs/pages-for-subheaders/infrastructure-setup.md
+++ b/docs/pages-for-subheaders/infrastructure-setup.md
@@ -1,7 +1,5 @@
---
title: Don't have infrastructure for your Kubernetes cluster? Try one of these tutorials.
-shortTitle: Infrastructure Tutorials
-weight: 5
---
To set up infrastructure for a high-availability K3s Kubernetes cluster with an external DB, refer to [this page.](../how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md)
diff --git a/docs/pages-for-subheaders/install-cluster-autoscaler.md b/docs/pages-for-subheaders/install-cluster-autoscaler.md
index 40dafa4b01a..0dcca143dd7 100644
--- a/docs/pages-for-subheaders/install-cluster-autoscaler.md
+++ b/docs/pages-for-subheaders/install-cluster-autoscaler.md
@@ -1,6 +1,5 @@
---
title: Cluster Autoscaler
-weight: 1
---
In this section, you'll learn how to install and use the [Kubernetes cluster-autoscaler](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/) on Rancher custom clusters using AWS EC2 Auto Scaling Groups.
diff --git a/docs/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md b/docs/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
index 926b8a33f1b..37623f5f601 100644
--- a/docs/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
+++ b/docs/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
@@ -1,7 +1,6 @@
---
title: Install/Upgrade Rancher on a Kubernetes Cluster
description: Learn how to install Rancher in development and production environments. Read about single node and high availability installation
-weight: 2
---
import Tabs from '@theme/Tabs';
diff --git a/docs/pages-for-subheaders/installation-and-upgrade.md b/docs/pages-for-subheaders/installation-and-upgrade.md
index 04a232fe3b3..da4d01ad100 100644
--- a/docs/pages-for-subheaders/installation-and-upgrade.md
+++ b/docs/pages-for-subheaders/installation-and-upgrade.md
@@ -1,7 +1,6 @@
---
title: Installing/Upgrading Rancher
description: Learn how to install Rancher in development and production environments. Read about single node and high availability installation
-weight: 3
---
This section provides an overview of the architecture options of installing Rancher, describing advantages of each option.
diff --git a/docs/pages-for-subheaders/installation-requirements.md b/docs/pages-for-subheaders/installation-requirements.md
index 14e28c814e9..90d31ba436b 100644
--- a/docs/pages-for-subheaders/installation-requirements.md
+++ b/docs/pages-for-subheaders/installation-requirements.md
@@ -1,7 +1,6 @@
---
title: Installation Requirements
description: Learn the node requirements for each node running Rancher server when you’re configuring Rancher to run either in a Docker or Kubernetes setup
-weight: 1
---
This page describes the software, hardware, and networking requirements for the nodes where the Rancher server will be installed. The Rancher server can be installed on a single node or a high-availability Kubernetes cluster.
diff --git a/docs/pages-for-subheaders/istio-setup-guide.md b/docs/pages-for-subheaders/istio-setup-guide.md
index 9385ca93aa3..1361d4501a4 100644
--- a/docs/pages-for-subheaders/istio-setup-guide.md
+++ b/docs/pages-for-subheaders/istio-setup-guide.md
@@ -1,6 +1,5 @@
---
title: Setup Guide
-weight: 2
---
This section describes how to enable Istio and start using it in your projects.
diff --git a/docs/pages-for-subheaders/istio.md b/docs/pages-for-subheaders/istio.md
index fe03eea65de..01e9dd262c7 100644
--- a/docs/pages-for-subheaders/istio.md
+++ b/docs/pages-for-subheaders/istio.md
@@ -1,6 +1,5 @@
---
title: Istio
-weight: 14
---
[Istio](https://istio.io/) is an open-source tool that makes it easier for DevOps teams to observe, secure, control, and troubleshoot the traffic within a complex network of microservices.
@@ -34,13 +33,13 @@ This Helm chart will be available via the Apps and Marketplace in the UI. A user
## Tools Bundled with Istio
-Our [Istio](https://istio.io/) installer wraps the istioctl binary commands in a handy Helm chart, including an overlay file option to allow complex customization.
+Our [Istio](https://istio.io/) installer wraps the istioctl binary commands in a handy Helm chart, including an overlay file option to allow complex customization.
It also includes the following:
### Kiali
-Kiali is a comprehensive visualization aid used for graphing traffic flow throughout the service mesh. It allows you to see how they are connected, including the traffic rates and latencies between them.
+Kiali is a comprehensive visualization aid used for graphing traffic flow throughout the service mesh. It allows you to see how they are connected, including the traffic rates and latencies between them.
You can check the health of the service mesh, or drill down to see the incoming and outgoing requests to a single component.
@@ -70,7 +69,7 @@ To remove Istio components from a cluster, namespace, or workload, refer to the
There is no upgrade path for Istio versions less than 1.7.x. To successfully install Istio through **Apps & Marketplace,** you will need to disable your existing Istio from the global view in the legacy Rancher UI.
-If you have a significant amount of additional Istio CRDs you might consider manually migrating CRDs that are supported in both versions of Istio. You can do this by running `kubectl get -n istio-system -o yaml`, save the output yaml and re-apply in the new version.
+If you have a significant amount of additional Istio CRDs you might consider manually migrating CRDs that are supported in both versions of Istio. You can do this by running `kubectl get -n istio-system -o yaml`, save the output yaml and re-apply in the new version.
Another option is to manually uninstall istio resources one at a time, but leave the resources that are supported in both versions of Istio and that will not be installed by the newest version. This method is more likely to result in issues installing the new version, but could be a good option depending on your situation.
@@ -78,7 +77,7 @@ Another option is to manually uninstall istio resources one at a time, but leave
> By default, only cluster-admins have access to Kiali. For instructions on how to allow admin, edit or views roles to access them, see [this section.](../explanations/integrations-in-rancher/istio/rbac-for-istio.md)
-After Istio is set up in a cluster, Grafana, Prometheus, and Kiali are available in the Rancher UI.
+After Istio is set up in a cluster, Grafana, Prometheus, and Kiali are available in the Rancher UI.
To access the Grafana and Prometheus visualizations,
@@ -92,9 +91,9 @@ To access the Kiali visualization,
1. In the upper left corner, click **☰ > Cluster Management**.
1. On the **Clusters** page, go to the cluster where you want to see Kiali and click **Explore**.
1. In the left navigation bar, click **Istio**.
-1. Click **Kiali**. From here you can access the **Traffic Graph** tab or the **Traffic Metrics** tab to see network visualizations and metrics.
+1. Click **Kiali**. From here you can access the **Traffic Graph** tab or the **Traffic Metrics** tab to see network visualizations and metrics.
-By default, all namespace will picked up by prometheus and make data available for Kiali graphs. Refer to [selector/scrape config setup](../explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md) if you would like to use a different configuration for prometheus data scraping.
+By default, all namespace will picked up by prometheus and make data available for Kiali graphs. Refer to [selector/scrape config setup](../explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md) if you would like to use a different configuration for prometheus data scraping.
Your access to the visualizations depend on your role. Grafana and Prometheus are only available for `cluster-admin` roles. The Kiali UI is available only to `cluster-admin` by default, but `cluster-admin` can allow other roles to access them by editing the Istio values.yaml.
@@ -113,7 +112,7 @@ For more information on the Istio sidecar, refer to the [Istio sidecare-injectio
By default, each Rancher-provisioned cluster has one NGINX ingress controller allowing traffic into the cluster. Istio also installs an ingress gateway by default into the `istio-system` namespace. The result is that your cluster will have two ingresses in your cluster.

-
+
Additional Istio Ingress gateways can be enabled via the [overlay file](configuration-options.md#overlay-file).
### Egress Support
diff --git a/docs/pages-for-subheaders/kubernetes-cluster-setup.md b/docs/pages-for-subheaders/kubernetes-cluster-setup.md
index d9947f5ace0..8f9a88e0da3 100644
--- a/docs/pages-for-subheaders/kubernetes-cluster-setup.md
+++ b/docs/pages-for-subheaders/kubernetes-cluster-setup.md
@@ -1,6 +1,5 @@
---
title: "Don't have a Kubernetes cluster? Try one of these tutorials."
-weight: 4
---
This section contains information on how to install a Kubernetes cluster that the Rancher server can be installed on.
diff --git a/docs/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md b/docs/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
index a12df1e653a..22c21b7b33c 100644
--- a/docs/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
+++ b/docs/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
@@ -1,7 +1,6 @@
---
title: Setting up Kubernetes Clusters in Rancher
description: Provisioning Kubernetes Clusters
-weight: 7
---
Rancher simplifies the creation of clusters by allowing you to create them through the Rancher UI rather than more complex alternatives. Rancher provides multiple options for launching a cluster. Use the option that best fits your use case.
diff --git a/docs/pages-for-subheaders/kubernetes-components.md b/docs/pages-for-subheaders/kubernetes-components.md
index 4fc8354908f..e93dd6bc8fd 100644
--- a/docs/pages-for-subheaders/kubernetes-components.md
+++ b/docs/pages-for-subheaders/kubernetes-components.md
@@ -1,6 +1,5 @@
---
title: Kubernetes Components
-weight: 100
---
The commands and steps listed in this section apply to the core Kubernetes components on [Rancher Launched Kubernetes](launch-kubernetes-with-rancher.md) clusters.
diff --git a/docs/pages-for-subheaders/kubernetes-resources-setup.md b/docs/pages-for-subheaders/kubernetes-resources-setup.md
index 3778a8dbca0..0e6ee9d150c 100644
--- a/docs/pages-for-subheaders/kubernetes-resources-setup.md
+++ b/docs/pages-for-subheaders/kubernetes-resources-setup.md
@@ -1,6 +1,5 @@
---
title: Kubernetes Resources
-weight: 18
---
You can view and manipulate all of the custom resources and CRDs in a Kubernetes cluster from the Rancher UI.
diff --git a/docs/pages-for-subheaders/launch-kubernetes-with-rancher.md b/docs/pages-for-subheaders/launch-kubernetes-with-rancher.md
index cff84fbb2c1..04afe7ac941 100644
--- a/docs/pages-for-subheaders/launch-kubernetes-with-rancher.md
+++ b/docs/pages-for-subheaders/launch-kubernetes-with-rancher.md
@@ -1,6 +1,5 @@
---
title: Launching Kubernetes with Rancher
-weight: 4
---
You can have Rancher launch a Kubernetes cluster using any nodes you want. When Rancher deploys Kubernetes onto these nodes, you can choose between [Rancher Kubernetes Engine](https://rancher.com/docs/rke/latest/en/) (RKE) or [RKE2](https://docs.rke2.io) distributions. Rancher can launch Kubernetes on any computers, including:
diff --git a/docs/pages-for-subheaders/load-balancer-and-ingress-controller.md b/docs/pages-for-subheaders/load-balancer-and-ingress-controller.md
index c7ca9c0ec9a..ea5d34fed34 100644
--- a/docs/pages-for-subheaders/load-balancer-and-ingress-controller.md
+++ b/docs/pages-for-subheaders/load-balancer-and-ingress-controller.md
@@ -1,7 +1,6 @@
---
title: Set Up Load Balancer and Ingress Controller within Rancher
description: Learn how you can set up load balancers and ingress controllers to redirect service requests within Rancher, and learn about the limitations of load balancers
-weight: 3040
---
Within Rancher, you can set up load balancers and ingress controllers to redirect service requests.
@@ -39,7 +38,7 @@ As mentioned in the limitations above, the disadvantages of using a load balance
- If you run multiple services in your cluster, you must have a load balancer for each service.
- It can be expensive to have a load balancer for every service.
-In contrast, when an ingress is used as the entrypoint into a cluster, the ingress can route traffic to multiple services with greater flexibility. It can map multiple HTTP requests to services without individual IP addresses for each service.
+In contrast, when an ingress is used as the entrypoint into a cluster, the ingress can route traffic to multiple services with greater flexibility. It can map multiple HTTP requests to services without individual IP addresses for each service.
Therefore, it is useful to have an ingress if you want multiple services to be exposed with the same IP address, the same Layer 7 protocol, or the same privileged node-ports: 80 and 443.
diff --git a/docs/pages-for-subheaders/logging.md b/docs/pages-for-subheaders/logging.md
index 05beaf29161..9ef66ecf043 100644
--- a/docs/pages-for-subheaders/logging.md
+++ b/docs/pages-for-subheaders/logging.md
@@ -1,9 +1,6 @@
---
title: Rancher Integration with Logging Services
-shortTitle: Logging
description: Rancher integrates with popular logging services. Learn the requirements and benefits of integrating with logging services, and enable logging on your cluster.
-metaDescription: "Rancher integrates with popular logging services. Learn the requirements and benefits of integrating with logging services, and enable logging on your cluster."
-weight: 15
---
The [Banzai Cloud Logging operator](https://banzaicloud.com/docs/one-eye/logging-operator/) now powers Rancher's logging solution in place of the former, in-house solution.
diff --git a/docs/pages-for-subheaders/manage-clusters.md b/docs/pages-for-subheaders/manage-clusters.md
index 205c49d643b..17efb1bfd13 100644
--- a/docs/pages-for-subheaders/manage-clusters.md
+++ b/docs/pages-for-subheaders/manage-clusters.md
@@ -1,6 +1,5 @@
---
title: Cluster Administration
-weight: 8
---
After you provision a cluster in Rancher, you can begin using powerful Kubernetes features to deploy and scale your containerized applications in development, testing, or production environments.
diff --git a/docs/pages-for-subheaders/manage-project-resource-quotas.md b/docs/pages-for-subheaders/manage-project-resource-quotas.md
index 5492d92781a..f9207286307 100644
--- a/docs/pages-for-subheaders/manage-project-resource-quotas.md
+++ b/docs/pages-for-subheaders/manage-project-resource-quotas.md
@@ -1,6 +1,5 @@
---
title: Project Resource Quotas
-weight: 2515
---
In situations where several teams share a cluster, one team may overconsume the resources available: CPU, memory, storage, services, Kubernetes objects like pods or secrets, and so on. To prevent this overconsumption, you can apply a _resource quota_, which is a Rancher feature that limits the resources available to a project or namespace.
diff --git a/docs/pages-for-subheaders/manage-projects.md b/docs/pages-for-subheaders/manage-projects.md
index 9ac4f58a7c0..1b6bb990325 100644
--- a/docs/pages-for-subheaders/manage-projects.md
+++ b/docs/pages-for-subheaders/manage-projects.md
@@ -1,6 +1,5 @@
---
title: Project Administration
-weight: 9
---
_Projects_ are objects introduced in Rancher that help organize namespaces in your Kubernetes cluster. You can use projects to create multi-tenant clusters, which allows a group of users to share the same underlying resources without interacting with each other's applications.
diff --git a/docs/pages-for-subheaders/manage-role-based-access-control-rbac.md b/docs/pages-for-subheaders/manage-role-based-access-control-rbac.md
index 42f1f049cc6..8d63e7ad740 100644
--- a/docs/pages-for-subheaders/manage-role-based-access-control-rbac.md
+++ b/docs/pages-for-subheaders/manage-role-based-access-control-rbac.md
@@ -1,6 +1,5 @@
---
title: Role-Based Access Control (RBAC)
-weight: 20
---
Within Rancher, each person authenticates as a _user_, which is a login that grants you access to Rancher. As mentioned in [Authentication](about-authentication.md), users can either be local or external.
@@ -13,7 +12,7 @@ After you configure external authentication, the users that display on the **Use
## Users and Roles
-Once the user logs in to Rancher, their _authorization_, or their access rights within the system, is determined by _global permissions_, and _cluster and project roles_.
+Once the user logs in to Rancher, their _authorization_, or their access rights within the system, is determined by _global permissions_, and _cluster and project roles_.
- [Global Permissions](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md):
diff --git a/docs/pages-for-subheaders/monitoring-alerting-guides.md b/docs/pages-for-subheaders/monitoring-alerting-guides.md
index 3aa725064be..ce9f991fc84 100644
--- a/docs/pages-for-subheaders/monitoring-alerting-guides.md
+++ b/docs/pages-for-subheaders/monitoring-alerting-guides.md
@@ -1,7 +1,5 @@
---
title: Monitoring Guides
-shortTitle: Guides
-weight: 4
---
- [Enable monitoring](../how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md)
diff --git a/docs/pages-for-subheaders/monitoring-and-alerting.md b/docs/pages-for-subheaders/monitoring-and-alerting.md
index 12b7e811e19..e28fd4fbb88 100644
--- a/docs/pages-for-subheaders/monitoring-and-alerting.md
+++ b/docs/pages-for-subheaders/monitoring-and-alerting.md
@@ -1,8 +1,6 @@
---
title: Monitoring and Alerting
-shortTitle: Monitoring/Alerting
description: Prometheus lets you view metrics from your different Rancher and Kubernetes objects. Learn about the scope of monitoring and how to enable cluster monitoring
-weight: 13
---
Using the `rancher-monitoring` application, you can quickly deploy leading open-source monitoring and alerting solutions onto your cluster.
diff --git a/docs/pages-for-subheaders/monitoring-v2-configuration-guides.md b/docs/pages-for-subheaders/monitoring-v2-configuration-guides.md
index 5f2ee6872b1..457bd2dc293 100644
--- a/docs/pages-for-subheaders/monitoring-v2-configuration-guides.md
+++ b/docs/pages-for-subheaders/monitoring-v2-configuration-guides.md
@@ -1,11 +1,10 @@
---
title: Configuration
-weight: 5
---
This page captures some of the most important options for configuring Monitoring V2 in the Rancher UI.
-For information on configuring custom scrape targets and rules for Prometheus, please refer to the upstream documentation for the [Prometheus Operator.](https://github.com/prometheus-operator/prometheus-operator) Some of the most important custom resources are explained in the Prometheus Operator [design documentation.](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/design.md) The Prometheus Operator documentation can help also you set up RBAC, Thanos, or custom configuration.
+For information on configuring custom scrape targets and rules for Prometheus, please refer to the upstream documentation for the [Prometheus Operator.](https://github.com/prometheus-operator/prometheus-operator) Some of the most important custom resources are explained in the Prometheus Operator [design documentation.](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/design.md) The Prometheus Operator documentation can help also you set up RBAC, Thanos, or custom configuration.
# Setting Resource Limits and Requests
@@ -13,7 +12,7 @@ The resource requests and limits for the monitoring application can be configure
:::note
-On an idle cluster, Monitoring V2 has significantly higher CPU usage (up to 70%) as compared to Monitoring V1. To improve performance and achieve similar results as in Monitoring V1, turn off the Prometheus adapter.
+On an idle cluster, Monitoring V2 has significantly higher CPU usage (up to 70%) as compared to Monitoring V1. To improve performance and achieve similar results as in Monitoring V1, turn off the Prometheus adapter.
:::
diff --git a/docs/pages-for-subheaders/nutanix.md b/docs/pages-for-subheaders/nutanix.md
index 4b52bbc9e82..3d2072eb508 100644
--- a/docs/pages-for-subheaders/nutanix.md
+++ b/docs/pages-for-subheaders/nutanix.md
@@ -1,9 +1,6 @@
---
title: Creating a Nutanix AOS Cluster
-shortTitle: Nutanix
description: Use Rancher to create a Nutanix AOS (AHV) cluster. It may consist of groups of VMs with distinct properties which allow for fine-grained control over the sizing of nodes.
-metaDescription: Use Rancher to create a Nutanix AOS (AHV) cluster. It may consist of groups of VMs with distinct properties which allow for fine-grained control over the sizing of nodes.
-weight: 2225
---
[Nutanix Acropolis Operating System](https://www.nutanix.com/products/acropolis) (Nutanix AOS) is an operating system for the Nutanix hyper-converged infrastructure platform. AOS comes with a built-in hypervisor called [Acropolis Hypervisor](https://www.nutanix.com/products/ahv), or AHV. By using Rancher with Nutanix AOS (AHV), you can bring cloud operations on-premises.
diff --git a/docs/pages-for-subheaders/other-installation-methods.md b/docs/pages-for-subheaders/other-installation-methods.md
index 939553398ae..effd2424c19 100644
--- a/docs/pages-for-subheaders/other-installation-methods.md
+++ b/docs/pages-for-subheaders/other-installation-methods.md
@@ -1,6 +1,5 @@
---
title: Other Installation Methods
-weight: 3
---
### Air Gapped Installations
@@ -13,7 +12,7 @@ An air gapped environment could be where Rancher server will be installed offlin
The [single-node Docker installation](rancher-on-a-single-node-with-docker.md) is for Rancher users that are wanting to test out Rancher. Instead of running on a Kubernetes cluster using Helm, you install the Rancher server component on a single node using a `docker run` command.
-The Docker installation is for development and testing environments only.
+The Docker installation is for development and testing environments only.
Since there is only one node and a single Docker container, if the node goes down, there is no copy of the etcd data available on other nodes and you will lose all the data of your Rancher server.
diff --git a/docs/pages-for-subheaders/pipelines.md b/docs/pages-for-subheaders/pipelines.md
index 39734bd78a1..feac9b9457e 100644
--- a/docs/pages-for-subheaders/pipelines.md
+++ b/docs/pages-for-subheaders/pipelines.md
@@ -1,6 +1,5 @@
---
title: Pipelines
-weight: 10
---
import Tabs from '@theme/Tabs';
diff --git a/docs/pages-for-subheaders/prometheus-federator.md b/docs/pages-for-subheaders/prometheus-federator.md
index c55e1096b81..40006035c57 100644
--- a/docs/pages-for-subheaders/prometheus-federator.md
+++ b/docs/pages-for-subheaders/prometheus-federator.md
@@ -1,6 +1,5 @@
---
title: Prometheus Federator
-weight: 7
---
Prometheus Federator, also referred to as Project Monitoring v2, deploys a Helm Project Operator (based on the [rancher/helm-project-operator](https://github.com/rancher/helm-project-operator)), an operator that manages deploying Helm charts each containing a Project Monitoring Stack, where each stack contains:
diff --git a/docs/pages-for-subheaders/provisioning-storage-examples.md b/docs/pages-for-subheaders/provisioning-storage-examples.md
index 9732249038b..72d452efcc1 100644
--- a/docs/pages-for-subheaders/provisioning-storage-examples.md
+++ b/docs/pages-for-subheaders/provisioning-storage-examples.md
@@ -1,6 +1,5 @@
---
title: Provisioning Storage Examples
-weight: 3053
---
Rancher supports persistent storage with a variety of volume plugins. However, before you use any of these plugins to bind persistent storage to your workloads, you have to configure the storage itself, whether its a cloud-based solution from a service-provider or an on-prem solution that you manage yourself.
diff --git a/docs/pages-for-subheaders/quick-start-guides.md b/docs/pages-for-subheaders/quick-start-guides.md
index e19a1729d3a..c0010d43850 100644
--- a/docs/pages-for-subheaders/quick-start-guides.md
+++ b/docs/pages-for-subheaders/quick-start-guides.md
@@ -1,10 +1,5 @@
---
title: Rancher Deployment Quick Start Guides
-metaDescription: Use this section to jump start your Rancher deployment and testing. It contains instructions for a simple Rancher setup and some common use cases.
-short title: Use this section to jump start your Rancher deployment and testing. It contains instructions for a simple Rancher setup and some common use cases.
-weight: 2
-aliases:
- - /rancher/v2.x/en/quick-start-guide/
---
:::caution
diff --git a/docs/pages-for-subheaders/rancher-behind-an-http-proxy.md b/docs/pages-for-subheaders/rancher-behind-an-http-proxy.md
index a2dc3b1edaf..ef0d4acbe8e 100644
--- a/docs/pages-for-subheaders/rancher-behind-an-http-proxy.md
+++ b/docs/pages-for-subheaders/rancher-behind-an-http-proxy.md
@@ -1,6 +1,5 @@
---
title: Installing Rancher behind an HTTP Proxy
-weight: 4
---
In a lot of enterprise environments, servers or VMs running on premise do not have direct Internet access, but must connect to external services through a HTTP(S) proxy for security reasons. This tutorial shows step by step how to set up a highly available Rancher installation in such an environment.
diff --git a/docs/pages-for-subheaders/rancher-managed-clusters.md b/docs/pages-for-subheaders/rancher-managed-clusters.md
index 82d5004251f..2fc25c09150 100644
--- a/docs/pages-for-subheaders/rancher-managed-clusters.md
+++ b/docs/pages-for-subheaders/rancher-managed-clusters.md
@@ -1,7 +1,5 @@
---
title: Best Practices for Rancher Managed Clusters
-shortTitle: Rancher Managed Clusters
-weight: 2
---
### Logging
diff --git a/docs/pages-for-subheaders/rancher-manager-architecture.md b/docs/pages-for-subheaders/rancher-manager-architecture.md
index 252d08a512f..db2e5229a15 100644
--- a/docs/pages-for-subheaders/rancher-manager-architecture.md
+++ b/docs/pages-for-subheaders/rancher-manager-architecture.md
@@ -1,6 +1,5 @@
---
title: Architecture
-weight: 1
---
This section focuses on the [Rancher server and its components](../reference-guides/rancher-manager-architecture/rancher-server-and-components.md) and how [Rancher communicates with downstream Kubernetes clusters](../reference-guides/rancher-manager-architecture/communicating-with-downstream-user-clusters.md).
diff --git a/docs/pages-for-subheaders/rancher-on-a-single-node-with-docker.md b/docs/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
index 7965ae43566..21bb416c546 100644
--- a/docs/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
+++ b/docs/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
@@ -1,7 +1,6 @@
---
title: Installing Rancher on a Single Node Using Docker
description: For development and testing environments only, use a Docker install. Install Docker on a single Linux host, and deploy Rancher with a single Docker container.
-weight: 2
---
Rancher can be installed by running a single Docker container.
diff --git a/docs/pages-for-subheaders/rancher-security.md b/docs/pages-for-subheaders/rancher-security.md
index 3dfad6c1983..ce013cad554 100644
--- a/docs/pages-for-subheaders/rancher-security.md
+++ b/docs/pages-for-subheaders/rancher-security.md
@@ -1,8 +1,5 @@
---
title: Security
-weight: 20
-aliases:
- - /rancher/v2.x/en/security/
---
diff --git a/docs/pages-for-subheaders/rancher-server.md b/docs/pages-for-subheaders/rancher-server.md
index 62678aabce1..c8984d9c447 100644
--- a/docs/pages-for-subheaders/rancher-server.md
+++ b/docs/pages-for-subheaders/rancher-server.md
@@ -1,7 +1,5 @@
---
title: Best Practices for the Rancher Server
-shortTitle: Rancher Server
-weight: 1
---
This guide contains our recommendations for running the Rancher server, and is intended to be used in situations in which Rancher manages downstream Kubernetes clusters.
diff --git a/docs/pages-for-subheaders/rancher-v2.6-hardening-guides.md b/docs/pages-for-subheaders/rancher-v2.6-hardening-guides.md
index ca4685cd4bb..4ebaf592d11 100644
--- a/docs/pages-for-subheaders/rancher-v2.6-hardening-guides.md
+++ b/docs/pages-for-subheaders/rancher-v2.6-hardening-guides.md
@@ -1,13 +1,5 @@
---
title: Self-Assessment and Hardening Guides for Rancher v2.6
-shortTitle: Rancher v2.6 Hardening Guides
-weight: 1
-aliases:
- - /rancher/v2.6/en/security/rancher-2.5/
- - /rancher/v2.6/en/security/rancher-2.5/1.5-hardening-2.5/
- - /rancher/v2.6/en/security/rancher-2.5/1.5-benchmark-2.5/
- - /rancher/v2.6/en/security/rancher-2.5/1.6-hardening-2.5/
- - /rancher/v2.6/en/security/rancher-2.5/1.6-benchmark-2.5/
---
Rancher provides specific security hardening guides for each supported Rancher's Kubernetes distributions.
diff --git a/docs/pages-for-subheaders/resources.md b/docs/pages-for-subheaders/resources.md
index a351d874001..e0686b4860b 100644
--- a/docs/pages-for-subheaders/resources.md
+++ b/docs/pages-for-subheaders/resources.md
@@ -1,6 +1,5 @@
---
title: Resources
-weight: 5
---
### Docker Installations
diff --git a/docs/pages-for-subheaders/selinux-rpm.md b/docs/pages-for-subheaders/selinux-rpm.md
index 9f1fc5c0267..0b06703cf32 100644
--- a/docs/pages-for-subheaders/selinux-rpm.md
+++ b/docs/pages-for-subheaders/selinux-rpm.md
@@ -1,11 +1,10 @@
---
title: SELinux RPM
-weight: 4
---
[Security-Enhanced Linux (SELinux)](https://en.wikipedia.org/wiki/Security-Enhanced_Linux) is a security enhancement to Linux.
-Developed by Red Hat, it is an implementation of mandatory access controls (MAC) on Linux. Mandatory access controls allow an administrator of a system to define how applications and users can access different resources such as files, devices, networks and inter-process communication. SELinux also enhances security by making an OS restrictive by default.
+Developed by Red Hat, it is an implementation of mandatory access controls (MAC) on Linux. Mandatory access controls allow an administrator of a system to define how applications and users can access different resources such as files, devices, networks and inter-process communication. SELinux also enhances security by making an OS restrictive by default.
After being historically used by government agencies, SELinux is now industry standard and is enabled by default on CentOS 7 and 8. To check whether SELinux is enabled and enforcing on your system, use `getenforce`:
@@ -14,4 +13,4 @@ After being historically used by government agencies, SELinux is now industry st
Enforcing
```
-We provide two RPMs (Red Hat packages) that enable Rancher products to function properly on SELinux-enforcing hosts: [`rancher-selinux`](../reference-guides/rancher-security/selinux-rpm/about-rancher-selinux.md) and [`rke2-selinux`](../reference-guides/rancher-security/selinux-rpm/about-rke2-selinux.md).
\ No newline at end of file
+We provide two RPMs (Red Hat packages) that enable Rancher products to function properly on SELinux-enforcing hosts: [`rancher-selinux`](../reference-guides/rancher-security/selinux-rpm/about-rancher-selinux.md) and [`rke2-selinux`](../reference-guides/rancher-security/selinux-rpm/about-rke2-selinux.md).
\ No newline at end of file
diff --git a/docs/pages-for-subheaders/set-up-cloud-providers.md b/docs/pages-for-subheaders/set-up-cloud-providers.md
index 97d6ceb6a2f..b26be09828d 100644
--- a/docs/pages-for-subheaders/set-up-cloud-providers.md
+++ b/docs/pages-for-subheaders/set-up-cloud-providers.md
@@ -1,7 +1,7 @@
---
title: Setting up Cloud Providers
-weight: 2300
---
+
A _cloud provider_ is a module in Kubernetes that provides an interface for managing nodes, load balancers, and networking routes.
When a cloud provider is set up in Rancher, the Rancher server can automatically provision new nodes, load balancers or persistent storage devices when launching Kubernetes definitions, if the cloud provider you're using supports such automation.
diff --git a/docs/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md b/docs/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md
index 9fbcc530135..edb8cc1b211 100644
--- a/docs/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md
+++ b/docs/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md
@@ -1,6 +1,5 @@
---
title: Setting up Clusters from Hosted Kubernetes Providers
-weight: 3
---
In this scenario, Rancher does not provision Kubernetes because it is installed by providers such as Google Kubernetes Engine (GKE), Amazon Elastic Container Service for Kubernetes, or Azure Kubernetes Service.
@@ -13,8 +12,8 @@ Rancher supports the following Kubernetes providers:
- [Google GKE (Google Kubernetes Engine)](https://cloud.google.com/kubernetes-engine/)
- [Amazon EKS (Amazon Elastic Container Service for Kubernetes)](https://aws.amazon.com/eks/)
-- [Microsoft AKS (Azure Kubernetes Service)](https://azure.microsoft.com/en-us/services/kubernetes-service/)
-- [Alibaba ACK (Alibaba Cloud Container Service for Kubernetes)](https://www.alibabacloud.com/product/kubernetes)
+- [Microsoft AKS (Azure Kubernetes Service)](https://azure.microsoft.com/en-us/services/kubernetes-service/)
+- [Alibaba ACK (Alibaba Cloud Container Service for Kubernetes)](https://www.alibabacloud.com/product/kubernetes)
- [Tencent TKE (Tencent Kubernetes Engine)](https://intl.cloud.tencent.com/product/tke)
- [Huawei CCE (Huawei Cloud Container Engine)](https://www.huaweicloud.com/en-us/product/cce.html)
diff --git a/docs/pages-for-subheaders/use-existing-nodes.md b/docs/pages-for-subheaders/use-existing-nodes.md
index c792873702f..6f1156df423 100644
--- a/docs/pages-for-subheaders/use-existing-nodes.md
+++ b/docs/pages-for-subheaders/use-existing-nodes.md
@@ -1,8 +1,6 @@
---
title: Launching Kubernetes on Existing Custom Nodes
-description: To create a cluster with custom nodes, you’ll need to access servers in your cluster and provision them according to Rancher requirements
-metaDescription: "To create a cluster with custom nodes, you’ll need to access servers in your cluster and provision them according to Rancher requirements"
-weight: 2225
+description: To create a cluster with custom nodes, you’ll need to access servers in your cluster and provision them according to Rancher requirements
---
When you create a custom cluster, Rancher uses RKE (the Rancher Kubernetes Engine) to create a Kubernetes cluster in on-prem bare-metal servers, on-prem virtual machines, or in any node hosted by an infrastructure provider.
@@ -43,10 +41,10 @@ If you're using Amazon EC2 as your host and want to use the [dual-stack](https:/
1. Use **Cluster Configuration** section to choose the version of Kubernetes, what network provider will be used and if you want to enable project network isolation. To see more cluster options, click on **Show advanced options**.
:::note Using Windows nodes as Kubernetes workers?
-
+
- See [Enable the Windows Support Option](use-windows-clusters.md).
- The only Network Provider available for clusters with Windows support is Flannel.
-
+
:::
:::note Dual-stack on Amazon EC2:
@@ -75,20 +73,20 @@ If you're using Amazon EC2 as your host and want to use the [dual-stack](https:/
10. Log in to your Linux host using your preferred shell, such as PuTTy or a remote Terminal connection. Run the command copied to your clipboard.
:::note
-
+
Repeat steps 7-10 if you want to dedicate specific hosts to specific node roles. Repeat the steps as many times as needed.
-:::
+:::
11. When you finish running the command(s) on your Linux host(s), click **Done**.
-**Result:**
+**Result:**
Your cluster is created and assigned a state of **Provisioning**. Rancher is standing up your cluster.
You can access your cluster after its state is updated to **Active**.
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
@@ -113,7 +111,7 @@ The following resources need to be tagged with a `ClusterID`:
- **Security Group**: The security group used for your cluster.
:::note
-
+
Do not tag multiple security groups. Tagging multiple groups generates an error when creating Elastic Load Balancer.
:::
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 b02640832c7..1e2351d6b65 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
@@ -1,6 +1,5 @@
---
title: Launching Kubernetes on New Nodes in an Infrastructure Provider
-weight: 2205
---
When you create an RKE or RKE2 cluster using a node template in Rancher, each resulting node pool is shown in a new **Machine Pools** tab. You can see the machine pools by doing the following:
@@ -47,13 +46,13 @@ To access all node templates, an administrator will need to do the following:
### Node Pools
-Using Rancher, you can create pools of nodes based on a [node template](#node-templates).
+Using Rancher, you can create pools of nodes based on a [node template](#node-templates).
A node template defines the configuration of a node, like what operating system to use, number of CPUs, and amount of memory.
The benefit of using a node pool is that if a node is destroyed or deleted, you can increase the number of live nodes to compensate for the node that was lost. The node pool helps you ensure that the count of the node pool is as expected.
-Each node pool must have one or more nodes roles assigned.
+Each node pool must have one or more nodes roles assigned.
Each node role (i.e. etcd, controlplane, and worker) should be assigned to a distinct node pool. Although it is possible to assign multiple node roles to a node pool, this should not be done for production clusters.
@@ -134,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/advanced-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/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md#rke2-cluster-template) for additional information.
:::
diff --git a/docs/pages-for-subheaders/use-windows-clusters.md b/docs/pages-for-subheaders/use-windows-clusters.md
index 095e7853764..3eeb0e5e80e 100644
--- a/docs/pages-for-subheaders/use-windows-clusters.md
+++ b/docs/pages-for-subheaders/use-windows-clusters.md
@@ -1,6 +1,5 @@
---
title: Launching Kubernetes on Windows Clusters
-weight: 2240
---
When provisioning a [custom cluster](use-existing-nodes.md) using Rancher, Rancher uses RKE (the Rancher Kubernetes Engine) to install Kubernetes on your existing nodes.
diff --git a/docs/pages-for-subheaders/user-settings.md b/docs/pages-for-subheaders/user-settings.md
index bab26d837ba..9b5db2f3278 100644
--- a/docs/pages-for-subheaders/user-settings.md
+++ b/docs/pages-for-subheaders/user-settings.md
@@ -1,6 +1,5 @@
---
title: User Settings
-weight: 23
---
Within Rancher, each user has a number of settings associated with their login: personal preferences, API keys, etc. You can configure these settings by choosing from the **User Settings** menu. You can open this menu by clicking your avatar, located within the main menu.
diff --git a/docs/pages-for-subheaders/vsphere-cloud-provider.md b/docs/pages-for-subheaders/vsphere-cloud-provider.md
index 01f1d0ee24e..c203f97184f 100644
--- a/docs/pages-for-subheaders/vsphere-cloud-provider.md
+++ b/docs/pages-for-subheaders/vsphere-cloud-provider.md
@@ -1,6 +1,5 @@
---
title: Setting up the vSphere Cloud Provider
-weight: 4
---
In this section, you'll learn how to set up a vSphere cloud provider for a Rancher managed RKE Kubernetes cluster in vSphere.
diff --git a/docs/pages-for-subheaders/vsphere.md b/docs/pages-for-subheaders/vsphere.md
index b80685cc1d1..25cb8a57eb7 100644
--- a/docs/pages-for-subheaders/vsphere.md
+++ b/docs/pages-for-subheaders/vsphere.md
@@ -1,9 +1,6 @@
---
title: Creating a vSphere Cluster
-shortTitle: vSphere
description: Use Rancher to create a vSphere cluster. It may consist of groups of VMs with distinct properties which allow for fine-grained control over the sizing of nodes.
-metaDescription: Use Rancher to create a vSphere cluster. It may consist of groups of VMs with distinct properties which allow for fine-grained control over the sizing of nodes.
-weight: 2225
---
import YouTube from '@site/src/components/YouTube'
diff --git a/docs/pages-for-subheaders/workloads-and-pods.md b/docs/pages-for-subheaders/workloads-and-pods.md
index ea909365f75..94ac0881d6d 100644
--- a/docs/pages-for-subheaders/workloads-and-pods.md
+++ b/docs/pages-for-subheaders/workloads-and-pods.md
@@ -1,7 +1,6 @@
---
title: "Kubernetes Workloads and Pods"
description: "Learn about the two constructs with which you can build any complex containerized application in Kubernetes: Kubernetes workloads and pods"
-weight: 3025
---
You can build any complex containerized application in Kubernetes using two basic constructs: pods and workloads. Once you build an application, you can expose it for access either within the same cluster or on the Internet using a third construct: services.
diff --git a/docs/rancher-manager.md b/docs/rancher-manager.md
index 82175c673d6..72e752d5702 100644
--- a/docs/rancher-manager.md
+++ b/docs/rancher-manager.md
@@ -1,15 +1,7 @@
---
slug: /
-weight: 1
title: "Rancher 2.6"
-shortTitle: "Rancher 2.6 (Latest)"
description: "Rancher adds significant value on top of Kubernetes: managing hundreds of clusters from one interface, centralizing RBAC, enabling monitoring and alerting. Read more."
-metaTitle: "Rancher 2.6 Docs: What is New?"
-metaDescription: "Rancher 2 adds significant value on top of Kubernetes: managing hundreds of clusters from one interface, centralizing RBAC, enabling monitoring and alerting. Read more."
-insertOneSix: false
-ctaBanner: 0
-aliases:
- - /rancher/v2.x/en/
---
Rancher is a Kubernetes management tool to deploy and run clusters anywhere and on any provider.
diff --git a/docs/reference-guides/about-the-api/api-tokens.md b/docs/reference-guides/about-the-api/api-tokens.md
index 24a9a86d1bf..946324c85da 100644
--- a/docs/reference-guides/about-the-api/api-tokens.md
+++ b/docs/reference-guides/about-the-api/api-tokens.md
@@ -1,6 +1,5 @@
---
title: API Tokens
-weight: 1
---
By default, some cluster-level API tokens are generated with infinite time-to-live (`ttl=0`). In other words, API tokens with `ttl=0` never expire unless you invalidate them. Tokens are not invalidated by changing a password.
diff --git a/docs/reference-guides/amazon-eks-permissions/minimum-eks-permissions.md b/docs/reference-guides/amazon-eks-permissions/minimum-eks-permissions.md
index 8f5d362d7d3..b45ed936c83 100644
--- a/docs/reference-guides/amazon-eks-permissions/minimum-eks-permissions.md
+++ b/docs/reference-guides/amazon-eks-permissions/minimum-eks-permissions.md
@@ -1,11 +1,10 @@
---
title: Minimum EKS Permissions
-weight: 1
---
Documented here is a minimum set of permissions necessary to use all functionality of the EKS driver in Rancher. Additional permissions are required for Rancher to provision the `Service Role` and `VPC` resources. Optionally these resources can be created **before** the cluster creation and will be selectable when defining the cluster configuration.
-Resource | Description
+Resource | Description
---------|------------
Service Role | The service role provides Kubernetes the permissions it requires to manage resources on your behalf. Rancher can create the service role with the following [Service Role Permissions](#service-role-permissions).
VPC | Provides isolated network resources utilised by EKS and worker nodes. Rancher can create the VPC resources with the following [VPC Permissions](#vpc-permissions).
diff --git a/docs/reference-guides/backup-restore-configuration/backup-configuration.md b/docs/reference-guides/backup-restore-configuration/backup-configuration.md
index 9351a312631..8adeed1b111 100644
--- a/docs/reference-guides/backup-restore-configuration/backup-configuration.md
+++ b/docs/reference-guides/backup-restore-configuration/backup-configuration.md
@@ -1,7 +1,5 @@
---
title: Backup Configuration
-shortTitle: Backup
-weight: 1
---
The Backup Create page lets you configure a schedule, enable encryption and specify the storage location for your backups.
@@ -131,7 +129,7 @@ There are two ways to set up the `rancher-backup` operator to use S3 as the back
One way is to configure the `credentialSecretName` in the Backup custom resource, which refers to AWS credentials that have access to S3.
-If the cluster nodes are in Amazon EC2, the S3 access can also be set up by assigning IAM permissions to the EC2 nodes so that they can access S3.
+If the cluster nodes are in Amazon EC2, the S3 access can also be set up by assigning IAM permissions to the EC2 nodes so that they can access S3.
To allow a node to access S3, follow the instructions in the [AWS documentation](https://aws.amazon.com/premiumsupport/knowledge-center/ec2-instance-access-s3-bucket/) to create an IAM role for EC2. When you add a custom policy to the role, add the following permissions, and replace the `Resource` with your bucket name:
@@ -164,7 +162,7 @@ To allow a node to access S3, follow the instructions in the [AWS documentation]
}
```
-After the role is created, and you have attached the corresponding instance profile to your EC2 instance(s), the `credentialSecretName` directive can be left empty in the Backup custom resource.
+After the role is created, and you have attached the corresponding instance profile to your EC2 instance(s), the `credentialSecretName` directive can be left empty in the Backup custom resource.
## Examples
diff --git a/docs/reference-guides/backup-restore-configuration/examples.md b/docs/reference-guides/backup-restore-configuration/examples.md
index fbb9685cc20..1c449a8dd9d 100644
--- a/docs/reference-guides/backup-restore-configuration/examples.md
+++ b/docs/reference-guides/backup-restore-configuration/examples.md
@@ -1,6 +1,5 @@
---
title: Examples
-weight: 5
---
This section contains examples of Backup and Restore custom resources.
@@ -260,7 +259,7 @@ data:
The snippet below demonstrates two different types of secrets and their relevance with respect to Backup and Restore of custom resources.
-The first example is that of a secret that is used to encrypt the backup files. The backup operator, in this case, will not be able to read the secrets encryption file. It only uses the contents of the secret.
+The first example is that of a secret that is used to encrypt the backup files. The backup operator, in this case, will not be able to read the secrets encryption file. It only uses the contents of the secret.
The second example is that of a Kubernetes secrets encryption config file that is used to encrypt secrets when stored in etcd. **When backing up the etcd datastore, be sure to also back up the EncryptionConfiguration.** Failure to do so will result in an inability to use the restored data if secrets encryption was in use at the time the data was backed up.
diff --git a/docs/reference-guides/backup-restore-configuration/restore-configuration.md b/docs/reference-guides/backup-restore-configuration/restore-configuration.md
index 40dc764e0ab..0616d15ad8f 100644
--- a/docs/reference-guides/backup-restore-configuration/restore-configuration.md
+++ b/docs/reference-guides/backup-restore-configuration/restore-configuration.md
@@ -1,7 +1,5 @@
---
title: Restore Configuration
-shortTitle: Restore
-weight: 2
---
The Restore Create page lets you provide details of the backup to restore from
@@ -34,13 +32,13 @@ Select this option if you are restoring from a backup file that exists in the de
Select this option if no default storage location is configured at the operator-level, OR if the backup file exists in a different S3 bucket than the one configured as the default storage location. Provide the exact filename in the **Backup Filename** field. Refer to [this section](#getting-the-backup-filename-from-s3) for exact steps on getting the backup filename from s3. Fill in all the details for the S3 compatible object store. Its fields are exactly same as ones for the `backup.StorageLocation` configuration in the [Backup custom resource.](backup-configuration.md#storage-location)
-
+
## Encryption
If the backup was created with encryption enabled, its file will have `.enc` suffix. Choosing such a Backup, or providing a backup filename with `.enc` suffix will display another dropdown named **Encryption Config Secret**.
-
+
The Secret selected from this dropdown must have the same contents as the one used for the Backup custom resource while performing the backup. If the encryption configuration doesn't match, the restore will fail
diff --git a/docs/reference-guides/backup-restore-configuration/storage-configuration.md b/docs/reference-guides/backup-restore-configuration/storage-configuration.md
index e4c01eddbae..bb64bd86e2f 100644
--- a/docs/reference-guides/backup-restore-configuration/storage-configuration.md
+++ b/docs/reference-guides/backup-restore-configuration/storage-configuration.md
@@ -1,7 +1,5 @@
---
title: Backup Storage Location Configuration
-shortTitle: Storage
-weight: 3
---
Configure a storage location where all backups are saved by default. You will have the option to override this with each backup, but will be limited to using an S3-compatible object store.
@@ -35,7 +33,7 @@ For information about creating storage classes refer to [this section.](../../ho
:::note Important:
-It is highly recommended to use a StorageClass with a reclaim policy of "Retain". Otherwise if the PVC created by the `rancher-backup` chart gets deleted (either during app upgrade, or accidentally), the PV will get deleted too, which means all backups saved in it will get deleted.
+It is highly recommended to use a StorageClass with a reclaim policy of "Retain". Otherwise if the PVC created by the `rancher-backup` chart gets deleted (either during app upgrade, or accidentally), the PV will get deleted too, which means all backups saved in it will get deleted.
If no such StorageClass is available, after the PV is provisioned, make sure to edit its reclaim policy and set it to "Retain" before storing backups in it.
:::
@@ -46,7 +44,7 @@ Select an existing Persistent Volume (PV) that will be used to store your backup
:::note Important:
-It is highly recommended to use a Persistent Volume with a reclaim policy of "Retain". Otherwise if the PVC created by the `rancher-backup` chart gets deleted (either during app upgrade, or accidentally), the PV will get deleted too, which means all backups saved in it will get deleted.
+It is highly recommended to use a Persistent Volume with a reclaim policy of "Retain". Otherwise if the PVC created by the `rancher-backup` chart gets deleted (either during app upgrade, or accidentally), the PV will get deleted too, which means all backups saved in it will get deleted.
:::
diff --git a/docs/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md b/docs/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md
index 733bfb40555..d2d8f20e82d 100644
--- a/docs/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md
+++ b/docs/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md
@@ -1,7 +1,7 @@
---
title: Logging Best Practices
-weight: 1
---
+
In this guide, we recommend best practices for cluster-level logging and application logging.
- [Cluster-level Logging](#cluster-level-logging)
@@ -10,9 +10,9 @@ In this guide, we recommend best practices for cluster-level logging and applica
Before Rancher v2.5, logging in Rancher has historically been a pretty static integration. There were a fixed list of aggregators to choose from (ElasticSearch, Splunk, Kafka, Fluentd and Syslog), and only two configuration points to choose (Cluster-level and Project-level).
-Rancher provides a flexible experience for log aggregation. With the logging feature, administrators and users alike can deploy logging that meets fine-grained collection criteria while offering a wider array of destinations and configuration options.
+Rancher provides a flexible experience for log aggregation. With the logging feature, administrators and users alike can deploy logging that meets fine-grained collection criteria while offering a wider array of destinations and configuration options.
-"Under the hood", Rancher logging uses the Banzai Cloud logging operator. We provide manageability of this operator (and its resources), and tie that experience in with managing your Rancher clusters.
+"Under the hood", Rancher logging uses the Banzai Cloud logging operator. We provide manageability of this operator (and its resources), and tie that experience in with managing your Rancher clusters.
## Cluster-level Logging
@@ -22,13 +22,13 @@ For some users, it is desirable to scrape logs from every container running in t
In this scenario, it is recommended to create at least two _ClusterOutput_ objects - one for your security team (if you have that requirement), and one for yourselves, the cluster administrators. When creating these objects take care to choose an output endpoint that can handle the significant log traffic coming from the entire cluster. Also make sure to choose an appropriate index to receive all these logs.
-Once you have created these _ClusterOutput_ objects, create a _ClusterFlow_ to collect all the logs. Do not define any _Include_ or _Exclude_ rules on this flow. This will ensure that all logs from across the cluster are collected. If you have two _ClusterOutputs_, make sure to send logs to both of them.
+Once you have created these _ClusterOutput_ objects, create a _ClusterFlow_ to collect all the logs. Do not define any _Include_ or _Exclude_ rules on this flow. This will ensure that all logs from across the cluster are collected. If you have two _ClusterOutputs_, make sure to send logs to both of them.
### Kubernetes Components
_ClusterFlows_ have the ability to collect logs from all containers on all hosts in the Kubernetes cluster. This works well in cases where those containers are part of a Kubernetes pod; however, RKE containers exist outside of the scope of Kubernetes.
-Currently the logs from RKE containers are collected, but are not able to easily be filtered. This is because those logs do not contain information as to the source container (e.g. `etcd` or `kube-apiserver`).
+Currently the logs from RKE containers are collected, but are not able to easily be filtered. This is because those logs do not contain information as to the source container (e.g. `etcd` or `kube-apiserver`).
A future release of Rancher will include the source container name which will enable filtering of these component logs. Once that change is made, you will be able to customize a _ClusterFlow_ to retrieve **only** the Kubernetes component logs, and direct them to an appropriate output.
@@ -36,15 +36,15 @@ A future release of Rancher will include the source container name which will en
Best practice not only in Kubernetes but in all container-based applications is to direct application logs to `stdout`/`stderr`. The container runtime will then trap these logs and do **something** with them - typically writing them to a file. Depending on the container runtime (and its configuration), these logs can end up in any number of locations.
-In the case of writing the logs to a file, Kubernetes helps by creating a `/var/log/containers` directory on each host. This directory symlinks the log files to their actual destination (which can differ based on configuration or container runtime).
+In the case of writing the logs to a file, Kubernetes helps by creating a `/var/log/containers` directory on each host. This directory symlinks the log files to their actual destination (which can differ based on configuration or container runtime).
-Rancher logging will read all log entries in `/var/log/containers`, ensuring that all log entries from all containers (assuming a default configuration) will have the opportunity to be collected and processed.
+Rancher logging will read all log entries in `/var/log/containers`, ensuring that all log entries from all containers (assuming a default configuration) will have the opportunity to be collected and processed.
### Specific Log Files
Log collection only retrieves `stdout`/`stderr` logs from pods in Kubernetes. But what if we want to collect logs from other files that are generated by applications? Here, a log streaming sidecar (or two) may come in handy.
-The goal of setting up a streaming sidecar is to take log files that are written to disk, and have their contents streamed to `stdout`. This way, the Banzai Logging Operator can pick up those logs and send them to your desired output.
+The goal of setting up a streaming sidecar is to take log files that are written to disk, and have their contents streamed to `stdout`. This way, the Banzai Logging Operator can pick up those logs and send them to your desired output.
To set this up, edit your workload resource (e.g. Deployment) and add the following sidecar definition:
@@ -81,8 +81,8 @@ spec:
## General Best Practices
-- Where possible, output structured log entries (e.g. `syslog`, JSON). This makes handling of the log entry easier as there are already parsers written for these formats.
-- Try to provide the name of the application that is creating the log entry, in the entry itself. This can make troubleshooting easier as Kubernetes objects do not always carry the name of the application as the object name. For instance, a pod ID may be something like `myapp-098kjhsdf098sdf98` which does not provide much information about the application running inside the container.
+- Where possible, output structured log entries (e.g. `syslog`, JSON). This makes handling of the log entry easier as there are already parsers written for these formats.
+- Try to provide the name of the application that is creating the log entry, in the entry itself. This can make troubleshooting easier as Kubernetes objects do not always carry the name of the application as the object name. For instance, a pod ID may be something like `myapp-098kjhsdf098sdf98` which does not provide much information about the application running inside the container.
- Except in the case of collecting all logs cluster-wide, try to scope your _Flow_ and _ClusterFlow_ objects tightly. This makes it easier to troubleshoot when problems arise, and also helps ensure unrelated log entries do not show up in your aggregator. An example of tight scoping would be to constrain a _Flow_ to a single _Deployment_ in a namespace, or perhaps even a single container within a _Pod_.
-- Keep the log verbosity down except when troubleshooting. High log verbosity poses a number of issues, chief among them being **noise**: significant events can be drowned out in a sea of `DEBUG` messages. This is somewhat mitigated with automated alerting and scripting, but highly verbose logging still places an inordinate amount of stress on the logging infrastructure.
-- Where possible, try to provide a transaction or request ID with the log entry. This can make tracing application activity across multiple log sources easier, especially when dealing with distributed applications.
+- Keep the log verbosity down except when troubleshooting. High log verbosity poses a number of issues, chief among them being **noise**: significant events can be drowned out in a sea of `DEBUG` messages. This is somewhat mitigated with automated alerting and scripting, but highly verbose logging still places an inordinate amount of stress on the logging infrastructure.
+- Where possible, try to provide a transaction or request ID with the log entry. This can make tracing application activity across multiple log sources easier, especially when dealing with distributed applications.
diff --git a/docs/reference-guides/best-practices/rancher-managed-clusters/monitoring-best-practices.md b/docs/reference-guides/best-practices/rancher-managed-clusters/monitoring-best-practices.md
index 9fa6dc758dc..b81cc563df8 100644
--- a/docs/reference-guides/best-practices/rancher-managed-clusters/monitoring-best-practices.md
+++ b/docs/reference-guides/best-practices/rancher-managed-clusters/monitoring-best-practices.md
@@ -1,6 +1,5 @@
---
title: Monitoring Best Practices
-weight: 2
---
Configuring sensible monitoring and alerting rules is vital for running any production workloads securely and reliably. This is not different when using Kubernetes and Rancher. Fortunately the integrated monitoring and alerting functionality makes this whole process a lot easier.
diff --git a/docs/reference-guides/best-practices/rancher-managed-clusters/rancher-managed-clusters-in-vsphere.md b/docs/reference-guides/best-practices/rancher-managed-clusters/rancher-managed-clusters-in-vsphere.md
index 1f7f08da9c3..6d027542c4c 100644
--- a/docs/reference-guides/best-practices/rancher-managed-clusters/rancher-managed-clusters-in-vsphere.md
+++ b/docs/reference-guides/best-practices/rancher-managed-clusters/rancher-managed-clusters-in-vsphere.md
@@ -1,6 +1,5 @@
---
title: Best Practices for Rancher Managed vSphere Clusters
-shortTitle: Rancher Managed Clusters in vSphere
---
This guide outlines a reference architecture for provisioning downstream Rancher clusters in a vSphere environment, in addition to standard vSphere best practices as documented by VMware.
@@ -32,7 +31,7 @@ Doing so will ensure node VM's are spread across multiple datastores - preventin
It’s important to follow K8s and etcd best practices when deploying your nodes, including disabling swap, double-checking you have full network connectivity between all machines in the cluster, using unique hostnames, MAC addresses, and product_uuids for every node.
-# 2. Network Considerations
+# 2. Network Considerations
### Leverage Low Latency, High Bandwidth Connectivity Between ETCD Nodes
@@ -46,7 +45,7 @@ Each node used should have a static IP configured. In the case of DHCP, each nod
### Leverage SSD Drives for ETCD Nodes
-ETCD is very sensitive to write latency. Therefore, leverage SSD disks where possible.
+ETCD is very sensitive to write latency. Therefore, leverage SSD disks where possible.
# 4. Backups and Disaster Recovery
diff --git a/docs/reference-guides/best-practices/rancher-managed-clusters/tips-to-set-up-containers.md b/docs/reference-guides/best-practices/rancher-managed-clusters/tips-to-set-up-containers.md
index 323acdb8fdd..b0b68c8cb66 100644
--- a/docs/reference-guides/best-practices/rancher-managed-clusters/tips-to-set-up-containers.md
+++ b/docs/reference-guides/best-practices/rancher-managed-clusters/tips-to-set-up-containers.md
@@ -1,6 +1,5 @@
---
title: Tips for Setting Up Containers
-weight: 100
---
Running well-built containers can greatly impact the overall performance and security of your environment.
@@ -11,14 +10,14 @@ For a more detailed discussion of security for containers, you can also refer to
### Use a Common Container OS
-When possible, you should try to standardize on a common container base OS.
+When possible, you should try to standardize on a common container base OS.
Smaller distributions such as Alpine and BusyBox reduce container image size and generally have a smaller attack/vulnerability surface.
Popular distributions such as Ubuntu, Fedora, and CentOS are more field-tested and offer more functionality.
### Start with a FROM scratch container
-If your microservice is a standalone static binary, you should use a FROM scratch container.
+If your microservice is a standalone static binary, you should use a FROM scratch container.
The FROM scratch container is an [official Docker image](https://hub.docker.com/_/scratch) that is empty so that you can use it to design minimal images.
diff --git a/docs/reference-guides/best-practices/rancher-server/on-premises-rancher-in-vsphere.md b/docs/reference-guides/best-practices/rancher-server/on-premises-rancher-in-vsphere.md
index 40d7848ba5a..d861d39445e 100644
--- a/docs/reference-guides/best-practices/rancher-server/on-premises-rancher-in-vsphere.md
+++ b/docs/reference-guides/best-practices/rancher-server/on-premises-rancher-in-vsphere.md
@@ -1,7 +1,5 @@
---
title: Installing Rancher in a vSphere Environment
-shortTitle: On-Premises Rancher in vSphere
-weight: 3
---
This guide outlines a reference architecture for installing Rancher on an RKE Kubernetes cluster in a vSphere environment, in addition to standard vSphere best practices as documented by VMware.
@@ -27,7 +25,7 @@ In the event of a Disaster Recovery activity, availability of the Load balancer
Configure the Load balancer to automatically mark nodes as unavailable if a health check is failed. For example, NGINX can facilitate this with:
-`max_fails=3 fail_timeout=5s`
+`max_fails=3 fail_timeout=5s`
### Leverage an External Load Balancer
@@ -59,7 +57,7 @@ Doing so will ensure node VM's are spread across multiple datastores - preventin
It’s important to follow K8s and etcd best practices when deploying your nodes, including disabling swap, double-checking you have full network connectivity between all machines in the cluster, using unique hostnames, MAC addresses, and product_uuids for every node.
-## 3. Network Considerations
+## 3. Network Considerations
### Leverage Low Latency, High Bandwidth Connectivity Between ETCD Nodes
@@ -73,7 +71,7 @@ Each node used should have a static IP configured. In the case of DHCP, each nod
### Leverage SSD Drives for ETCD Nodes
-ETCD is very sensitive to write latency. Therefore, leverage SSD disks where possible.
+ETCD is very sensitive to write latency. Therefore, leverage SSD disks where possible.
## 5. Backups and Disaster Recovery
diff --git a/docs/reference-guides/best-practices/rancher-server/rancher-deployment-strategy.md b/docs/reference-guides/best-practices/rancher-server/rancher-deployment-strategy.md
index dea9e2ba34b..f6686a3687c 100644
--- a/docs/reference-guides/best-practices/rancher-server/rancher-deployment-strategy.md
+++ b/docs/reference-guides/best-practices/rancher-server/rancher-deployment-strategy.md
@@ -1,6 +1,5 @@
---
title: Rancher Deployment Strategy
-weight: 100
---
There are two recommended deployment strategies for a Rancher instance that manages downstream Kubernetes clusters. Each one has its own pros and cons. Read more about which one would fit best for your use case:
diff --git a/docs/reference-guides/best-practices/rancher-server/tips-for-running-rancher.md b/docs/reference-guides/best-practices/rancher-server/tips-for-running-rancher.md
index 312401b9106..4ad5c8a8b3e 100644
--- a/docs/reference-guides/best-practices/rancher-server/tips-for-running-rancher.md
+++ b/docs/reference-guides/best-practices/rancher-server/tips-for-running-rancher.md
@@ -1,6 +1,5 @@
---
title: Tips for Running Rancher
-weight: 100
---
This guide is geared toward use cases where Rancher is used to manage downstream Kubernetes clusters. The high-availability setup is intended to prevent losing access to downstream clusters if the Rancher server is not available.
@@ -18,7 +17,7 @@ Don't run other workloads or microservices in the Kubernetes cluster that Ranche
It's important to follow K8s and etcd best practices when deploying your nodes, including disabling swap, double checking you have full network connectivity between all machines in the cluster, using unique hostnames, MAC addresses, and product_uuids for every node, checking that all correct ports are opened, and deploying with ssd backed etcd. More details can be found in the [kubernetes docs](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/#before-you-begin) and [etcd's performance op guide](https://etcd.io/docs/v3.4/op-guide/performance/).
### When using RKE: Back up the Statefile
-RKE keeps record of the cluster state in a file called `cluster.rkestate`. This file is important for the recovery of a cluster and/or the continued maintenance of the cluster through RKE. Because this file contains certificate material, we strongly recommend encrypting this file before backing up. After each run of `rke up` you should backup the state file.
+RKE keeps record of the cluster state in a file called `cluster.rkestate`. This file is important for the recovery of a cluster and/or the continued maintenance of the cluster through RKE. Because this file contains certificate material, we strongly recommend encrypting this file before backing up. After each run of `rke up` you should backup the state file.
### Run All Nodes in the Cluster in the Same Datacenter
For best performance, run all three of your nodes in the same geographic datacenter. If you are running nodes in the cloud, such as AWS, run each node in a separate Availability Zone. For example, launch node 1 in us-west-2a, node 2 in us-west-2b, and node 3 in us-west-2c.
@@ -31,7 +30,7 @@ The Rancher server's Kubernetes cluster should run within the [system and hardwa
However, metrics-driven capacity planning analysis should be the ultimate guidance for scaling Rancher, because the published requirements take into account a variety of workload types.
-Using Rancher, you can monitor the state and processes of your cluster nodes, Kubernetes components, and software deployments through integration with Prometheus, a leading open-source monitoring solution, and Grafana, which lets you visualize the metrics from Prometheus.
+Using Rancher, you can monitor the state and processes of your cluster nodes, Kubernetes components, and software deployments through integration with Prometheus, a leading open-source monitoring solution, and Grafana, which lets you visualize the metrics from Prometheus.
After you [enable monitoring](../../../pages-for-subheaders/monitoring-and-alerting.md) in the cluster, you can set up alerts to let you know if your cluster is approaching its capacity. You can also use the Prometheus and Grafana monitoring framework to establish a baseline for key metrics as you scale.
diff --git a/docs/reference-guides/cli-with-rancher/rancher-cli.md b/docs/reference-guides/cli-with-rancher/rancher-cli.md
index 05a6fca13a0..8fe63c0e565 100644
--- a/docs/reference-guides/cli-with-rancher/rancher-cli.md
+++ b/docs/reference-guides/cli-with-rancher/rancher-cli.md
@@ -1,7 +1,6 @@
---
title: Rancher CLI
description: Interact with Rancher using command line interface (CLI) tools from your workstation.
-weight: 21
---
The Rancher CLI (Command Line Interface) is a unified tool that you can use to interact with Rancher. With this tool, you can operate Rancher using a command line rather than the GUI.
diff --git a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/amazon-ec2.md b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/amazon-ec2.md
index 4b00f3e1bf1..4301eb2516e 100644
--- a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/amazon-ec2.md
+++ b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/amazon-ec2.md
@@ -1,6 +1,5 @@
---
title: EC2 Machine Configuration Reference
-weight: 2
---
For more details about EC2 nodes, refer to the official documentation for the [EC2 Management Console](https://aws.amazon.com/ec2).
diff --git a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/azure.md b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/azure.md
index 4c5304eb1e2..9bc793c7f5c 100644
--- a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/azure.md
+++ b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/azure.md
@@ -1,6 +1,5 @@
---
title: Azure Machine Configuration
-weight: 2
---
For more information about Azure, refer to the official [Azure documentation.](https://docs.microsoft.com/en-us/azure/?product=featured)
diff --git a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/digitalocean.md b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/digitalocean.md
index 0ae2f8d831a..54d7d2c15a3 100644
--- a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/digitalocean.md
+++ b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/digitalocean.md
@@ -1,6 +1,5 @@
---
title: DigitalOcean Machine Configuration
-weight: 2
---
For more details about DigitalOcean, Droplets, refer to the [official documentation](https://docs.digitalocean.com/products/compute/).
diff --git a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
index 8a72e8be2b6..f907c674f52 100644
--- a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
+++ b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
@@ -1,22 +1,21 @@
---
title: EC2 Node Template Configuration
-weight: 1
---
-For more details about EC2, nodes, refer to the official documentation for the [EC2 Management Console](https://aws.amazon.com/ec2).
+For more details about EC2, nodes, refer to the official documentation for the [EC2 Management Console](https://aws.amazon.com/ec2).
### Region
In the **Region** field, select the same region that you used when creating your cloud credentials.
### Cloud Credentials
-Your AWS account access information, stored in a [cloud credential.](../../../user-settings/manage-cloud-credentials.md)
+Your AWS account access information, stored in a [cloud credential.](../../../user-settings/manage-cloud-credentials.md)
See [Amazon Documentation: Creating Access Keys](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html#Using_CreateAccessKey) how to create an Access Key and Secret Key.
See [Amazon Documentation: Creating IAM Policies (Console)](https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_create.html#access_policies_create-start) how to create an IAM policy.
-See [Amazon Documentation: Adding Permissions to a User (Console)](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_users_change-permissions.html#users_change_permissions-add-console) how to attach an IAM
+See [Amazon Documentation: Adding Permissions to a User (Console)](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_users_change-permissions.html#users_change_permissions-add-console) how to attach an IAM
See our three example JSON policies:
@@ -26,7 +25,7 @@ See our three example JSON policies:
### Authenticate & Configure Nodes
-Choose an availability zone and network settings for your cluster.
+Choose an availability zone and network settings for your cluster.
### Security Group
diff --git a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md
index e7b00c9363e..9c5cffeb541 100644
--- a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md
+++ b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md
@@ -1,11 +1,10 @@
---
title: Azure Node Template Configuration
-weight: 1
---
For more information about Azure, refer to the official [Azure documentation.](https://docs.microsoft.com/en-us/azure/?product=featured)
-Account access information is stored as a cloud credential. Cloud credentials are stored as Kubernetes secrets. Multiple node templates can use the same cloud credential. You can use an existing cloud credential or create a new one.
+Account access information is stored as a cloud credential. Cloud credentials are stored as Kubernetes secrets. Multiple node templates can use the same cloud credential. You can use an existing cloud credential or create a new one.
- **Placement** sets the geographical region where your cluster is hosted and other location metadata.
- **Network** configures the networking used in your cluster.
diff --git a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md
index ab3e24694bc..4dda4b108a7 100644
--- a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md
+++ b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md
@@ -1,6 +1,5 @@
---
title: DigitalOcean Node Template Configuration
-weight: 1
---
Account access information is stored as a cloud credential. Cloud credentials are stored as Kubernetes secrets. Multiple node templates can use the same cloud credential. You can use an existing cloud credential or create a new one.
diff --git a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md
index 7b96868bf97..3fa53bf414a 100644
--- a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md
+++ b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md
@@ -1,6 +1,5 @@
---
title: Nutanix Node Template Configuration
-weight: 2
---
@@ -15,7 +14,7 @@ weight: 2
## Scheduling
-Choose what Nutanix cluster the virtual machine will be scheduled to.
+Choose what Nutanix cluster the virtual machine will be scheduled to.
| Parameter | Required | Description
|:----------|:--------:|:----------------------------------------------------------------------------
@@ -53,6 +52,6 @@ A category is a grouping of entities into a key value pair. Typically, VMs are a
To make use of cloud-init initialization, paste a cloud config using valid YAML syntax into the **Cloud Config YAML** field. Refer to the [cloud-init documentation](https://cloudinit.readthedocs.io/en/latest/topics/examples.html) for a commented set of examples of supported cloud config directives.
-Note that cloud-init based network configuration is not recommended and only supported via user data `runcmd` rather than by NoCloud or other network configuration datasources.
+Note that cloud-init based network configuration is not recommended and only supported via user data `runcmd` rather than by NoCloud or other network configuration datasources.
Nutanix IP Address Management (IPAM) or another DHCP service is recommended.
diff --git a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md
index 911200879ec..15171e142a3 100644
--- a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md
+++ b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md
@@ -1,6 +1,5 @@
---
title: VSphere Node Template Configuration
-weight: 2
---
@@ -20,7 +19,7 @@ Your cloud credential has these fields:
## Scheduling
-Choose what hypervisor the virtual machine will be scheduled to.
+Choose what hypervisor the virtual machine will be scheduled to.
The fields in the **Scheduling** section should auto-populate with the data center and other scheduling options that are available to you in vSphere.
diff --git a/docs/reference-guides/cluster-configuration/rancher-server-configuration/aks-cluster-configuration.md b/docs/reference-guides/cluster-configuration/rancher-server-configuration/aks-cluster-configuration.md
index 2286f367cfe..1946fa99aa1 100644
--- a/docs/reference-guides/cluster-configuration/rancher-server-configuration/aks-cluster-configuration.md
+++ b/docs/reference-guides/cluster-configuration/rancher-server-configuration/aks-cluster-configuration.md
@@ -1,7 +1,5 @@
---
-shortTitle: AKS Cluster Configuration
title: AKS Cluster Configuration Reference
-weight: 4
---
## Changes in Rancher v2.6
@@ -149,7 +147,7 @@ Container monitoring gives you performance visibility by collecting memory and p
### Log Analytics Workspace Resource Group
-The [resource group](https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/overview#resource-groups) containing the Log Analytics Workspace. You must create at least one workspace to use Azure Monitor Logs.
+The [resource group](https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/overview#resource-groups) containing the Log Analytics Workspace. You must create at least one workspace to use Azure Monitor Logs.
### Log Analytics Workspace Name
diff --git a/docs/reference-guides/cluster-configuration/rancher-server-configuration/eks-cluster-configuration.md b/docs/reference-guides/cluster-configuration/rancher-server-configuration/eks-cluster-configuration.md
index ad5e489d8d5..ae2fe186b52 100644
--- a/docs/reference-guides/cluster-configuration/rancher-server-configuration/eks-cluster-configuration.md
+++ b/docs/reference-guides/cluster-configuration/rancher-server-configuration/eks-cluster-configuration.md
@@ -1,7 +1,5 @@
---
title: EKS Cluster Configuration Reference
-shortTitle: EKS Cluster Configuration
-weight: 2
---
### Account Access
@@ -80,7 +78,7 @@ For more information on EKS control plane logging, refer to the official [docume
### Managed Node Groups
-Amazon EKS managed node groups automate the provisioning and lifecycle management of nodes (Amazon EC2 instances) for Amazon EKS Kubernetes clusters.
+Amazon EKS managed node groups automate the provisioning and lifecycle management of nodes (Amazon EC2 instances) for Amazon EKS Kubernetes clusters.
For more information about how node groups work and how they are configured, refer to the [EKS documentation.](https://docs.aws.amazon.com/eks/latest/userguide/managed-node-groups.html)
diff --git a/docs/reference-guides/cluster-configuration/rancher-server-configuration/gke-cluster-configuration/gke-private-clusters.md b/docs/reference-guides/cluster-configuration/rancher-server-configuration/gke-cluster-configuration/gke-private-clusters.md
index f3a6d1a869d..7a11ccdd76b 100644
--- a/docs/reference-guides/cluster-configuration/rancher-server-configuration/gke-cluster-configuration/gke-private-clusters.md
+++ b/docs/reference-guides/cluster-configuration/rancher-server-configuration/gke-cluster-configuration/gke-private-clusters.md
@@ -1,6 +1,5 @@
---
title: Private Clusters
-weight: 2
---
In GKE, [private clusters](https://cloud.google.com/kubernetes-engine/docs/concepts/private-cluster-concept) are clusters whose nodes are isolated from inbound and outbound traffic by assigning them internal IP addresses only. Private clusters in GKE have the option of exposing the control plane endpoint as a publicly accessible address or as a private address. This is different from other Kubernetes providers, which may refer to clusters with private control plane endpoints as "private clusters" but still allow traffic to and from nodes. You may want to create a cluster with private nodes, with or without a public control plane endpoint, depending on your organization's networking and security requirements. A GKE cluster provisioned from Rancher can use isolated nodes by selecting "Private Cluster" in the Cluster Options (under "Show advanced options"). The control plane endpoint can optionally be made private by selecting "Enable Private Endpoint".
diff --git a/docs/reference-guides/cluster-configuration/rancher-server-configuration/k3s-cluster-configuration.md b/docs/reference-guides/cluster-configuration/rancher-server-configuration/k3s-cluster-configuration.md
index 98ed41cc8a4..af3ca296e87 100644
--- a/docs/reference-guides/cluster-configuration/rancher-server-configuration/k3s-cluster-configuration.md
+++ b/docs/reference-guides/cluster-configuration/rancher-server-configuration/k3s-cluster-configuration.md
@@ -1,7 +1,5 @@
---
title: K3s Cluster Configuration Reference
-shortTitle: K3s Cluster Configuration
-weight: 6
---
This section covers the configuration options that are available in Rancher for a new or existing K3s Kubernetes cluster.
@@ -34,7 +32,7 @@ Option to enable or disable secrets encryption. When enabled, secrets will be en
#### Project Network Isolation
-If your network provider allows project network isolation, you can choose whether to enable or disable inter-project communication.
+If your network provider allows project network isolation, you can choose whether to enable or disable inter-project communication.
#### SELinux
diff --git a/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md b/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
index c4846d3d232..cc46c742a60 100644
--- a/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
+++ b/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
@@ -1,7 +1,5 @@
---
title: RKE Cluster Configuration Reference
-shortTitle: RKE Cluster Configuration
-weight: 1
---
When Rancher installs Kubernetes, it uses [RKE](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) or [RKE2](https://docs.rke2.io/) as the Kubernetes distribution.
diff --git a/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md b/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
index 561185929b9..cefd1305335 100644
--- a/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
+++ b/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
@@ -1,7 +1,5 @@
---
title: RKE2 Cluster Configuration Reference
-shortTitle: RKE2 Cluster Configuration
-weight: 5
---
This section covers the configuration options that are available in Rancher for a new or existing RKE2 Kubernetes cluster.
diff --git a/docs/reference-guides/cluster-configuration/rancher-server-configuration/sync-clusters.md b/docs/reference-guides/cluster-configuration/rancher-server-configuration/sync-clusters.md
index 0280aad9349..a62893ccb45 100644
--- a/docs/reference-guides/cluster-configuration/rancher-server-configuration/sync-clusters.md
+++ b/docs/reference-guides/cluster-configuration/rancher-server-configuration/sync-clusters.md
@@ -1,6 +1,5 @@
---
title: Syncing
-weight: 10
---
Syncing is the feature for EKS and GKE clusters that causes Rancher to update the clusters' values so they are up to date with their corresponding cluster object in the hosted Kubernetes provider. This enables Rancher to not be the sole owner of a hosted cluster’s state. Its largest limitation is that processing an update from Rancher and another source at the same time or within 5 minutes of one finishing may cause the state from one source to completely overwrite the other.
diff --git a/docs/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md b/docs/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md
index 39413de95ba..39e33306ea9 100644
--- a/docs/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md
+++ b/docs/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md
@@ -1,6 +1,5 @@
---
title: Rancher Agent Options
-weight: 2500
---
Rancher deploys an agent on each node to communicate with the node. This pages describes the options that can be passed to the agent. To use these options, you will need to [create a cluster with custom nodes](../../../../pages-for-subheaders/use-existing-nodes.md) and add the options to the generated `docker run` command when adding a node.
diff --git a/docs/reference-guides/configure-openldap/openldap-config-reference.md b/docs/reference-guides/configure-openldap/openldap-config-reference.md
index d91c5adc93b..6ce2977d6c9 100644
--- a/docs/reference-guides/configure-openldap/openldap-config-reference.md
+++ b/docs/reference-guides/configure-openldap/openldap-config-reference.md
@@ -1,6 +1,5 @@
---
title: OpenLDAP Configuration Reference
-weight: 2
---
This section is intended to be used as a reference when setting up an OpenLDAP authentication provider in Rancher.
diff --git a/docs/reference-guides/installation-references/helm-chart-options.md b/docs/reference-guides/installation-references/helm-chart-options.md
index 4580373ca27..380c5d2c9de 100644
--- a/docs/reference-guides/installation-references/helm-chart-options.md
+++ b/docs/reference-guides/installation-references/helm-chart-options.md
@@ -1,8 +1,5 @@
---
title: Rancher Helm Chart Options
-weight: 1
-aliases:
- - /rancher/v2.6/en/installation/resources/chart-options
---
This page is a configuration reference for the Rancher Helm chart.
@@ -111,7 +108,7 @@ By default Rancher server will detect and import the `local` cluster it's runnin
:::caution
-If you turn addLocal off, most Rancher v2.5 features won't work, including the EKS provisioner.
+If you turn addLocal off, most Rancher v2.5 features won't work, including the EKS provisioner.
:::
diff --git a/docs/reference-guides/installation-references/tls-settings.md b/docs/reference-guides/installation-references/tls-settings.md
index 7f3c128157e..807a8227b24 100644
--- a/docs/reference-guides/installation-references/tls-settings.md
+++ b/docs/reference-guides/installation-references/tls-settings.md
@@ -1,6 +1,5 @@
---
title: TLS Settings
-weight: 3
---
Changing the default TLS settings depends on the chosen installation method.
diff --git a/docs/reference-guides/kubernetes-concepts.md b/docs/reference-guides/kubernetes-concepts.md
index d5666042c95..631b7cfd118 100644
--- a/docs/reference-guides/kubernetes-concepts.md
+++ b/docs/reference-guides/kubernetes-concepts.md
@@ -1,6 +1,5 @@
---
title: Kubernetes Concepts
-weight: 4
---
This page explains concepts related to Kubernetes that are important for understanding how Rancher works. The descriptions below provide a simplified overview of Kubernetes components. For more details, refer to the [official documentation on Kubernetes components.](https://kubernetes.io/docs/concepts/overview/components/)
@@ -37,7 +36,7 @@ Rancher uses etcd as a data store in both single node and high-availability inst
The state of a Kubernetes cluster is maintained in [etcd.](https://kubernetes.io/docs/concepts/overview/components/#etcd) The etcd nodes run the etcd database.
-The etcd database component is a distributed key-value store used as Kubernetes storage for all cluster data, such as cluster coordination and state management. It is recommended to run etcd on multiple nodes so that there's always a backup available for failover.
+The etcd database component is a distributed key-value store used as Kubernetes storage for all cluster data, such as cluster coordination and state management. It is recommended to run etcd on multiple nodes so that there's always a backup available for failover.
Although you can run etcd on just one node, etcd requires a majority of nodes, a quorum, to agree on updates to the cluster state. The cluster should always contain enough healthy etcd nodes to form a quorum. For a cluster with n members, a quorum is (n/2)+1. For any odd-sized cluster, adding one node will always increase the number of nodes necessary for a quorum.
@@ -48,7 +47,7 @@ Three etcd nodes is generally sufficient for smaller clusters and five etcd node
Controlplane nodes run the Kubernetes API server, scheduler, and controller manager. These nodes take care of routine tasks to ensure that your cluster maintains your configuration. Because all cluster data is stored on your etcd nodes, control plane nodes are stateless. You can run control plane on a single node, although three or more nodes are recommended for redundancy. Additionally, a single node can share the control plane and etcd roles.
### Worker Nodes
-
+
Each [worker node](https://kubernetes.io/docs/concepts/architecture/nodes/) runs the following:
- **Kubelets:** An agent that monitors the state of the node, ensuring your containers are healthy.
diff --git a/docs/reference-guides/monitoring-v2-configuration/examples.md b/docs/reference-guides/monitoring-v2-configuration/examples.md
index a9149e462d2..07574957da9 100644
--- a/docs/reference-guides/monitoring-v2-configuration/examples.md
+++ b/docs/reference-guides/monitoring-v2-configuration/examples.md
@@ -1,12 +1,11 @@
---
title: Examples
-weight: 400
---
### ServiceMonitor
-An example ServiceMonitor custom resource can be found [here.](https://github.com/prometheus-operator/prometheus-operator/blob/master/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml)
+An example ServiceMonitor custom resource can be found [here.](https://github.com/prometheus-operator/prometheus-operator/blob/master/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml)
### PodMonitor
diff --git a/docs/reference-guides/monitoring-v2-configuration/helm-chart-options.md b/docs/reference-guides/monitoring-v2-configuration/helm-chart-options.md
index b89d70ec743..3edfaa3159f 100644
--- a/docs/reference-guides/monitoring-v2-configuration/helm-chart-options.md
+++ b/docs/reference-guides/monitoring-v2-configuration/helm-chart-options.md
@@ -1,6 +1,5 @@
---
title: Helm Chart Options
-weight: 8
---
@@ -51,7 +50,7 @@ We deploy kube-state-metrics and node-exporter with monitoring v2. Node exporter
We also deploy grafana which is not managed by prometheus.
-If you look at what the helm chart is doing like in kube-state-metrics, there are plenty more values that you can set that aren’t exposed in the top level chart.
+If you look at what the helm chart is doing like in kube-state-metrics, there are plenty more values that you can set that aren’t exposed in the top level chart.
But in the top level chart you can add values that override values that exist in the sub chart.
diff --git a/docs/reference-guides/monitoring-v2-configuration/receivers.md b/docs/reference-guides/monitoring-v2-configuration/receivers.md
index 3e11265ad1c..724250b17e0 100644
--- a/docs/reference-guides/monitoring-v2-configuration/receivers.md
+++ b/docs/reference-guides/monitoring-v2-configuration/receivers.md
@@ -1,7 +1,5 @@
---
title: Receiver Configuration
-shortTitle: Receivers
-weight: 1
---
import Tabs from '@theme/Tabs';
diff --git a/docs/reference-guides/monitoring-v2-configuration/routes.md b/docs/reference-guides/monitoring-v2-configuration/routes.md
index 58dadde17cf..637cc9ca569 100644
--- a/docs/reference-guides/monitoring-v2-configuration/routes.md
+++ b/docs/reference-guides/monitoring-v2-configuration/routes.md
@@ -1,7 +1,5 @@
---
title: Route Configuration
-shortTitle: Routes
-weight: 5
---
import Tabs from '@theme/Tabs';
diff --git a/docs/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md b/docs/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
index a1097240b96..4577417fe45 100644
--- a/docs/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
+++ b/docs/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
@@ -1,7 +1,5 @@
---
title: ServiceMonitor and PodMonitor Configuration
-shortTitle: ServiceMonitors and PodMonitors
-weight: 7
---
ServiceMonitors and PodMonitors are both pseudo-CRDs that map the scrape configuration of the Prometheus custom resource.
@@ -18,7 +16,7 @@ This section assumes familiarity with how monitoring components work together. F
### ServiceMonitors
-This pseudo-CRD maps to a section of the Prometheus custom resource configuration. It declaratively specifies how groups of Kubernetes services should be monitored.
+This pseudo-CRD maps to a section of the Prometheus custom resource configuration. It declaratively specifies how groups of Kubernetes services should be monitored.
When a ServiceMonitor is created, the Prometheus Operator updates the Prometheus scrape configuration to include the ServiceMonitor configuration. Then Prometheus begins scraping metrics from the endpoint defined in the ServiceMonitor.
@@ -28,7 +26,7 @@ For more information about how ServiceMonitors work, refer to the [Prometheus Op
### PodMonitors
-This pseudo-CRD maps to a section of the Prometheus custom resource configuration. It declaratively specifies how group of pods should be monitored.
+This pseudo-CRD maps to a section of the Prometheus custom resource configuration. It declaratively specifies how group of pods should be monitored.
When a PodMonitor is created, the Prometheus Operator updates the Prometheus scrape configuration to include the PodMonitor configuration. Then Prometheus begins scraping metrics from the endpoint defined in the PodMonitor.
diff --git a/docs/reference-guides/pipelines/concepts.md b/docs/reference-guides/pipelines/concepts.md
index 1f603f02810..f3df3cdc9d8 100644
--- a/docs/reference-guides/pipelines/concepts.md
+++ b/docs/reference-guides/pipelines/concepts.md
@@ -1,6 +1,5 @@
---
title: Concepts
-weight: 1
---
The purpose of this page is to explain common concepts and terminology related to pipelines.
diff --git a/docs/reference-guides/pipelines/configure-persistent-data.md b/docs/reference-guides/pipelines/configure-persistent-data.md
index 4b741979bf2..e6e52708ca5 100644
--- a/docs/reference-guides/pipelines/configure-persistent-data.md
+++ b/docs/reference-guides/pipelines/configure-persistent-data.md
@@ -1,6 +1,5 @@
---
title: Configuring Persistent Data for Pipeline Components
-weight: 600
---
import Tabs from '@theme/Tabs';
diff --git a/docs/reference-guides/pipelines/example-repositories.md b/docs/reference-guides/pipelines/example-repositories.md
index 02a8d5d8ba9..9a290f68531 100644
--- a/docs/reference-guides/pipelines/example-repositories.md
+++ b/docs/reference-guides/pipelines/example-repositories.md
@@ -1,6 +1,5 @@
---
title: Example Repositories
-weight: 500
---
Rancher ships with several example repositories that you can use to familiarize yourself with pipelines. We recommend configuring and testing the example repository that most resembles your environment before using pipelines with your own repositories in a production environment. Use this example repository as a sandbox for repo configuration, build demonstration, etc. Rancher includes example repositories for:
@@ -10,7 +9,7 @@ Rancher ships with several example repositories that you can use to familiarize
- php
:::note Prerequisites:
-
+
- The example repositories are only available if you have not [configured a version control provider](../../how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md).
- Because the pipelines app was deprecated in favor of Fleet, you will need to turn on the feature flag for legacy features before using pipelines.
- Note that pipelines in Kubernetes 1.21+ are no longer supported.
@@ -38,7 +37,7 @@ By default, the example pipeline repositories are disabled. Enable one (or more)
1. In the **Pipelines** tab, click **Configure Repositories**.
:::note
-
+
Example repositories only display if you haven't fetched your own repos.
:::
@@ -78,11 +77,11 @@ After enabling an example repository, run the pipeline to see how it works.
1. In the **Pipelines** tab, go to the pipeline and select the vertical **⋮ > Run**.
:::note
-
+
When you run a pipeline the first time, it takes a few minutes to pull relevant images and provision necessary pipeline components.
:::
-
+
**Result:** The pipeline runs. You can see the results in the logs.
### What's Next?
diff --git a/docs/reference-guides/pipelines/example-yaml.md b/docs/reference-guides/pipelines/example-yaml.md
index 5a04f2def8b..7392323385f 100644
--- a/docs/reference-guides/pipelines/example-yaml.md
+++ b/docs/reference-guides/pipelines/example-yaml.md
@@ -1,6 +1,5 @@
---
title: Example YAML File
-weight: 501
---
Pipelines can be configured either through the UI or using a yaml file in the repository, i.e. `.rancher-pipeline.yml` or `.rancher-pipeline.yaml`.
@@ -65,7 +64,7 @@ notification:
notifier: "c-wdcsr:n-c9pg7"
- recipient: "test@example.com"
notifier: "c-wdcsr:n-lkrhd"
- # Select which statuses you want the notification to be sent
+ # Select which statuses you want the notification to be sent
condition: ["Failed", "Success", "Changed"]
# Ability to override the default message (Optional)
message: "my-message"
diff --git a/docs/reference-guides/pipelines/pipeline-configuration.md b/docs/reference-guides/pipelines/pipeline-configuration.md
index 6cc04130514..01625cd48d2 100644
--- a/docs/reference-guides/pipelines/pipeline-configuration.md
+++ b/docs/reference-guides/pipelines/pipeline-configuration.md
@@ -1,6 +1,5 @@
---
title: Pipeline Configuration Reference
-weight: 1
---
In this section, you'll learn how to configure pipelines.
diff --git a/docs/reference-guides/prometheus-federator/rbac.md b/docs/reference-guides/prometheus-federator/rbac.md
index a08ebb26e88..47887415d85 100644
--- a/docs/reference-guides/prometheus-federator/rbac.md
+++ b/docs/reference-guides/prometheus-federator/rbac.md
@@ -1,7 +1,5 @@
---
title: Role-Based Access Control
-shortTitle: RBAC
-weight: 2
---
This section describes the expectations for Role-Based Access Control (RBAC) for Prometheus Federator.
diff --git a/docs/reference-guides/rancher-cluster-tools.md b/docs/reference-guides/rancher-cluster-tools.md
index 513c7b50cab..2fb06d20f4e 100644
--- a/docs/reference-guides/rancher-cluster-tools.md
+++ b/docs/reference-guides/rancher-cluster-tools.md
@@ -1,6 +1,5 @@
---
title: Cluster Tools for Logging, Monitoring, and Visibility
-weight: 2033
---
Rancher contains a variety of tools that aren't included in Kubernetes to assist in your DevOps operations. Rancher can integrate with external services to help your clusters run more efficiently. Tools are divided into following categories:
diff --git a/docs/reference-guides/rancher-manager-architecture/architecture-recommendations.md b/docs/reference-guides/rancher-manager-architecture/architecture-recommendations.md
index dcb3fd969c2..28b8e219222 100644
--- a/docs/reference-guides/rancher-manager-architecture/architecture-recommendations.md
+++ b/docs/reference-guides/rancher-manager-architecture/architecture-recommendations.md
@@ -1,6 +1,5 @@
---
title: Architecture Recommendations
-weight: 3
---
If you are installing Rancher on a single node, the main architecture recommendation that applies to your installation is that the node running Rancher should be [separate from downstream clusters.](#separation-of-rancher-and-user-clusters)
diff --git a/docs/reference-guides/rancher-project-tools.md b/docs/reference-guides/rancher-project-tools.md
index fb03f1c980c..567cc5cf408 100644
--- a/docs/reference-guides/rancher-project-tools.md
+++ b/docs/reference-guides/rancher-project-tools.md
@@ -1,6 +1,5 @@
---
title: Project Tools for Logging, Monitoring, and Visibility
-weight: 2525
---
Rancher contains a variety of tools that aren't included in Kubernetes to assist in your DevOps operations. Rancher can integrate with external services to help your clusters run more efficiently.
diff --git a/docs/reference-guides/rancher-security/kubernetes-security-best-practices.md b/docs/reference-guides/rancher-security/kubernetes-security-best-practices.md
index 4dc70b3d510..a863dd44e52 100644
--- a/docs/reference-guides/rancher-security/kubernetes-security-best-practices.md
+++ b/docs/reference-guides/rancher-security/kubernetes-security-best-practices.md
@@ -1,6 +1,5 @@
---
title: Kubernetes Security Best Practices
-weight: 5
---
### Restricting cloud metadata API access
diff --git a/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md b/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md
index 88c63a97884..79936e518cc 100644
--- a/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md
+++ b/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md
@@ -1,8 +1,5 @@
---
title: RKE Hardening Guide with CIS v1.6 Benchmark
-weight: 100
-aliases:
- - /rancher/v2.6/en/security/hardening-guides/1.6-hardening-2.6/
---
This document provides prescriptive guidance for hardening a production installation of a RKE cluster to be used with Rancher v2.6. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS).
diff --git a/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-self-assessment-guide-with-cis-v1.6-benchmark.md b/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-self-assessment-guide-with-cis-v1.6-benchmark.md
index 3e4e703e30b..7f8f793509e 100644
--- a/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-self-assessment-guide-with-cis-v1.6-benchmark.md
+++ b/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-self-assessment-guide-with-cis-v1.6-benchmark.md
@@ -1,8 +1,5 @@
---
title: RKE CIS v1.6 Benchmark - Self-Assessment Guide - Rancher v2.6
-weight: 101
-aliases:
- - /rancher/v2.6/en/security/hardening-guides/1.6-benchmark-2.6/
---
### RKE CIS v1.6 Kubernetes Benchmark - Rancher v2.6 with Kubernetes v1.18 to v1.23
diff --git a/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-hardening-guide-with-cis-v1.6-benchmark.md b/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-hardening-guide-with-cis-v1.6-benchmark.md
index 20d0e9d8528..cfbecd2c131 100644
--- a/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-hardening-guide-with-cis-v1.6-benchmark.md
+++ b/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-hardening-guide-with-cis-v1.6-benchmark.md
@@ -1,6 +1,5 @@
---
title: RKE2 Hardening Guide with CIS v1.6 Benchmark
-weight: 100
---
This document provides prescriptive guidance for hardening a production installation of a RKE2 cluster to be provisioned with Rancher v2.6.5. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS).
@@ -316,7 +315,7 @@ spec:
profile: cis-1.6
protect-kernel-defaults: true
# - config:
-#
+#
# machineLabelSelector:
# matchExpressions:
# - key: string
diff --git a/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-self-assessment-guide-with-cis-v1.6-benchmark.md b/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-self-assessment-guide-with-cis-v1.6-benchmark.md
index 2d7a959932c..0d78995947b 100644
--- a/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-self-assessment-guide-with-cis-v1.6-benchmark.md
+++ b/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-self-assessment-guide-with-cis-v1.6-benchmark.md
@@ -1,6 +1,5 @@
---
title: RKE2 CIS v1.6 Benchmark - Self-Assessment Guide - Rancher v2.6
-weight: 101
---
### CIS v1.6 Kubernetes Benchmark - Rancher v2.6 RKE2 with Kubernetes v1.21 up to v1.23
diff --git a/docs/reference-guides/rancher-security/security-advisories-and-cves.md b/docs/reference-guides/rancher-security/security-advisories-and-cves.md
index 53fdbcd0a85..2e28da93979 100644
--- a/docs/reference-guides/rancher-security/security-advisories-and-cves.md
+++ b/docs/reference-guides/rancher-security/security-advisories-and-cves.md
@@ -1,8 +1,5 @@
---
title: Security Advisories and CVEs
-weight: 300
-aliases:
- - /rancher/v2.x/en/security/cve/
---
Rancher is committed to informing the community of security issues in our products. Rancher will publish security advisories and CVEs (Common Vulnerabilities and Exposures) for issues we have resolved. New security advisories are also published in Rancher's GitHub [security page](https://github.com/rancher/rancher/security/advisories).
diff --git a/docs/reference-guides/rke1-template-example-yaml.md b/docs/reference-guides/rke1-template-example-yaml.md
index 2be8946bfb7..d14e3863ff9 100644
--- a/docs/reference-guides/rke1-template-example-yaml.md
+++ b/docs/reference-guides/rke1-template-example-yaml.md
@@ -1,6 +1,5 @@
---
title: RKE1 Example YAML
-weight: 60
---
Below is an example RKE template configuration file for reference.
@@ -8,9 +7,9 @@ Below is an example RKE template configuration file for reference.
The YAML in the RKE template uses the same customization that is used when you create an RKE cluster. However, since the YAML is within the context of a Rancher provisioned RKE cluster, the customization from the RKE docs needs to be nested under the `rancher_kubernetes_engine` directive.
```yaml
-#
+#
# Cluster Config
-#
+#
docker_root_dir: /var/lib/docker
enable_cluster_alerting: false
@@ -20,7 +19,7 @@ enable_cluster_alerting: false
# but end users could still turn alerting
# on or off.
-enable_cluster_monitoring: true
+enable_cluster_monitoring: true
# This setting is not enforced. Clusters
# created with this sample template
# would have monitoring turned on
@@ -30,54 +29,54 @@ enable_cluster_monitoring: true
enable_network_policy: false
local_cluster_auth_endpoint:
enabled: true
-#
+#
# Rancher Config
-#
+#
rancher_kubernetes_engine_config: # Your RKE template config goes here.
addon_job_timeout: 30
authentication:
strategy: x509
ignore_docker_version: true
-#
+#
# # Currently only nginx ingress provider is supported.
# # To disable ingress controller, set `provider: none`
# # To enable ingress on specific nodes, use the node_selector, eg:
# provider: nginx
# node_selector:
# app: ingress
-#
+#
ingress:
provider: nginx
kubernetes_version: v1.15.3-rancher3-1
monitoring:
provider: metrics-server
-#
+#
# If you are using calico on AWS
-#
+#
# network:
# plugin: calico
# calico_network_provider:
# cloud_provider: aws
-#
+#
# # To specify flannel interface
-#
+#
# network:
# plugin: flannel
# flannel_network_provider:
# iface: eth1
-#
+#
# # To specify flannel interface for canal plugin
-#
+#
# network:
# plugin: canal
# canal_network_provider:
# iface: eth1
-#
+#
network:
options:
flannel_backend_type: vxlan
plugin: canal
-#
+#
# services:
# kube-api:
# service_cluster_ip_range: 10.43.0.0/16
@@ -87,7 +86,7 @@ rancher_kubernetes_engine_config: # Your RKE template config goes here.
# kubelet:
# cluster_domain: cluster.local
# cluster_dns_server: 10.43.0.10
-#
+#
services:
etcd:
backup_config:
diff --git a/docs/reference-guides/single-node-rancher-in-docker/advanced-options.md b/docs/reference-guides/single-node-rancher-in-docker/advanced-options.md
index 2a3005723fc..d1962d9f84e 100644
--- a/docs/reference-guides/single-node-rancher-in-docker/advanced-options.md
+++ b/docs/reference-guides/single-node-rancher-in-docker/advanced-options.md
@@ -1,6 +1,5 @@
---
title: Advanced Options for Docker Installs
-weight: 5
---
diff --git a/docs/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md b/docs/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md
index 1e49073b2aa..7e522875721 100644
--- a/docs/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md
+++ b/docs/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md
@@ -1,6 +1,5 @@
---
title: HTTP Proxy Configuration
-weight: 251
---
If you operate Rancher behind a proxy and you want to access services through the proxy (such as retrieving catalogs), you must provide Rancher information about your proxy. As Rancher is written in Go, it uses the common proxy environment variables as shown below.
diff --git a/docs/reference-guides/system-tools.md b/docs/reference-guides/system-tools.md
index f237773e479..01c3b9a6c05 100644
--- a/docs/reference-guides/system-tools.md
+++ b/docs/reference-guides/system-tools.md
@@ -1,6 +1,5 @@
---
title: System Tools
-weight: 22
---
:::note
@@ -8,6 +7,7 @@ weight: 22
System Tools has been deprecated since June 2022.
:::
+
# Logs
Please use [logs-collector](https://github.com/rancherlabs/support-tools/tree/master/collection/rancher/v2.x/logs-collector) to collect logs from your cluster.
diff --git a/docs/reference-guides/user-settings/api-keys.md b/docs/reference-guides/user-settings/api-keys.md
index cb3151520c9..00666621c31 100644
--- a/docs/reference-guides/user-settings/api-keys.md
+++ b/docs/reference-guides/user-settings/api-keys.md
@@ -1,6 +1,5 @@
---
title: API Keys
-weight: 7005
---
## API Keys and User Authentication
@@ -33,7 +32,7 @@ Users may opt to enable [token hashing](../about-the-api/api-tokens.md).
The API key won't be valid after expiration. Shorter expiration periods are more secure.
Expiration period will be bound by `v3/settings/auth-token-max-ttl-minutes`. If it exceeds the max-ttl, API key will be created with max-ttl as the expiration period.
-
+
A scope will limit the API key so that it will only work against the Kubernetes API of the specified cluster. If the cluster is configured with an Authorized Cluster Endpoint, you will be able to use a scoped token directly against the cluster's API without proxying through the Rancher server. See [Authorized Cluster Endpoints](../../pages-for-subheaders/rancher-manager-architecture.md#4-authorized-cluster-endpoint) for more information.
4. Click **Create**.
diff --git a/docs/reference-guides/user-settings/manage-cloud-credentials.md b/docs/reference-guides/user-settings/manage-cloud-credentials.md
index 5a4ff54fdae..4de81116e82 100644
--- a/docs/reference-guides/user-settings/manage-cloud-credentials.md
+++ b/docs/reference-guides/user-settings/manage-cloud-credentials.md
@@ -1,6 +1,5 @@
---
title: Managing Cloud Credentials
-weight: 7011
---
When you create a cluster [hosted by an infrastructure provider](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md), [node templates](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) are used to provision the cluster nodes. These templates use Docker Machine configuration options to define an operating system image and settings/parameters for the node.
@@ -30,7 +29,7 @@ All cloud credentials are bound to the user profile of who created it. They **ca
## Updating a Cloud Credential
-When access credentials are changed or compromised, updating a cloud credential allows you to rotate those credentials while keeping the same node template.
+When access credentials are changed or compromised, updating a cloud credential allows you to rotate those credentials while keeping the same node template.
1. Click **☰ > Cluster Management**.
1. Click **Cloud Credentials**.
diff --git a/docs/reference-guides/user-settings/manage-node-templates.md b/docs/reference-guides/user-settings/manage-node-templates.md
index c6b6e4b2db7..82e717cd8ce 100644
--- a/docs/reference-guides/user-settings/manage-node-templates.md
+++ b/docs/reference-guides/user-settings/manage-node-templates.md
@@ -1,6 +1,5 @@
---
title: Managing Node Templates
-weight: 7010
---
When you provision a cluster [hosted by an infrastructure provider](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md), [node templates](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) are used to provision the cluster nodes. These templates use Docker Machine configuration options to define an operating system image and settings/parameters for the node. You can create node templates in two contexts:
@@ -26,11 +25,11 @@ When you create a node template, it is bound to your user profile. Node template
1. Choose the node template that you want to edit and click the **⋮ > Edit**.
:::note
-
+
The default `active` [node drivers](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md) and any node driver, that has fields marked as `password`, are required to use [cloud credentials](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#cloud-credentials).
:::
-
+
1. Edit the required information and click **Save**.
**Result:** The node template is updated. All node pools using this node template will automatically use the updated information when new nodes are added.
diff --git a/docs/reference-guides/user-settings/user-preferences.md b/docs/reference-guides/user-settings/user-preferences.md
index fc2fe8c1f2b..9521d13557c 100644
--- a/docs/reference-guides/user-settings/user-preferences.md
+++ b/docs/reference-guides/user-settings/user-preferences.md
@@ -1,6 +1,5 @@
---
title: User Preferences
-weight: 7012
---
Each user can choose preferences to personalize their Rancher experience. To change preference settings, open the **User Settings** menu and then select **Preferences**.
diff --git a/docs/security/security-scan/security-scan.md b/docs/security/security-scan/security-scan.md
index 28e59b6b0d2..7c9c5a3ce48 100644
--- a/docs/security/security-scan/security-scan.md
+++ b/docs/security/security-scan/security-scan.md
@@ -1,6 +1,5 @@
---
title: Security Scans
-weight: 299
---
The documentation about CIS security scans has moved [here.](../../pages-for-subheaders/cis-scan-guides.md)
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index 9c990589f93..4adae5c007c 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -1,6 +1,5 @@
---
title: Troubleshooting
-weight: 600
---
This section contains information to help you troubleshoot issues when using Rancher.
@@ -40,6 +39,6 @@ This section contains information to help you troubleshoot issues when using Ran
Read more about how a Rancher Admin can trace an event from the Rancher audit logs and into the Kubernetes audit logs using the external Identity Provider username.
-- [Expired Webhook Certificates](troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md)
+- [Expired Webhook Certificates](troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md)
Read more about how to rotate a Rancher webhook certificate secret after it expires on an annual basis.
diff --git a/docs/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md b/docs/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md
index 2d0c44a2126..20640bcdedc 100644
--- a/docs/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md
+++ b/docs/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md
@@ -1,6 +1,5 @@
---
title: Troubleshooting Controlplane Nodes
-weight: 2
---
This section applies to nodes with the `controlplane` role.
diff --git a/docs/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md b/docs/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md
index 6f39f307282..aaf9fcc493d 100644
--- a/docs/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md
+++ b/docs/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md
@@ -1,6 +1,5 @@
---
title: Troubleshooting etcd Nodes
-weight: 1
---
This section contains commands and tips for troubleshooting nodes with the `etcd` role.
diff --git a/docs/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md b/docs/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md
index 70505e96280..d7cde4f794e 100644
--- a/docs/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md
+++ b/docs/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md
@@ -1,6 +1,5 @@
---
title: Troubleshooting nginx-proxy
-weight: 3
---
The `nginx-proxy` container is deployed on every node that does not have the `controlplane` role. It provides access to all the nodes with the `controlplane` role by dynamically generating the NGINX configuration based on available nodes with the `controlplane` role.
@@ -42,11 +41,11 @@ events {
stream {
upstream kube_apiserver {
-
+
server ip_of_controlplane_node1:6443;
-
+
server ip_of_controlplane_node2:6443;
-
+
}
server {
diff --git a/docs/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md b/docs/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md
index 28ee4499bb4..6d3a8bd7fcd 100644
--- a/docs/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md
+++ b/docs/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md
@@ -1,6 +1,5 @@
---
title: Troubleshooting Worker Nodes and Generic Components
-weight: 4
---
This section applies to every node as it includes components that run on nodes with any role.
diff --git a/docs/troubleshooting/other-troubleshooting-tips/dns.md b/docs/troubleshooting/other-troubleshooting-tips/dns.md
index 19fbf53b37f..881b003bf08 100644
--- a/docs/troubleshooting/other-troubleshooting-tips/dns.md
+++ b/docs/troubleshooting/other-troubleshooting-tips/dns.md
@@ -1,6 +1,5 @@
---
title: DNS
-weight: 103
---
The commands/steps listed on this page can be used to check name resolution issues in your cluster.
diff --git a/docs/troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md b/docs/troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md
index 31cc6f0e5f1..72b643e8a7a 100644
--- a/docs/troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md
+++ b/docs/troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md
@@ -1,6 +1,5 @@
---
title: Rotation of Expired Webhook Certificates
-weight: 120
---
For Rancher versions that have `rancher-webhook` installed, certain versions created certificates that will expire after one year. It will be necessary for you to rotate your webhook certificate if the certificate did not renew.
diff --git a/docs/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md b/docs/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md
index 17b30b5d701..788c5fce573 100644
--- a/docs/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md
+++ b/docs/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md
@@ -1,6 +1,5 @@
---
title: Kubernetes Resources
-weight: 101
---
The commands/steps listed on this page can be used to check the most important Kubernetes resources and apply to [Rancher Launched Kubernetes](../../pages-for-subheaders/launch-kubernetes-with-rancher.md) clusters.
@@ -22,7 +21,7 @@ Run the command below and check the following:
```
kubectl get nodes -o wide
-```
+```
Example output:
diff --git a/docs/troubleshooting/other-troubleshooting-tips/logging.md b/docs/troubleshooting/other-troubleshooting-tips/logging.md
index 13a7a752bac..89bfb3098db 100644
--- a/docs/troubleshooting/other-troubleshooting-tips/logging.md
+++ b/docs/troubleshooting/other-troubleshooting-tips/logging.md
@@ -1,6 +1,5 @@
---
title: Logging
-weight: 110
---
The following log levels are used in Rancher:
diff --git a/docs/troubleshooting/other-troubleshooting-tips/networking.md b/docs/troubleshooting/other-troubleshooting-tips/networking.md
index 00863c315dd..5ac7962fd00 100644
--- a/docs/troubleshooting/other-troubleshooting-tips/networking.md
+++ b/docs/troubleshooting/other-troubleshooting-tips/networking.md
@@ -1,6 +1,5 @@
---
title: Networking
-weight: 102
---
The commands/steps listed on this page can be used to check networking related issues in your cluster.
@@ -56,7 +55,7 @@ This container [does not support ARM nodes](https://github.com/leodotcloud/swiss
#!/bin/bash
echo "=> Start network overlay test"
kubectl get pods -l name=overlaytest -o jsonpath='{range .items[*]}{@.metadata.name}{" "}{@.spec.nodeName}{"\n"}{end}' |
- while read spod shost
+ while read spod shost
do kubectl get pods -l name=overlaytest -o jsonpath='{range .items[*]}{@.status.podIP}{" "}{@.spec.nodeName}{"\n"}{end}' |
while read tip thost
do kubectl --request-timeout='10s' exec $spod -c overlaytest -- /bin/sh -c "ping -c2 $tip > /dev/null 2>&1"
diff --git a/docs/troubleshooting/other-troubleshooting-tips/rancher-ha.md b/docs/troubleshooting/other-troubleshooting-tips/rancher-ha.md
index d724c778cdb..6bfef988bd4 100644
--- a/docs/troubleshooting/other-troubleshooting-tips/rancher-ha.md
+++ b/docs/troubleshooting/other-troubleshooting-tips/rancher-ha.md
@@ -1,6 +1,5 @@
---
title: Rancher HA
-weight: 104
---
The commands/steps listed on this page can be used to check your Rancher Kubernetes Installation.
@@ -26,7 +25,7 @@ rancher-7dbd7875f7-qbj5k 1/1 Running 0 8m x.x.x.x x.x.x.
rancher-7dbd7875f7-qw7wb 1/1 Running 0 8m x.x.x.x x.x.x.x
```
-If a pod is unable to run (Status is not **Running**, Ready status is not showing `1/1` or you see a high count of Restarts), check the pod details, logs and namespace events.
+If a pod is unable to run (Status is not **Running**, Ready status is not showing `1/1` or you see a high count of Restarts), check the pod details, logs and namespace events.
#### Pod details
diff --git a/docs/troubleshooting/other-troubleshooting-tips/registered-clusters.md b/docs/troubleshooting/other-troubleshooting-tips/registered-clusters.md
index 6b5e453402c..6416333cd09 100644
--- a/docs/troubleshooting/other-troubleshooting-tips/registered-clusters.md
+++ b/docs/troubleshooting/other-troubleshooting-tips/registered-clusters.md
@@ -1,6 +1,5 @@
---
title: Registered Clusters
-weight: 105
---
The commands/steps listed on this page can be used to check clusters that you are registering or that are registered in Rancher.
@@ -11,7 +10,7 @@ Make sure you configured the correct kubeconfig (for example, `export KUBECONFIG
Communication to the cluster (Kubernetes API via cattle-cluster-agent) and communication to the nodes is done through Rancher agents.
-If the cattle-cluster-agent cannot connect to the configured `server-url`, the cluster will remain in **Pending** state, showing `Waiting for full cluster configuration`.
+If the cattle-cluster-agent cannot connect to the configured `server-url`, the cluster will remain in **Pending** state, showing `Waiting for full cluster configuration`.
#### cattle-node-agent
diff --git a/docs/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md b/docs/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md
index d7def700d06..d2aae7fe228 100644
--- a/docs/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md
+++ b/docs/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md
@@ -1,6 +1,5 @@
---
title: User ID Tracking in Audit Logs
-weight: 110
---
The following audit logs are used in Rancher to track events occuring on the local and downstream clusters:
@@ -14,7 +13,7 @@ Before v2.6, a Rancher Admin could not trace an event from the Rancher audit log
To know this mapping, the cluster admins needed to have access to Rancher API, UI, and the local management cluster.
Now with this feature, a downstream cluster admin should be able to look at the Kubernetes audit logs and know which specific external Identity Provider (IDP) user performed an action without needing to view anything in Rancher.
-If the audit logs are shipped off of the cluster, a user of the logging system should be able to identify the user in the external Identity Provider system.
+If the audit logs are shipped off of the cluster, a user of the logging system should be able to identify the user in the external Identity Provider system.
A Rancher Admin should now be able to view Rancher audit logs and follow through to the Kubernetes audit log by using the external Identity Provider username.
### Feature Description
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/backups/docker-installs/docker-installs.md b/i18n/zh/docusaurus-plugin-content-docs/current/backups/docker-installs/docker-installs.md
index 0c3d24b6536..51c3001d777 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/backups/docker-installs/docker-installs.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/backups/docker-installs/docker-installs.md
@@ -1,7 +1,5 @@
---
title: 备份和恢复 Docker 安装的 Rancher
-shortTitle: Docker 安装
-weight: 10
---
- [备份](../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md)
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/cluster-provisioning/rke-clusters/options/options.md b/i18n/zh/docusaurus-plugin-content-docs/current/cluster-provisioning/rke-clusters/options/options.md
index c304b710228..39c332461ce 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/cluster-provisioning/rke-clusters/options/options.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/cluster-provisioning/rke-clusters/options/options.md
@@ -1,6 +1,5 @@
---
title: RKE 集群配置
-weight: 2300
---
本文已迁移到[此处](../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/contribute-to-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/contribute-to-rancher.md
index 200b9cfc577..f63c6a38e30 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/contribute-to-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/contribute-to-rancher.md
@@ -1,6 +1,5 @@
---
title: 参与 Rancher 社区贡献
-weight: 700
---
本节介绍 Rancher 使用的仓库、如何构建仓库以及提交 issue 时要包含的信息。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations.md
index 4fb3fdd75fd..94873dcb53f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations.md
@@ -1,6 +1,5 @@
---
title: 说明
-weight: 400
---
**说明文档**主要用于为某个任务或主题背后的“原因”提供理论知识。说明文档是“理解导向”的,用于拓宽用户的知识。在本节中,用户可以找到有关主题的上下文和背景、替代方案和意见等,还可能找到历史原因、相关限制以及流程的工作原理。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/configuration-reference.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/configuration-reference.md
index b078b6c4fe5..7a530783b36 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/configuration-reference.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/configuration-reference.md
@@ -1,6 +1,5 @@
---
title: 配置
-weight: 3
---
此配置参考用于帮助你管理由 `rancher-cis-benchmark` 应用创建的自定义资源。这些资源用于在集群上执行 CIS 扫描、跳过测试、设置扫描使用的测试配置文件和其他自定义配置。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md
index b68f5d2d282..6818ac56118 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md
@@ -1,6 +1,5 @@
---
title: 为集群扫描创建自定义 Benchmark 版本
-weight: 4
---
每个 Benchmark 版本都定义了一组测试配置文件,这些文件定义了由 kube-bench 工具运行的 CIS 测试。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
index 2236977e505..6398f217c7e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
@@ -1,7 +1,5 @@
---
title: RBAC
-shortTitle: RBAC
-weight: 3
---
本文介绍使用 rancher-cis-benchmark 应用所需的权限。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
index 4291a38840e..a7afe788a87 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
@@ -1,6 +1,5 @@
---
title: 跳过和不适用的测试
-weight: 3
---
本文列出了在 RKE 的 permissive 测试配置文件中跳过的测试。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
index de6c41a07d3..76157e0ece3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
@@ -1,6 +1,5 @@
---
title: 先决条件
-weight: 1
---
### 1. 设置许可证管理器和购买支持
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md
index f9879cbc7f6..0e9f63f4086 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md
@@ -1,6 +1,5 @@
---
title: 常见问题
-weight: 4
---
**安装 Adapter 后,Rancher 中出现一条横幅消息,上面写着 "AWS Marketplace Adapter: Unable to run the adapter, please check the adapter logs"**
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
index 75ed535e718..384eb15402a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
@@ -1,6 +1,5 @@
---
title: 安装 Adapter
-weight: 2
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md
index 4b78d93e7ea..f290d881ae9 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md
@@ -1,6 +1,5 @@
---
title: 卸载 Adapter
-weight: 3
---
### 1. 使用 Helm 卸载 Adapter Chart:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/supportconfig.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/supportconfig.md
index 00c8b5005fe..f5f0d722487 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/supportconfig.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/supportconfig.md
@@ -1,6 +1,5 @@
---
title: Supportconfig Bundle
-weight: 100
---
安装 CSP Adapter 后,你将能够生成一个 Supportconfig Bundle。此 Bundle 是一个 tar 包,可用于快速提供支持信息。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
index b93df60b22c..e039b353a31 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
@@ -1,6 +1,5 @@
---
title: 架构
-weight: 1
---
Fleet 可以管理来自 Git 的原始 Kubernetes YAML、Helm Chart、Kustomize 或三者的任何组合的部署。无论来源如何,所有资源都会动态转化为 Helm Chart,Helm 会用作引擎来将所有资源部署到集群中。这给了你高度的控制、一致性和可审计性。Fleet 不仅关注扩展能力,而且还提供高度的控制和可见性,从而让用户准确了解集群上安装的内容。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
index df2d6aca676..24d26829816 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
@@ -1,6 +1,5 @@
---
title: 在代理后使用 Fleet
-weight: 3
---
在本节中,你将学习如何在一个设置中启用 Fleet,该设置有一个具有公共 IP 的 Rancher Server,以及一个没有公共 IP 但配置为使用代理的 Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
index d3b52663407..c285daed3ee 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
@@ -1,6 +1,5 @@
---
title: Windows 支持
-weight: 2
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/harvester.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/harvester.md
index d71c989b237..6d1931f5331 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/harvester.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/harvester.md
@@ -1,6 +1,5 @@
---
title: Harvester 集成
-weight: 10
---
Harvester 是 Rancher 2.6.1 新增的功能,[Harvester](https://docs.harvesterhci.io/) 是基于 Kubernetes 构建的开源超融合基础架构 (HCI) 软件。Harvester 安装在裸金属服务器上,提供集成的虚拟化和分布式存储功能。虽然 Harvester 使用 Kubernetes 运行,但它不需要用户了解 Kubernetes 概念,因此是一个更加用户友好的应用。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
index 677e4dc4db0..235626a0234 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
@@ -1,6 +1,5 @@
---
title: 在 RKE2 集群上安装 Istio 的其他步骤
-weight: 3
---
通过**应用 & 应用市场**页面安装或升级 Istio Helm Chart 时:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
index 8ec8f3f1356..bdbaace0657 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
@@ -1,6 +1,5 @@
---
title: 在具有 Pod 安全策略的情况下启用 Istio
-weight: 1
---
如果你启用了限制性 Pod 安全策略(Pod Security Policy),由于 Istio 需要某些权限才能自行安装和管理 pod 基础设施,因此 Istio 可能无法正常运行。在本文中,我们将配置一个为 Istio 启用了 PSP 的集群,并设置 Istio CNI 插件。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
index 8bbafd0ce0d..00b16856358 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
@@ -1,6 +1,5 @@
---
title: 项目网络隔离的其他步骤
-weight: 4
---
在集群中:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
index 0f1fce2f5b7..5a40d032482 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
@@ -1,6 +1,5 @@
---
title: 选择器和抓取配置
-weight: 2
---
Monitoring 应用设置了 `prometheus.prometheusSpec.ignoreNamespaceSelectors=false`,即在默认情况下跨所有命名空间进行监控。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
index 95ec8329be7..ebc8fe57ac0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
@@ -1,6 +1,5 @@
---
title: CPU 和内存分配
-weight: 1
---
本文介绍我们建议在集群中分配给 Istio 组件的最少计算资源。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/disable-istio.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/disable-istio.md
index dbad849e3c7..6d06b0f29c6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/disable-istio.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/disable-istio.md
@@ -1,6 +1,5 @@
---
title: 禁用 Istio
-weight: 4
---
本文介绍如何在集群中卸载 Istio,以及如何在命名空间或工作负载中禁用 Istio。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/rbac-for-istio.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/rbac-for-istio.md
index 9b1dad92daf..ba56d0ff9b9 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/rbac-for-istio.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/rbac-for-istio.md
@@ -1,6 +1,5 @@
---
title: RBAC
-weight: 3
---
本文介绍访问 Istio 功能所需的权限。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
index a644eb672ae..45eae3d597d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
@@ -1,6 +1,5 @@
---
title: Flows 和 ClusterFlows
-weight: 1
---
有关配置 `Flow` 和 `ClusterFlow` 的完整详细信息,请参阅 [Banzai Cloud Logging Operator 文档](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
index bcde0c0a929..f79276e5ca4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
@@ -1,6 +1,5 @@
---
title: Outputs 和 ClusterOutputs
-weight: 2
---
有关配置 `Output` 和 `ClusterOutput` 的完整详细信息,请参阅 [Banzai Cloud Logging Operator 文档](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/output/)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/logging-architecture.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/logging-architecture.md
index a5de3ee1067..47baa1f1f0d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/logging-architecture.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/logging-architecture.md
@@ -1,6 +1,5 @@
---
title: 架构
-weight: 1
---
本节介绍了 Rancher Logging 应用程序的架构。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md
index d48db34f13a..e38569acb2d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md
@@ -1,7 +1,5 @@
---
title: rancher-logging Helm Chart 选项
-shortTitle: Helm Chart 选项
-weight: 4
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
index a492951eee4..1d501f6ab2b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
@@ -1,6 +1,5 @@
---
title: 迁移到 Rancher 2.5 Logging
-weight: 2
---
Rancher 2.5 彻底修改了 Logging 功能。我们现在使用了 Banzai Cloud 的 [logging operator](https://github.com/banzaicloud/logging-operator),Rancher 配置了此工具以供部署 Logging 使用。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/rbac-for-logging.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/rbac-for-logging.md
index 6e0da0d5737..2959a9f7946 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/rbac-for-logging.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/rbac-for-logging.md
@@ -1,7 +1,5 @@
---
-shortTitle: RBAC
title: Logging 的 RBAC
-weight: 3
---
Rancher Logging 有两个角色,分别是 `logging-admin` 和 `logging-view`。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/taints-and-tolerations.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/taints-and-tolerations.md
index 0b642fd92c5..89c4c276b27 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/taints-and-tolerations.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/taints-and-tolerations.md
@@ -1,6 +1,5 @@
---
title: 处理污点和容忍度
-weight: 6
---
在 Kubernetes 节点上添加污点会导致 pod 排斥在该节点上运行。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/longhorn.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/longhorn.md
index 8ffffee0a11..ead5a6e4ad1 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/longhorn.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/longhorn.md
@@ -1,7 +1,5 @@
---
title: Longhorn - Kubernetes 的云原生分布式块存储
-shortTitle: Longhorn 存储
-weight: 19
---
[Longhorn](https://longhorn.io/) 是一个轻量级、可靠、易用的 Kubernetes 分布式块存储系统。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
index 048520f1db0..617061cfe30 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
@@ -1,6 +1,5 @@
---
title: 内置仪表板
-weight: 3
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
index 6b58e08fef9..ef4737bffaa 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
@@ -1,6 +1,5 @@
---
title: Monitoring 的工作原理
-weight: 1
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
index 0751f970207..006df34697c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
@@ -1,6 +1,5 @@
---
title: PromQL 表达式参考
-weight: 6
---
本文档中的 PromQL 表达式可用于配置告警。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
index b0ac99e93bf..327592b5e2b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
@@ -1,7 +1,5 @@
---
title: RBAC
-shortTitle: RBAC
-weight: 2
---
本节描述了 RBAC 在 Rancher Monitoring 中的作用。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md
index abc2dc161fa..497c6578e8c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md
@@ -1,7 +1,5 @@
---
title: Monitoring V2 的 Windows 集群支持
-shortTitle: Windows 支持
-weight: 5
---
_从 v2.5.8 起可用_
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/neuvector.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/neuvector.md
index 4396bad9d9d..d70f719349f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/neuvector.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/neuvector.md
@@ -1,6 +1,5 @@
---
title: NeuVector 集成
-weight: 22
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/opa-gatekeeper.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/opa-gatekeeper.md
index 9e2830df3c0..7a5e79904d7 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/opa-gatekeeper.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/opa-gatekeeper.md
@@ -1,6 +1,5 @@
---
title: OPA Gatekeeper
-weight: 16
---
为了确保一致性和合规性,每个组织都需要能够以自动化的方式在环境中定义和执行策略。[OPA(Open Policy Agent)](https://www.openpolicyagent.org/) 是一个策略引擎,用于基于策略控制云原生环境。Rancher 支持在 Kubernetes 集群中启用 OPA Gatekeeper,并且还安装了一些内置的策略定义(也称为约束模板)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq.md
index 5a61118f20f..c69ce532363 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq.md
@@ -1,6 +1,5 @@
---
title: 常见问题
-weight: 500
---
本文包含了用户常见的 Rancher 2.x 问题。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq/container-network-interface-providers.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/container-network-interface-providers.md
index 5730b1a8449..ad796bb5c4c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq/container-network-interface-providers.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq/container-network-interface-providers.md
@@ -1,7 +1,6 @@
---
title: CNI 网络插件
description: 了解容器网络接口 (CNI)、Rancher 提供的 CNI 网络插件、提供商的功能,以及如何选择网络提供商
-weight: 2300
---
## 什么是 CNI?
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq/deprecated-features-in-v2.5.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/deprecated-features-in-v2.5.md
index 1580b03555a..ec1898663b2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq/deprecated-features-in-v2.5.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq/deprecated-features-in-v2.5.md
@@ -1,6 +1,5 @@
---
title: Rancher 弃用的功能
-weight: 100
---
### Rancher 的弃用策略是什么?
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq/dockershim.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/dockershim.md
index 5050e001de0..cfab0dfbaf4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq/dockershim.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq/dockershim.md
@@ -1,6 +1,5 @@
---
title: Dockershim
-weight: 300
---
Dockershim 是 Kubelet 和 Docker Daemon 之间的 CRI 兼容层。Kubernetes 1.20 版本宣布了[移除树内 Dockershim](https://kubernetes.io/blog/2020/12/02/dont-panic-kubernetes-and-docker/)。目前计划在 Kubernetes 1.24 中移除。有关此移除的更多信息以及时间线,请参见 [Kubernetes Dockershim 弃用相关的常见问题](https://kubernetes.io/blog/2020/12/02/dockershim-faq/#when-will-dockershim-be-removed)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq/install-and-configure-kubectl.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/install-and-configure-kubectl.md
index 1cd670939a4..21c301639b6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq/install-and-configure-kubectl.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq/install-and-configure-kubectl.md
@@ -1,6 +1,5 @@
---
title: 安装和配置 kubectl
-weight: 100
---
`kubectl` 是一个 CLI 工具,用于运行 Kubernetes 集群相关的命令。Rancher 2.x 中的许多维护和管理任务都需要它。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq/networking/networking.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/networking/networking.md
index b170d772b8e..efeff588a7e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq/networking/networking.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq/networking/networking.md
@@ -1,6 +1,5 @@
---
title: 网络
-weight: 8005
---
网络常见问题
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq/rancher-is-no-longer-needed.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/rancher-is-no-longer-needed.md
index 15b9039760f..8a1a28ae50f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq/rancher-is-no-longer-needed.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq/rancher-is-no-longer-needed.md
@@ -1,6 +1,5 @@
---
title: 卸载 Rancher
-weight: 8010
---
本文介绍了如果你不再需要 Rancher、不想再由 Rancher 管理集群、或想删除 Rancher Server 需要怎么做。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq/security.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/security.md
index 7f2c131a66d..6675b6344e9 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq/security.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq/security.md
@@ -1,7 +1,5 @@
---
title: 安全
-weight: 8007
-
---
**是否有强化指南?**
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq/technical-items.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/technical-items.md
index 29fe3614fbf..47ee529cd1c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq/technical-items.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq/technical-items.md
@@ -1,6 +1,5 @@
---
title: 技术
-weight: 8006
---
### 如何重置管理员密码?
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq/telemetry.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/telemetry.md
index ca785fc0979..400f6e839ad 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq/telemetry.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq/telemetry.md
@@ -1,6 +1,5 @@
---
title: 遥测
-weight: 8008
---
### 什么是遥测?
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
index c7badd2b702..06d41ae7e98 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
@@ -1,6 +1,5 @@
---
title: 7 层 NGINX 负载均衡器上的 TLS 终止(Docker 安装)
-weight: 252
---
如果你的开发或测试环境要求在负载均衡器上终止 TLS/SSL,而不是在 Rancher Server 上,请部署 Rancher 并配置负载均衡器。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
index 8182d532566..7c79c13f5ae 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
@@ -1,6 +1,5 @@
---
title: 启用 API 审计日志以记录系统事件
-weight: 4
---
你可以启用 API 审计日志来记录各个用户发起的系统事件的顺序。通过查看日志,你可以了解发生了什么事件、事件发生的时间,事件发起人,以及事件影响的集群。启用此功能后,所有 Rancher API 的请求和响应都会写入日志中。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
index 1ec56cb5e26..5b522727fcf 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
@@ -1,6 +1,5 @@
---
title: 使用 firewalld 打开端口
-weight: 1
---
> 我们建议禁用 firewalld。如果你使用的是 Kubernetes 1.19 或更高版本,则必须关闭 firewalld。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
index 33ab11b1635..6cadea62ced 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
@@ -1,6 +1,5 @@
---
title: 为大型安装进行 etcd 调优
-weight: 2
---
当你运行具有 15 个或更多集群的大型 Rancher 安装时,我们建议你扩大 etcd 的默认 keyspace(默认为 2GB)。你最大可以将它设置为 8GB。此外,请确保主机有足够的 RAM 来保存整个数据集。如果需要增加这个值,你还需要同步增加主机的大小。如果你预计在垃圾回收间隔期间 Pod 的变化率很高,你也可以在较小的安装中调整 Keyspace 大小。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md
index c5a13655e02..aa8ab564ca8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md
@@ -1,6 +1,5 @@
---
title: 持续交付
-weight: 3
---
从 Rancher 2.5 开始,[Fleet](../../../../how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md) 已经预装在 Rancher 中,且从 Rancher 2.6 开始,Fleet 不能再完全禁用。但是,你可以使用 `continuous-delivery` 功能开关来禁用 GitOps 持续交付的 Fleet 功能。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
index 53ca6353482..d906144d15a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
@@ -1,6 +1,5 @@
---
title: UI 管理 Istio 虚拟服务和目标规则
-weight: 2
---
此功能可启动一个 UI,用于管理 Istio 的流量,其中包括创建、读取、更新和删除虚拟服务(Virtual Service)和目标规则(Destination Rule)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
index 3ea25743ae8..31daead898b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
@@ -1,6 +1,5 @@
---
title: "在 ARM64 上运行 Rancher(实验性)"
-weight: 3
---
:::caution
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
index 9bfc4d7c22f..1b09bd85143 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
@@ -1,6 +1,5 @@
---
title: 使用非默认支持的存储驱动
-weight: 1
---
此功能允许你使用不是默认启用的存储提供商和卷插件。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md
index ff17d45e510..2b751f02074 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md
@@ -1,7 +1,5 @@
---
title: 在离线环境中渲染 Helm 模板
-shortTitle: 离线升级
-weight: 1
---
:::note
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks.md
index b517edc9f1e..3d7da5ddec5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks.md
@@ -1,7 +1,5 @@
---
title: 在 Azure Kubernetes Service 上安装 Rancher
-shortTitle: AKS
-weight: 3
---
本文介绍了如何在微软的 Azure Kubernetes Service (AKS) 上安装 Rancher。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md
index 27b5aea647d..99888a9cf95 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md
@@ -1,7 +1,5 @@
---
title: 在 Amazon EKS 上安装 Rancher
-shortTitle: Amazon EKS
-weight: 3
---
本文介绍了在 EKS 上安装 Rancher 的两种方法。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-gke.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-gke.md
index 7f03aec181e..6c10106fad5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-gke.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-gke.md
@@ -1,7 +1,5 @@
---
title: 在 GKE 集群上安装 Rancher
-shortTitle: GKE
-weight: 3
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md
index a758a474dc8..f438fcbd326 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md
@@ -1,6 +1,5 @@
---
title: 回滚
-weight: 3
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md
index 2a4304acbab..6099742d45e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md
@@ -1,6 +1,5 @@
---
title: Rancher Server Kubernetes 集群的问题排查
-weight: 276
---
本文介绍如何对安装在 Kubernetes 集群上的 Rancher 进行故障排除。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
index f877aa0aacd..390a092ecd7 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
@@ -1,6 +1,5 @@
---
title: 升级
-weight: 2
---
本文介绍如何升级使用 Helm 安装在 Kubernetes 集群上的 Rancher Server。这些步骤也适用于使用 Helm 进行的离线安装。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/dockershim.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/dockershim.md
index 5135e1cce20..bb5204674c5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/dockershim.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/dockershim.md
@@ -1,6 +1,5 @@
---
title: Dockershim
-weight: 300
---
Dockershim 是 Kubelet 和 Docker Daemon 之间的 CRI 兼容层。Kubernetes 1.20 版本宣布了[移除树内 Dockershim](https://kubernetes.io/blog/2020/12/02/dont-panic-kubernetes-and-docker/)。有关此移除的更多信息以及时间线,请参见 [Kubernetes Dockershim 弃用相关的常见问题](https://kubernetes.io/blog/2020/12/02/dockershim-faq/#when-will-dockershim-be-removed)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/install-docker.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
index ea47b1c8388..f909b01339f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
@@ -1,6 +1,5 @@
---
title: 安装 Docker
-weight: 1
---
在使用 Helm 或 Docker 在节点上安装 Rancher Server 前,你需要先安装 Docker。
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 6fe3224535a..b9d77b5f8b2 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
@@ -1,7 +1,6 @@
---
title: 端口要求
description: 了解 Rancher 正常运行所需的端口要求,包括 Rancher 节点和下游 Kubernetes 集群节点
-weight: 300
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
index 7887ed5f058..d7fef7cf85a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
@@ -1,6 +1,5 @@
---
title: Docker 安装命令
-weight: 1
---
Docker 安装适用于想要测试 Rancher 的用户。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
index d48c7ac3ce2..54552764ffc 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
@@ -1,6 +1,5 @@
---
title: '1. 设置基础设施和私有镜像仓库'
-weight: 100
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
index d04e00f5537..661ca47b02e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
@@ -1,6 +1,5 @@
---
title: '3. 安装 Kubernetes(Docker 安装请跳过)'
-weight: 300
---
import Tabs from '@theme/Tabs';
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 9e5b143e0cd..af39f190317 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
@@ -1,6 +1,5 @@
---
title: 4. 安装 Rancher
-weight: 400
---
本文介绍如何在高可用 Kubernetes 安装的离线环境部署 Rancher。离线环境可以是 Rancher Server 离线安装、防火墙后面或代理后面。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md
index 30de77bf246..3114616d4f2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md
@@ -1,6 +1,5 @@
---
title: '2. 收集镜像并发布到私有仓库'
-weight: 200
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md
index b12f3181c30..9f8d8a4677e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md
@@ -1,6 +1,5 @@
---
title: '2. 安装 Kubernetes'
-weight: 200
---
基础设施配置好后,你可以设置一个 RKE 集群来安装 Rancher。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
index b24edc1f87c..ed831af4a1f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
@@ -1,6 +1,5 @@
---
title: 3. 安装 Rancher
-weight: 300
---
在前文的操作后,你已经有了一个运行的 RKE 集群,现在可以在其中安装 Rancher 了。出于安全考虑,所有到 Rancher 的流量都必须使用 TLS 加密。在本教程中,你将使用 [cert-manager](https://cert-manager.io/)自动颁发自签名证书。在实际使用情况下,你可使用 Let's Encrypt 或自己的证书。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
index cda04e0563c..99b0da6a0fb 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
@@ -1,6 +1,5 @@
---
title: '1. 配置基础设施'
-weight: 100
---
在本节中,你将为 Rancher Management Server 配置底层基础设施,并使其通过 HTTP 代理访问互联网。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md
index 76e4855e6a3..33b5592d4aa 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md
@@ -1,6 +1,5 @@
---
title: 证书故障排除
-weight: 4
---
### 如何确定我的证书格式是否为 PEM?
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md
index d5beb794963..32fbf2f4254 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md
@@ -1,6 +1,5 @@
---
title: 回滚 Docker 安装的 Rancher
-weight: 1015
---
如果 Rancher 升级没有成功完成,你需要回滚到你在 [Docker 升级](upgrade-docker-installed-rancher.md)之前使用的 Rancher 设置。回滚可以恢复:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
index 5528dc7afb2..7d68be0f9da 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
@@ -1,6 +1,5 @@
---
title: 升级 Docker 安装的 Rancher
-weight: 1010
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/add-tls-secrets.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/add-tls-secrets.md
index 5b1d8ad680e..9225f07630e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/add-tls-secrets.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/add-tls-secrets.md
@@ -1,6 +1,5 @@
---
title: 添加 TLS 密文
-weight: 2
---
我们使用证书和密钥将 `cattle-system` 命名空间中的 `tls-rancher-ingress` 密文配置好后,Kubernetes 会为 Rancher 创建对象和服务。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/bootstrap-password.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/bootstrap-password.md
index 9c270760235..249b14115a0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/bootstrap-password.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/bootstrap-password.md
@@ -1,6 +1,5 @@
---
title: 引导密码
-weight: 800
---
Rancher 首次启动时,会为第一个管理员用户随机生成一个密码。当管理员首次登录 Rancher 时,用于获取引导密码(Bootstrap)的命令会在 UI 上显示。管理员需要运行命令并使用引导密码登录。然后 Rancher 会让管理员重置密码。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md
index dfa0ed1877f..b33033bf4ca 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md
@@ -1,6 +1,5 @@
---
title: 选择 Rancher 版本
-weight: 1
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
index 67a8d34ec80..18d577276ea 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
@@ -1,6 +1,5 @@
---
title: 自定义 CA 根证书
-weight: 1
---
如果你在内部生产环境使用 Rancher,且不打算公开暴露应用,你可以使用使用私有 CA 颁发的证书。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/helm-version-requirements.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/helm-version-requirements.md
index c3a07d14aad..273711a4de0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/helm-version-requirements.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/helm-version-requirements.md
@@ -1,6 +1,5 @@
---
title: Helm 版本要求
-weight: 3
---
本文介绍 Helm 的要求。Helm 是用于把 Rancher 安装在高可用 Kubernetes 集群上的工具。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/local-system-charts.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/local-system-charts.md
index 324b64f77e3..887a7aa23d4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/local-system-charts.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/local-system-charts.md
@@ -1,6 +1,5 @@
---
title: 离线安装中设置本地 System Charts
-weight: 120
---
[System Charts](https://github.com/rancher/system-charts) 仓库包含 Monitoring、Logging、告警和全局 DNS 等功能所需的所有应用项。
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 da6e0b43ab5..5dda1dd1f4d 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
@@ -1,6 +1,5 @@
---
title: 更新 Rancher 证书
-weight: 10
---
# 更新私有 CA 证书
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md
index 874fed623ad..02c62205ca5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md
@@ -1,6 +1,5 @@
---
title: 升级 Cert-Manager
-weight: 4
---
Rancher 使用 cert-manager 为 Rancher 高可用部署自动生成和续期 TLS 证书。从 2019 秋季开始,cert-manager 发生了以下的三个重要变更。如果你在此时间段前创建了 Rancher 高可用部署,请进行相关操作。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
index 6677c6cd667..18def9bb648 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
@@ -1,6 +1,5 @@
---
title: 升级和回滚 Kubernetes
-weight: 70
---
升级到最新版本的 Rancher 之后,下游 Kubernetes 集群可以升级为 Rancher 支持的最新的 Kubernetes 版本。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
index c29278e679f..392755cbaba 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
@@ -1,6 +1,5 @@
---
title: 在不升级 Rancher 的情况下升级 Kubernetes
-weight: 30
---
RKE 元数据功能允许你在新版本 Kubernetes 发布后立即为集群配置新版本,而无需升级 Rancher。此功能对于使用 Kubernetes 的补丁版本非常有用,例如,在原本支持 Kubernetes v1.14.6 的 Rancher Server 版本中,将 Kubernetes 升级到 v1.14.7。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/introduction/overview.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/introduction/overview.md
index 6b8a4ef0fef..c17753633b5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/introduction/overview.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/introduction/overview.md
@@ -1,6 +1,5 @@
---
title: 概述
-weight: 1
---
Rancher 是一个为使用容器的公司打造的容器管理平台。Rancher 使得开发者可以随处运行 Kubernetes(Run Kubernetes Everywhere),满足 IT 需求规范,赋能 DevOps 团队。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md
index 4e452a89f0b..0267b3433d9 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md
@@ -1,7 +1,6 @@
---
title: Rancher AWS Marketplace 快速入门
description: 使用 Amazon EKS 部署 Rancher Server。
-weight: 110
---
你可以在 AWS 中使用 Amazon EKS 部署 Rancher Server。详情请参见我们的 [Amazon Marketplace 列表](https://aws.amazon.com/marketplace/pp/prodview-2yzbnvagmi4as)。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/aws.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/aws.md
index 7156ccd3803..3bcc21f8220 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/aws.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/aws.md
@@ -1,7 +1,6 @@
---
title: Rancher AWS 快速入门指南
description: 阅读此分步 Rancher AWS 指南,以快速部署带有单节点下游 Kubernetes 集群的 Rancher Server。
-weight: 100
---
你可以参考以下步骤,在 AWS 的单节点 K3s Kubernetes 集群中快速部署 Rancher Server,并附加一个单节点下游 Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/azure.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/azure.md
index e8c031f34d2..505d9989419 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/azure.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/azure.md
@@ -1,7 +1,6 @@
---
title: Rancher Azure 快速入门指南
description: 阅读此分步 Rancher Azure 指南,以快速部署带有单节点下游 Kubernetes 集群的 Rancher Server。
-weight: 115
---
你可以参考以下步骤,在 Azure 的单节点 K3s Kubernetes 集群中快速部署 Rancher Server,并附加一个单节点下游 Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md
index 91c4cf47dc5..9714aa745e3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md
@@ -1,7 +1,6 @@
---
title: Rancher DigitalOcean 快速入门指南
description: 阅读此分步 Rancher DigitalOcean 指南,以快速部署带有单节点下游 Kubernetes 集群的 Rancher Server。
-weight: 120
---
你可以参考以下步骤,在 DigitalOcean 的单节点 K3s Kubernetes 集群中快速部署 Rancher Server,并附加一个单节点下游 Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/equinix-metal.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/equinix-metal.md
index 7b6a4e4408c..fdc36412b56 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/equinix-metal.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/equinix-metal.md
@@ -1,6 +1,5 @@
---
title: Rancher Equinix Metal 快速入门
-weight: 250
---
## 本章节引导你:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md
index aa3b27fcd0a..81144f1bb3b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md
@@ -1,7 +1,6 @@
---
title: Rancher GCP 快速入门指南
description: 阅读此分步 Rancher GCP 指南,以快速部署带有单节点下游 Kubernetes 集群的 Rancher Server。
-weight: 130
---
你可以参考以下步骤,在 GCP 的单节点 K3s Kubernetes 集群中快速部署 Rancher Server,并附加一个单节点下游 Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md
index 35ec253ced5..61edecfe2ca 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md
@@ -1,6 +1,5 @@
---
title: Helm CLI 快速入门
-weight: 300
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/hetzner-cloud.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/hetzner-cloud.md
index 18f138fd1e5..99d969b9d64 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/hetzner-cloud.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/hetzner-cloud.md
@@ -1,7 +1,6 @@
---
title: Rancher Hetzner Cloud 快速入门指南
description: 阅读此分步 Rancher Hetzner Cloud 指南,以快速部署带有单节点下游 Kubernetes 集群的 Rancher Server。
-weight: 140
---
你可以参考以下步骤,在 Hetzner Cloud 的单节点 K3s Kubernetes 集群中快速部署 Rancher Server,并附加一个单节点下游 Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/outscale-qs.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/outscale-qs.md
index 178d1ab9d43..d22e34b9d36 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/outscale-qs.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/outscale-qs.md
@@ -1,7 +1,6 @@
---
title: Rancher Outscale 快速入门指南
description: 阅读此分步 Rancher Outscale 指南,以快速部署带有单节点下游 Kubernetes 集群的 Rancher Server。
-weight: 140
---
你可以参考以下步骤,在 Outscale 的单节点 K3s Kubernetes 集群中快速部署 Rancher Server,并附加一个单节点下游 Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md
index 8919bf0c350..f13d0a87a55 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md
@@ -1,6 +1,5 @@
---
title: Vagrant 快速入门
-weight: 200
---
你可以参考以下步骤快速部署 Rancher Server,并附加一个单节点集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-workloads/nodeports.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-workloads/nodeports.md
index efa6f04fac8..bf2294d4c06 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-workloads/nodeports.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-workloads/nodeports.md
@@ -1,6 +1,5 @@
---
title: 部署带有 NodePort 的工作负载
-weight: 200
---
### 先决条件
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md
index b29f0e5bb34..d6d32dbfa4f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md
@@ -1,6 +1,5 @@
---
title: 部署带有 Ingress 的工作负载
-weight: 100
---
### 先决条件
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
index 16435de0b55..d28db36b279 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
@@ -1,6 +1,5 @@
---
title: 配置 Active Directory (AD)
-weight: 1112
---
如果你的组织使用 Microsoft Active Directory 作为中心用户仓库,你可以将 Rancher 配置为与 Active Directory 服务器通信,从而对用户进行身份验证。这使 Rancher 管理员可以对外部用户系统中的用户和组进行集群和项目的访问控制,同时允许最终用户在登录 Rancher UI 时使用 Active Directory 凭证进行身份验证。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
index f13752d7a7e..62a8470e637 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
@@ -1,6 +1,5 @@
---
title: 配置 Azure AD
-weight: 1115
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
index 40c1a826ee0..19bef9d63a6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
@@ -1,6 +1,5 @@
---
title: 配置 FreeIPA
-weight: 1114
---
如果你的组织使用 FreeIPA 进行用户身份验证,你可以通过配置 Rancher 来允许你的用户使用 FreeIPA 凭证登录。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
index 55cbd2b55ec..aecf123035e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
@@ -1,6 +1,5 @@
---
title: 配置 GitHub
-weight: 1116
---
在使用 GitHub 的环境中,你可以通过配置 Rancher 允许用户使用 GitHub 凭证登录。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
index b3181ed8ce0..ab90756f16e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
@@ -1,6 +1,5 @@
---
title: 配置 Google OAuth
-weight: 10
---
如果你的组织使用 G Suite 进行用户身份验证,你可以通过配置 Rancher 来允许你的用户使用 G Suite 凭证登录。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md
index 45e99f9f50f..93098d054dd 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md
@@ -1,7 +1,6 @@
---
title: 配置 Keycloak (OIDC)
description: 创建 Keycloak OpenID Connect (OIDC) 客户端并配置 Rancher 以使用 Keycloak。你的用户将能够使用他们的 Keycloak 登录名登录 Rancher。
-weight: 1200
---
如果你的组织使用 [Keycloak Identity Provider (IdP)](https://www.keycloak.org) 进行用户身份验证,你可以通过配置 Rancher 来允许用户使用 IdP 凭证登录。Rancher 支持使用 OpenID Connect (OIDC) 协议和 SAML 协议来集成 Keycloak。与 Rancher 一起使用时,这两种实现在功能上是等效的。本文描述了配置 Rancher 以通过 OIDC 协议与 Keycloak 一起使用的流程。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md
index 8714771a163..e547b116239 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md
@@ -1,7 +1,6 @@
---
title: 配置 Keycloak (SAML)
description: 创建 Keycloak SAML 客户端并配置 Rancher 以使用 Keycloak。你的用户将能够使用他们的 Keycloak 登录名登录 Rancher。
-weight: 1200
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
index ed3a598b923..cfb5f6706e7 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
@@ -1,6 +1,5 @@
---
title: 配置 Okta (SAML)
-weight: 1210
---
如果你的组织使用 Okta Identity Provider (IdP) 进行用户身份验证,你可以通过配置 Rancher 来允许用户使用 IdP 凭证登录。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
index b33a92c22da..0eebb8363c9 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
@@ -1,6 +1,5 @@
---
title: 配置 PingIdentity (SAML)
-weight: 1200
---
如果你的组织使用 Ping Identity Provider (IdP) 进行用户身份验证,你可以通过配置 Rancher 来允许用户使用 IdP 凭证登录。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
index 7c0af974228..2cfb79263e9 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
@@ -1,6 +1,5 @@
---
title: 本地身份验证
-weight: 1111
---
在配置外部验证提供程序之前,你将默认使用本地身份验证。本地身份验证指的是 Rancher 使用存储在本地的用户名和密码对用户进行验证,验证通过的用户可以登录到 Rancher。默认情况下,用于首次登录 Rancher 的 `admin` 用户就是一个本地用户。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
index 25c75e3509a..3f92d35ee82 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
@@ -1,6 +1,5 @@
---
title: 用户和组
-weight: 1
---
Rancher 依赖用户和组来决定允许登录到 Rancher 的用户,以及他们可以访问哪些资源。你配置外部身份验证提供程序后,该提供程序的用户将能够登录到你的 Rancher Server。用户登录时,验证提供程序将向你的 Rancher Server 提供该用户所属的组列表。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
index 814a73c736d..de75d837543 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
@@ -1,6 +1,5 @@
---
title: 1. 在 Microsoft AD FS 中配置 Rancher
-weight: 1205
---
在配置 Rancher 以支持 AD FS 用户之前,你必须在 AD FS 中将 Rancher 添加为 [relying party trust](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/technical-reference/understanding-key-ad-fs-concepts)(信赖方信任)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
index 1c4199ad282..b0f58229191 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
@@ -1,6 +1,5 @@
---
title: 2. 在 Rancher 中配置 Microsoft AD FS
-weight: 1205
---
完成[在 Microsoft AD FS 中配置 Rancher](configure-ms-adfs-for-rancher.md) 后,将你的 AD FS 信息输入 Rancher,来允许 Rancher 通过 AD FS 进行身份验证。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
index 071642340a6..57c9d03aaee 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
@@ -1,6 +1,5 @@
---
title: Shibboleth 和 OpenLDAP 的组权限
-weight: 1
---
本文为打算在 Rancher 中设置 Shibboleth 身份验证的用户提供背景信息和上下文。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
index 9893fdd81fe..5f9c30227ba 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
@@ -1,6 +1,5 @@
---
title: 集群驱动
-weight: 1
---
集群驱动用于在[托管 Kubernetes 提供商](../../../../pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md)(例如 Google GKE)中创建集群。创建集群时可以显示的集群驱动,是由集群驱动的状态定义的。只有 `active` 集群驱动将作为创建集群的选项显示。默认情况下,Rancher 与多个现有的云提供商集群驱动打包在一起,但你也可以将自定义集群驱动添加到 Rancher。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
index 00e3d0e7838..bb49bcbe46a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
@@ -1,6 +1,5 @@
---
title: 主机驱动
-weight: 2
---
主机驱动用于配置主机,Rancher 使用这些主机启动和管理 Kubernetes 集群。主机驱动与 [Docker Machine 驱动](https://docs.docker.com/machine/drivers/)相同。创建主机模板时可以显示的主机驱动,是由主机驱动的状态定义的。只有 `active` 主机驱动将显示为创建节点模板的选项。默认情况下,Rancher 与许多现有的 Docker Machine 驱动打包在一起,但你也可以创建自定义主机驱动并添加到 Rancher。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
index 82f9d261649..947f2a9784c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
@@ -1,6 +1,5 @@
---
title: 访问和共享
-weight: 31
---
如果你是 RKE 模板所有者,你可以将该模板共享给用户或用户组,然后他们可以使用该模板创建集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
index e4ab2c4639e..3efac3e477e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
@@ -1,6 +1,5 @@
---
title: 应用模板
-weight: 50
---
你可以使用你自己创建的 RKE 模板来创建集群,也可以使用[与你共享的模板](access-or-share-templates.md)来创建集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
index 141b8971a2e..4810e841cab 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
@@ -1,6 +1,5 @@
---
title: 模板创建者权限
-weight: 10
---
管理员有创建 RKE 模板的权限,只有管理员可以将该权限授予其他用户。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
index 0d56660383f..38ab0f41ee8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
@@ -1,6 +1,5 @@
---
title: 强制使用模板
-weight: 32
---
本节介绍模板管理员如何在 Rancher 中强制执行模板,从而限制用户在没有模板的情况下创建集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
index 0f39390f25a..7457df20253 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
@@ -1,6 +1,5 @@
---
title: 示例场景
-weight: 5
---
以下示例场景描述了组织如何使用模板来标准化集群创建。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
index 6db639911bf..a3cb27d9b6b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
@@ -1,6 +1,5 @@
---
title: RKE 模板和基础设施
-weight: 90
---
在 Rancher 中,RKE 模板用于配置 Kubernetes 和定义 Rancher 设置,而节点模板则用于配置节点。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
index 7055527c31c..68880d4513e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
@@ -1,6 +1,5 @@
---
title: 创建和修改 RKE 模板
-weight: 32
---
本节介绍如何管理 RKE 模板和修订版。你可以从 **RKE1 配置 > RKE 模板**下的**集群管理**视图创建、共享、更新和删除模板。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
index f5c90981e80..11ecac6fabd 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
@@ -1,6 +1,5 @@
---
title: 覆盖模板设置
-weight: 33
---
用户创建 RKE 模板时,模板中的每个设置在 Rancher UI 中都有一个开关,指示用户是否可以覆盖该设置。此开关将这些设置标记为**允许用户覆盖**。打开开关表示用户可以修改对应的参数,关闭开关表示用户无权修改对应的参数。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
index 6a767abc6f0..3c138f68b8c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
@@ -1,6 +1,5 @@
---
title: Pod 安全策略
-weight: 60
---
_Pod 安全策略(PSP)_ 是用来控制安全敏感相关 Pod 规范(例如 root 特权)的对象。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding.md
index bdad8b7643a..2f9f6ab940d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding.md
@@ -1,6 +1,5 @@
---
title: 定制品牌
-weight: 90
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
index 48d6d59e6ff..34eec8ffbcb 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
@@ -1,6 +1,5 @@
---
title: 配置全局默认私有镜像仓库
-weight: 40
---
你可以使用私有容器镜像仓库,在组织内共享你的自定义系统镜像。借助私有镜像仓库,你可以让集群使用私有的、一致的、且来源可信的、集中的系统镜像。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md
index b960aee336d..289e5a4a173 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md
@@ -1,6 +1,5 @@
---
title: 集群模板
-weight: 100
---
集群模板包含 Kubernetes 配置和节点池配置,允许单个模板包含 Rancher 在云提供商中配置新节点并在这些节点上安装 Kubernetes 所需的所有信息。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-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/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
index 4ccca8da4f2..6e7d76248e5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-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/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
@@ -1,6 +1,5 @@
---
title: 集群和项目角色
-weight: 1127
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
index 67274ea8aff..c88b783ae1f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
@@ -1,6 +1,5 @@
---
title: 自定义角色
-weight: 1128
---
在 Rancher 中,_角色_ 决定了用户可以在集群或项目中执行哪些操作。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
index 5f91044c257..a542114495e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
@@ -1,6 +1,5 @@
---
title: 全局权限
-weight: 1126
---
_权限_ 是你在为用户选择自定义权限时可以分配的个人访问权限。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
index 2e86f4afab7..cb0ad71fa38 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
@@ -1,6 +1,5 @@
---
title: 锁定角色
-weight: 1129
---
你可以将角色设置为`锁定`状态。锁定角色可防止把这些角色分配给用户。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
index a6ac9c2265b..a518b3c461a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
@@ -1,6 +1,5 @@
---
title: 1. 在集群中启用 Istio
-weight: 1
---
:::note 先决条件:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md
index a7bc098b4a6..3651b9d77c6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md
@@ -1,6 +1,5 @@
---
title: 2. 在命名空间中启用 Istio
-weight: 2
---
你需要在需要由 Istio 跟踪或控制的每个命名空间中手动启用 Istio。在命名空间中启用 Istio 时,Envoy sidecar 代理将自动注入到部署在命名空间中的所有新工作负载中。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
index 48b03120ead..0ec3e4ddee8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
@@ -1,6 +1,5 @@
---
title: 6. 生成和查看流量
-weight: 7
---
本文介绍如何查看 Istio 管理的流量。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md
index 1a5c7bab86e..49d0130dbd6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md
@@ -1,6 +1,5 @@
---
title: 4. 设置 Istio Gateway
-weight: 5
---
每个集群的网关可以有自己的端口或负载均衡器,这与服务网格无关。默认情况下,每个 Rancher 配置的集群都有一个 NGINX Ingress Controller 来允许流量进入集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md
index caf9d883478..9782bd28938 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md
@@ -1,6 +1,5 @@
---
title: 5. 设置 Istio 的流量管理组件
-weight: 6
---
Istio 中流量管理的一个核心优势是允许动态请求路由。动态请求路由通常应用于金丝雀部署和蓝/绿部署等。Istio 流量管理中的两个关键资源是*虚拟服务*和*目标规则*。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md
index 01d79d5573c..2290de911ad 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md
@@ -1,6 +1,5 @@
---
title: 3. 使用 Istio Sidecar 添加部署和服务
-weight: 4
---
:::note 先决条件:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
index b9611880501..080abf220bc 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
@@ -1,6 +1,5 @@
---
title: 将用户添加到集群
-weight: 2020
---
如果你想为用户提供对集群内 _所有_ 项目、节点和资源的访问权限,请为用户分配集群成员资格。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
index 655fce5af03..2272ba55951 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
@@ -1,6 +1,5 @@
---
title: 授权集群端点的工作原理
-weight: 2015
---
本文介绍 kubectl CLI、kubeconfig 文件和授权集群端点如何协同工作,使你可以直接访问下游 Kubernetes 集群,而无需通过 Rancher Server 进行身份验证。本文旨在为[设置 kubectl 以直接访问集群的说明](use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)提供背景信息和上下文。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
index 5bed6de12ab..6d461d834f4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
@@ -1,7 +1,6 @@
---
title: "使用 Kubectl 和 kubeconfig 访问集群"
description: "了解如何通过 kubectl Shell 使用 kubectl,或通过 kubectl CLI 和 kubeconfig 文件,来访问和管理 Kubernetes 集群。kubeconfig 文件用于配置对 Kubernetes 的访问。当你使用 Rancher 创建集群时,Rancher 会自动为你的集群创建 kubeconfig。"
-weight: 2010
---
本文介绍如何通过 Rancher UI 或工作站来使用 kubectl 操作下游 Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
index 25db290f11c..704fafc488f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
@@ -1,6 +1,5 @@
---
title: 添加 Pod 安全策略
-weight: 80
---
:::note 先决条件:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
index fa5f55de31c..180a248025b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
@@ -1,6 +1,5 @@
---
title: 分配 Pod 安全策略
-weight: 2260
---
_Pod 安全策略_(PSP)是控制 Pod 安全的规范(如是否可以使用 root 权限等)的对象。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
index 2c1c4f4ba76..7f0c507b09c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
@@ -1,7 +1,6 @@
---
title: 从节点中移除 Kubernetes 组件
description: 了解从 Rancher 启动的 Kubernetes 集群中删除节点时的集群清理过程。了解删除了的内容,以及如何手动进行操作
-weight: 2055
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
index 1ed44b4e7ab..21cb5570876 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
@@ -1,6 +1,5 @@
---
title: 克隆集群
-weight: 2035
---
如果你在 Rancher 中有一个集群并想将这个集群用作创建集群的模板,你可以使用 Rancher CLI 克隆集群的配置,编辑配置,然后使用这些配置来快速启动克隆的集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
index a58009bc194..9a4c878d631 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
@@ -1,6 +1,5 @@
---
title: GlusterFS 卷
-weight: 5000
---
:::note
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
index e787ef53daf..6e744c1295f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
@@ -1,6 +1,5 @@
---
title: 持久存储的工作原理
-weight: 1
---
持久卷 (PV) 是 Kubernetes 集群中的一块存储,而持久卷声明 (PVC) 是对存储的请求。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
index 6da813ed923..8b77607fcf0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
@@ -1,6 +1,5 @@
---
title: 在 Rancher 中动态配置新存储
-weight: 2
---
本文介绍如何为 Rancher 中的工作负载配置新的持久存储。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
index 43037bf876f..94fccbf04dd 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
@@ -1,6 +1,5 @@
---
title: iSCSI 卷
-weight: 6000
---
在将数据存储在 iSCSI 卷上的 [Rancher 启动的 Kubernetes 集群](../../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md)中,你可能会遇到 kubelet 无法自动连接 iSCSI 卷的问题。成此问题的原因很可能是 iSCSI 启动器工具不兼容。你可以在每个集群节点上安装 iSCSI 启动器工具来解决此问题。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
index fb3083fc4e1..90aa0281ca6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
@@ -1,6 +1,5 @@
---
title: 设置现有存储
-weight: 1
---
本文介绍如何在 Rancher 中为工作负载设置现有的持久存储。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
index d7b1b0bae3a..31f13278ae2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
@@ -1,6 +1,5 @@
---
title: 使用外部 Ceph 驱动
-weight: 10
---
本文介绍如何在 RKE2 集群中使用外部 Ceph 驱动。如果你使用的是 RKE,则需要执行其他步骤。详情请参阅[本节](#在-rke-中使用-ceph-驱动)。
@@ -314,7 +313,7 @@ spec:
requests:
storage: 2Gi
storageClassName: ceph-rbd-sc
----
+---
apiVersion: v1
kind: Pod
metadata:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
index 1ae32a0bca2..cd65b8826a8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
@@ -1,6 +1,5 @@
---
title: NFS 存储
-weight: 3054
---
在将 NFS 存储卷插件用于 Rancher deployment 之前,你需要配置 NFS 服务器。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
index 7b7ced2fc7b..cd0dda69ab3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
@@ -1,6 +1,5 @@
---
title: 在 Amazon EBS 中创建持久存储
-weight: 3053
---
本文介绍如何在 EC2 中设置 Amazon 的 Elastic Block Store。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
index 533cb97bb8f..1a0824e4382 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
@@ -1,6 +1,5 @@
---
title: vSphere 存储
-weight: 3055
---
要为有状态的工作负载提供 vSphere 存储,我们建议创建一个 vSphereVolume StorageClass。当工作负载通过 PersistentVolumeClaim 请求卷时,这种做法会动态调配 vSphere 存储。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
index 84c6b458d5e..d656827b467 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
@@ -1,6 +1,5 @@
---
title: 通过 AWS EC2 Auto Scaling 组使用 Cluster Autoscaler
-weight: 1
---
本指南介绍如何使用 AWS EC2 Auto Scaling 组在 Rancher 自定义集群上安装和使用 [Kubernetes cluster-autoscaler](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
index 6d42cdd3815..785ce628528 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
@@ -1,6 +1,5 @@
---
title: 节点和节点池
-weight: 2030
---
在 Rancher 中启动 Kubernetes 集群后,你可以从集群的**节点**选项卡管理各个节点。不同的配置集群[选项](../../../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md)对应不同的可用节点选项。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
index 9429ee78b39..cdf1ab5a57b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
@@ -1,7 +1,6 @@
---
title: 使用 Rancher 的项目和 Kubernetes 命名空间
description: Rancher Projects 减轻了集群的管理负担并支持多租户。学习创建项目并将项目划分为 Kubernetes 命名空间
-weight: 2032
---
命名空间是 Kubernetes 的概念,它允许你在集群中使用虚拟集群。这对于将集群划分为单独的“虚拟集群”很有用,每个“虚拟集群”都有自己的访问控制和资源配额。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
index 46a8c395e78..4bc142e44ab 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
@@ -1,6 +1,5 @@
---
title: 证书轮换
-weight: 2040
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key.md
index 3c8a696d6a2..f5bee1da3a8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key.md
@@ -1,6 +1,5 @@
---
title: 加密密钥轮换
-weight: 2043
---
### RKE1 加密密钥轮换
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
index 4995458ca33..763893847a0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
@@ -1,6 +1,5 @@
---
title: 添加项目成员
-weight: 2505
---
如果你想为用户提供集群内 _特定_ 项目和资源的访问权限,请为用户分配项目成员资格。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md
index 4b2252eb565..199dcb43f70 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md
@@ -1,7 +1,6 @@
---
title: Rancher CI/CD 流水线
description: 使用 Rancher 的 CI/CD 流水线自动检出代码、运行构建或脚本、发布 Docker 镜像以及向用户部署软件
-weight: 4000
---
你可以使用 Rancher 与 GitHub 仓库集成,从而设置持续集成(CI)流水线。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
index 9b7ce4edae6..635c379eb63 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
@@ -1,6 +1,5 @@
---
title: 命名空间
-weight: 2520
---
在 Rancher 中,你可以将项目进一步划分为多个[命名空间](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/),项目是由物理集群支持的,而命名空间是项目中的虚拟集群。当项目和 `default` 命名空间不能满足你的需求时,你可以在项目中创建多个命名空间来隔离应用和资源。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
index 32c94c141ef..1674eeb62e0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
@@ -1,6 +1,5 @@
---
title: Pod 安全策略
-weight: 5600
---
:::note
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
index d171c3f5912..bd912fd3e66 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
@@ -1,6 +1,5 @@
---
title: Rancher 项目中资源配额的工作原理
-weight: 1
---
Rancher 中的资源配额包含与 [Kubernetes 原生版本](https://kubernetes.io/docs/concepts/policy/resource-quotas/)相同的功能。Rancher 还扩展了资源配额的功能,让你将资源配额应用于项目。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
index 700b2023462..81a41d99d8e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
@@ -1,6 +1,5 @@
---
title: 覆盖命名空间的默认限制
-weight: 2
---
**命名空间默认限制**会在创建时从项目沿用到每个命名空间。但在某些情况下,你可能需要增加或减少特定命名空间的配额。在这种情况下,你可以通过编辑命名空间来覆盖默认限制。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md
index eba71bea6a0..b0873befd7a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md
@@ -1,6 +1,5 @@
---
title: 资源配额类型参考
-weight: 4
---
创建资源配额相当于配置项目可用的资源池。你可以为以下资源类型设置资源配额:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md
index 0d5119d4302..995eb55a81f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md
@@ -1,6 +1,5 @@
---
title: 设置容器默认资源限制
-weight: 3
---
在设置资源配额时,如果你在项目或命名空间上设置了任何与 CPU 或内存相关的内容(即限制或预留),所有容器都需要在创建期间设置各自的 CPU 或内存字段。详情请参阅 [Kubernetes 文档](https://kubernetes.io/docs/concepts/policy/resource-quotas/#requests-vs-limits)。
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 d4c0f20e691..ab66028da06 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
@@ -1,6 +1,5 @@
---
title: 持久化 Grafana 仪表板
-weight: 6
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
index 1be161297b6..fc4d9519f29 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
@@ -1,6 +1,5 @@
---
title: 自定义 Grafana 仪表板
-weight: 5
---
在本文中,你将学习通过自定义 Grafana 仪表板来显示特定容器的指标。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/debug-high-memory-usage.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/debug-high-memory-usage.md
index da67214aad7..a51a45041ec 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/debug-high-memory-usage.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/debug-high-memory-usage.md
@@ -1,6 +1,5 @@
---
title: 调试高内存用量
-weight: 8
---
Prometheus 中的每个时间序列都由其[指标名称](https://prometheus.io/docs/practices/naming/#metric-names)和称为[标签](https://prometheus.io/docs/practices/naming/#labels)的可选键值对唯一标识。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
index 9843c97f41a..f919d611573 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
@@ -1,6 +1,5 @@
---
title: 启用 Monitoring
-weight: 1
---
[管理员](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)或[集群所有者](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)可以通过配置 Rancher 来部署 Prometheus,从而监控 Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
index aa9de47c338..76eecf498e6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
@@ -1,6 +1,5 @@
---
title: 迁移到 Rancher 2.5+ Monitoring
-weight: 9
---
如果你在 Rancher 2.5 之前启用了 Monitoring、Alerting 或 Notifiers,则无法自动升级到新的监控/告警解决方案。在 Cluster Explorer 中部署新的监控解决方案之前,你需要禁用并删除整个集群所有项目中的所有自定义告警、通知器和监控安装。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/customize-grafana-dashboards.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/customize-grafana-dashboards.md
index 2c99255a0d5..44d69d05f9e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/customize-grafana-dashboards.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/customize-grafana-dashboards.md
@@ -1,6 +1,5 @@
---
title: 自定义 Grafana 仪表板
-weight: 3
---
无论是用于 rancher-monitoring 还是 Prometheus Federator,Grafana 仪表板的定制方式都是相同的。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/enable-prometheus-federator.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/enable-prometheus-federator.md
index 3e0f18c5cd2..b73fa5d5de3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/enable-prometheus-federator.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/enable-prometheus-federator.md
@@ -1,6 +1,5 @@
---
title: 启用 Prometheus Federator
-weight: 1
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/project-monitors.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/project-monitors.md
index d637d095e4a..9dba3d6d401 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/project-monitors.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/project-monitors.md
@@ -1,6 +1,5 @@
---
title: 安装 Project Monitor
-weight: 5
---
在要启用项目监控的各个项目中安装 **Project Monitor**。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/set-up-workloads.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/set-up-workloads.md
index 23ed8da6e50..9d0969f6cbc 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/set-up-workloads.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/set-up-workloads.md
@@ -1,6 +1,5 @@
---
title: 为工作负载设置 Prometheus Federator
-weight: 4
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/uninstall-prometheus-federator.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/uninstall-prometheus-federator.md
index d84e4b80669..0184308ff14 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/uninstall-prometheus-federator.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/uninstall-prometheus-federator.md
@@ -1,6 +1,5 @@
---
title: 卸载 Prometheus Federator
-weight: 2
---
1. 点击 **☰ > 集群管理**。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/set-up-monitoring-for-workloads.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/set-up-monitoring-for-workloads.md
index b086c8146bf..84b09989822 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/set-up-monitoring-for-workloads.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/set-up-monitoring-for-workloads.md
@@ -1,6 +1,5 @@
---
title: 为工作负载设置 Monitoring
-weight: 4
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/uninstall-monitoring.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/uninstall-monitoring.md
index a375550e478..79fa5d6a9f9 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/uninstall-monitoring.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/uninstall-monitoring.md
@@ -1,6 +1,5 @@
---
title: 卸载 Monitoring
-weight: 2
---
1. 点击 **☰ > 集群管理**。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
index 1560c282712..f2fd34ad716 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
@@ -1,6 +1,5 @@
---
title: Alertmanager 配置
-weight: 1
---
通常情况下,你不需要直接编辑 Alertmanager 自定义资源。对于大多数用例,只需要编辑接收器和路由即可配置通知。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
index 58e0fedfaca..a1b84059905 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
@@ -1,6 +1,5 @@
---
title: Prometheus 配置
-weight: 1
---
通常情况下,你不需要直接编辑 Prometheus 自定义资源,因为 Monitoring 应用会根据 ServiceMonitor 和 PodMonitor 的更改自动更新资源。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
index 5183ce4768e..13779cd5ab7 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
@@ -1,6 +1,5 @@
---
title: 配置 PrometheusRule
-weight: 3
---
PrometheusRule 定义了一组 Prometheus 告警和/或记录规则。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md
index 155429cf2ce..2faa76c3d44 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md
@@ -1,7 +1,5 @@
---
title: 备份 Docker 安装的 Rancher
-shortTitle: 备份
-weight: 3
---
成功使用 Docker 安装 Rancher 后,我们建议你定期创建备份。最近创建的备份能让你在意外灾难发生后快速进行恢复。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md
index ce506b54175..40f1ff8600d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md
@@ -1,6 +1,5 @@
---
title: 备份集群
-weight: 2045
---
在 Rancher UI 中,你可以轻松备份和恢复 [Rancher 启动的 Kubernetes 集群](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md)的 etcd。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md
index 7b0144a187b..26a37bf5500 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md
@@ -1,6 +1,5 @@
---
title: 备份 Rancher
-weight: 1
---
在本节中,你将学习如何备份运行在任何 Kubernetes 集群上的 Rancher。要备份通过 Docker 安装的 Rancher,请参见[单节点备份](back-up-docker-installed-rancher.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
index 3adb2a7164d..fec4859af40 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
@@ -1,6 +1,5 @@
---
title: 将 Rancher 迁移到新集群
-weight: 3
---
如果你要将 Rancher 迁移到一个新的 Kubernetes 集群,先不要在新集群上安装 Rancher。这是因为如果将 Rancher 还原到已安装 Rancher 的新集群,可能会导致问题。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md
index 51054a9c4a8..b491321f2bf 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md
@@ -1,7 +1,5 @@
---
title: 恢复备份 - Docker 安装
-shortTitle: 还原
-weight: 3
---
如果遇到灾难情况,你可以将 Rancher Server 恢复到最新的备份。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
index 0011772afe3..d1cdf1cf8d2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
@@ -1,6 +1,5 @@
---
title: 使用备份恢复集群
-weight: 2050
---
你可以轻松备份和恢复 [Rancher 启动的 Kubernetes 集群](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md)的 etcd。etcd 数据库的快照会保存在 etcd 节点或 S3 兼容目标上。配置 S3 的好处是,如果所有 etcd 节点都丢失了,你的快照会保存到远端并能用于恢复集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md
index 973a115c0b6..f89f38c5463 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md
@@ -1,6 +1,5 @@
---
title: 还原 Rancher
-weight: 2
---
本页概述了如何使用 Rancher 执行恢复。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
index e5706035807..f1ce2a1d522 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
@@ -1,6 +1,5 @@
---
title: Fleet - 大规模的 GitOps
-weight: 1
---
Fleet 是大规模的 GitOps。你可以使用 Fleet 管理多达一百万个集群。Fleet 非常轻量,可以很好地用于[单个集群](https://fleet.rancher.io/single-cluster-install/),但是在你达到[大规模](https://fleet.rancher.io/multi-cluster-install/)时,它能发挥更强的实力。此处的大规模指的是大量集群、大量部署、或组织中存在大量团队的情况。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
index 8077c09bd34..dc5408a4f35 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
@@ -1,6 +1,5 @@
---
title: 多集群应用
-weight: 2
---
> Rancher v2.5 开始已弃用多集群应用。我们现在建议使用 [Fleet](fleet.md) 来跨集群部署应用。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md
index 4afd100be5c..967dbf70bc2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md
@@ -1,6 +1,5 @@
---
title: 创建应用
-weight: 400
---
Rancher 的应用市场基于 Helm 仓库和 Helm Chart。你可以添加基于 HTTP 的标准 Helm 仓库以及任何包含 Chart 的 Git 仓库。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md
index ba2b3605e61..eb8c47302ae 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md
@@ -1,6 +1,5 @@
---
title: 设置 Amazon NLB 网络负载均衡器
-weight: 5
---
本文介绍了如何在 Amazon EC2 服务中设置 Amazon NLB 网络负载均衡器,用于将流量转发到 EC2 上的多个实例中。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
index bf7a64d1c80..cf0046da7fa 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
@@ -1,6 +1,5 @@
---
title: '为高可用 K3s Kubernetes 集群设置基础设施'
-weight: 1
---
本教程旨在帮助你为 Rancher Management Server 配置底层基础设施。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
index 4438fa58196..793b5b2f691 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
@@ -1,6 +1,5 @@
---
title: '为高可用 RKE Kubernetes 集群设置基础设施'
-weight: 2
---
本教程旨在帮助你创建一个高可用的 RKE 集群,用于安装 Rancher Server。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
index e211b4cf972..9c56a56dbba 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
@@ -1,6 +1,5 @@
---
title: '为高可用 RKE2 Kubernetes 集群设置基础设施'
-weight: 1
---
本教程旨在帮助你为 Rancher Management Server 配置底层基础设施。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md
index db27920f0c1..a17d948147d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md
@@ -1,6 +1,5 @@
---
title: 在 Amazon RDS 中创建 MySQL 数据库
-weight: 4
---
本教程介绍如何在 Amazon RDS 中创建 MySQL 数据库。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md
index 7e09aa44c7d..59af8032c03 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md
@@ -1,6 +1,5 @@
---
title: 配置 NGINX 负载均衡器
-weight: 4
---
将 NGINX 配置为四层负载均衡器(TCP),用于将连接转发到 Rancher 节点。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md
index a6483700c7d..21294b1016e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md
@@ -1,6 +1,5 @@
---
title: 在 Amazon EC2 中配置节点
-weight: 3
---
在本教程中,你将学习一种为 Rancher Mangement Server 创建 Linux 节点的方法。这些节点将满足[操作系统、Docker、硬件和网络的要求](../../../pages-for-subheaders/installation-requirements.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md
index b2e67f86331..2f28274e31b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md
@@ -1,6 +1,5 @@
---
title: 高可用安装
-weight: 1
---
我们建议使用 Helm( Kubernetes 包管理器 )在专用的 Kubernetes 集群上安装 Rancher。由于 Rancher 运行在多个节点上提升了可用性,因此这种安装方式叫做高可用 Kubernetes 安装。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md
index 13002d2f5d4..67b8e2ababd 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md
@@ -1,7 +1,5 @@
---
title: 为 Rancher 设置高可用 K3s Kubernetes 集群
-shortTitle: 为 Rancher 配置 K3s
-weight: 2
---
本文介绍了如何根据 [Rancher Server 环境的最佳实践](../../../reference-guides/rancher-manager-architecture/architecture-recommendations.md#kubernetes-安装环境)安装 Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
index 93cfc3ac59d..67179a89d14 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
@@ -1,7 +1,5 @@
---
title: 配置高可用的 RKE Kubernetes 集群
-shortTitle: 配置 RKE Kubernetes
-weight: 3
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md
index 27386ce86c3..193265e0780 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md
@@ -1,7 +1,5 @@
---
title: 为 Rancher 设置高可用的 RKE2 Kubernetes 集群
-shortTitle: 为 Rancher 配置 RKE2
-weight: 2
---
_已在 2.5.6 版本测试_
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md
index 41c4ee29fba..a0ec43f76c5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md
@@ -1,6 +1,5 @@
---
title: 推荐的集群架构
-weight: 1
---
有三个角色可以分配给节点,分别是 `etcd`、`controlplane` 和 `worker`。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md
index 9d463d72f58..1f929eb52f9 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md
@@ -1,6 +1,5 @@
---
title: Kubernetes 中节点的角色
-weight: 1
---
本节介绍 Kubernetes 中 etcd 节点、controlplane 节点和 worker 节点的角色,以及这些角色如何在集群中协同工作。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
index 0489a7aa51d..445af2200f6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
@@ -1,6 +1,5 @@
---
title: Rancher Agent
-weight: 2400
---
Rancher 管理的集群上部署了两种不同的 Agent 资源:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md
index 1c596170376..233b6537733 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md
@@ -1,6 +1,5 @@
---
title: RKE1 和 RKE2 差异
-weight: 2450
---
RKE2,也称为 RKE Government,是一个完全符合标准的 Kubernetes 发行版,它专注于安全性和合规性。它被认为是 Rancher Kubernetes Engine(即 RKE1)的下一个迭代。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
index 4b84a16fa10..673a8e14f12 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
@@ -1,6 +1,5 @@
---
title: 设置 Amazon 云提供商
-weight: 1
---
使用 `Amazon` 云提供商时,你可以利用以下功能:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
index f35b08e5c6b..9af5a210f62 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
@@ -1,6 +1,5 @@
---
title: 设置 Azure 云提供商
-weight: 2
---
使用 `Azure` 云提供商时,你可以使用以下功能:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
index cb184a806b1..f5e437e9de8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
@@ -1,6 +1,5 @@
---
title: 设置 Google Compute Engine 云提供商
-weight: 3
---
在本节中,你将了解如何在 Rancher 中为自定义集群启用 Google Compute Engine (GCE) 云提供商。自定义集群指的是 Rancher 在现有节点上安装 Kubernetes 的集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md
index 7dcb7c04db5..17d1e4f671c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md
@@ -1,7 +1,5 @@
---
title: 配置树内 vSphere 云提供商
-shortTitle: 树内云提供商
-weight: 10
---
要设置树内 vSphere 云提供商,请在 Rancher 中创建 vSphere 集群时按照以下步骤操作:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md
index b145f3e7444..26b81788d31 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md
@@ -1,7 +1,5 @@
---
title: 配置树外 vSphere 云提供商
-shortTitle: 树外云提供商
-weight: 10
---
Kubernetes 正在逐渐不在树内维护云提供商。vSphere 有一个树外云提供商,可通过安装 vSphere 云提供商和云存储插件来使用。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md
index e61816a534c..9d4bb823d71 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md
@@ -1,6 +1,5 @@
---
title: 将 vSphere 树内卷迁移到 CSI
-weight: 5
---
Kubernetes 正在逐渐不在树内维护云提供商。vSphere 有一个树外云提供商,可通过安装 vSphere 云提供商和云存储插件来使用。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
index 819a79e1faa..3c9b234231c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
@@ -1,7 +1,5 @@
---
title: 创建 DigitalOcean 集群
-shortTitle: DigitalOcean
-weight: 2215
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
index 11668980911..499d2adf2b7 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
@@ -1,8 +1,6 @@
---
title: 创建 Amazon EC2 集群
-shortTitle: Amazon EC2
description: 了解使用 Rancher 创建 Amazon EC2 集群所需的先决条件和步骤
-weight: 2210
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
index 325b6052855..f9d41938f2c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
@@ -1,7 +1,5 @@
---
title: 创建 Azure 集群
-shortTitle: Azure
-weight: 2220
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
index 2cd7532f757..76a1e3a5310 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
@@ -1,6 +1,5 @@
---
title: 在 Nutanix AOS 中配置 Kubernetes 集群
-weight: 1
---
要使用 Rancher 在 Nutanix AOS (AHV) 中安装 [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes 集群:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md
index cc08a6e13f7..6872dae6a02 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md
@@ -1,6 +1,5 @@
---
title: 创建 vSphere 虚拟机模板
-weight: 4
---
要重复且可靠地创建虚拟机通常非常困难。VMware vSphere 支持构建可以转换为模板的虚拟机。然后,你可以使用该模板来创建配置相同的虚拟机。Rancher 会在节点池中利用此功能来创建相同的 RKE1 和 RKE2 节点。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
index c0f948a470e..87db9f2e07f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
@@ -1,6 +1,5 @@
---
title: 在 vSphere 控制台中创建凭证
-weight: 3
---
本节介绍如何创建 vSphere 用户名和密码。你需要将这些 vSphere 凭证提供给 Rancher,Rancher 才能在 vSphere 中配置资源。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
index 4d0d3c77605..3bafe4cc4d4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
@@ -1,6 +1,5 @@
---
title: 在 vSphere 中配置 Kubernetes 集群
-weight: 1
---
在本节中,你将学习如何使用 Rancher 在 vSphere 中安装 [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
index 568ce34b77d..f5e231feffc 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
@@ -1,6 +1,5 @@
---
title: Azure 中存储类的配置
-weight: 3
---
如果你的节点使用 Azure VM,则可以使用 [Azure 文件](https://docs.microsoft.com/en-us/azure/aks/azure-files-dynamic-pv)作为集群的存储类(StorageClass)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
index 01ec185f589..3a5ac26045c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
@@ -1,6 +1,5 @@
---
title: Host Gateway (L2bridge) 的网络要求
-weight: 1000
---
本节介绍如何配置使用 *Host Gateway (L2bridge)* 模式的自定义 Windows 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md
index 257626defd1..3d1ec9f8064 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md
@@ -1,6 +1,5 @@
---
title: Windows 和 Linux 集群的功能奇偶一致性
-weight: 3
---
Windows 集群与 Linux 集群的功能支持不相同。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance.md
index 3c3e7f8380c..ce334bc5382 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance.md
@@ -1,6 +1,5 @@
---
title: 将 Windows 工作负载从 RKE2 迁移到 RKE2
-weight: 3
---
**注意**:Rancher Support 的 SLA 不涵盖本文档的内容。因此,请谨慎继续。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
index d3eb14e9d40..1c42ce0b59f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
@@ -1,6 +1,5 @@
---
title: Rancher 管理集群的节点要求
-weight: 1
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
index 1b051178e1c..f9778a696bf 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
@@ -1,6 +1,5 @@
---
title: 注册现有集群
-weight: 6
---
集群注册功能取代了导入集群的功能。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md
index 3265c5570ea..4369666a95d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md
@@ -1,7 +1,5 @@
---
title: 创建 AKS 集群
-shortTitle: Azure Kubernetes 服务
-weight: 2115
---
你可以使用 Rancher 创建托管在 Microsoft Azure Kubernetes 服务 (AKS) 中的集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
index 99a3ee9bc95..ebe5554d8d2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
@@ -1,7 +1,5 @@
---
title: 创建阿里云 ACK 集群
-shortTitle: 阿里云 Kubernetes 容器服务
-weight: 2120
---
你可以使用 Rancher 创建托管在阿里云 Alibaba Cloud Kubernetes (ACK) 中的集群。Rancher 已经为 ACK 实现并打包了针对 ACK 的[集群驱动](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md),但是默认情况下,这个集群驱动的状态是 `inactive`。为了启动 ACK 集群,你需要[启用 ACK 集群驱动](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#激活/停用集群驱动)。启用集群驱动后,你可以开始配置 ACK 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md
index 361583e1368..583c7ebc62b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md
@@ -1,7 +1,5 @@
---
title: 管理 GKE 集群
-shortTitle: Google Kubernetes Engine
-weight: 2105
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
index bf0e4845106..4136c540753 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
@@ -1,7 +1,5 @@
---
title: 创建华为 CCE 集群
-shortTitle: 华为云 Kubernetes 服务
-weight: 2130
---
你可以使用 Rancher 创建托管在华为云容器引擎 (CCE) 中的集群。Rancher 已经为 CCE 实现并打包了针对 CCE 的[集群驱动](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md),但是默认情况下,这个集群驱动的状态是 `inactive`。为了启动 CCE 集群,你需要[启用 CCE 集群驱动](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#激活/停用集群驱动)。启用集群驱动后,你可以开始配置 CCE 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
index 2c76c8dc64e..1b4916a02c5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
@@ -1,7 +1,5 @@
---
title: 创建腾讯 TKE 集群
-shortTitle: Tencent Kubernetes Engine
-weight: 2125
---
你可以使用 Rancher 创建托管在腾讯 Tencent Kubernetes Engine (TKE) 中的集群。Rancher 已经为 TKE 实现并打包了针对 TKE 的[集群驱动](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md),但是默认情况下,这个集群驱动的状态是 `inactive`。为了启动 TKE 集群,你需要[启用 TKE 集群驱动](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#激活/停用集群驱动)。启用集群驱动后,你可以开始配置 TKE 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md
index 7cfb5e3abc9..e66e26a3975 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md
@@ -1,6 +1,5 @@
---
title: ConfigMap
-weight: 3061
---
大多数 Kubernetes 密文用于存储敏感信息,但是 [ConfigMap](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/) 会存储一般配置信息,例如一组配置文件。由于 ConfigMap 不存储敏感信息,因此 ConfigMap 可以自动更新,不需要在更新后重启其容器(其他类型的密文大多需要手动更新和重启容器后才能生效)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md
index ec0686f4a1e..2c9be4b41c9 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md
@@ -1,6 +1,5 @@
---
title: Services
-weight: 3045
---
Deployment、StatefulSet 和 Daemonset 会管理 Pod 配置,而 Service 使用选择器将流量引导到 Pod。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md
index ee0d68f244c..1c4c314708d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md
@@ -1,7 +1,6 @@
---
title: 加密 HTTP 通信
description: 了解如何添加 SSL 证书或 TLS 证书
-weight: 3060
---
在 Rancher/Kubernetes 中创建 Ingress 时,你必须提供包含 TLS 私钥和证书的密文,用于加密和解密通过 Ingress 的通信。你可以通过将证书添加到 Ingress Deployment 来让 Ingress 使用证书。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md
index 5b905b78322..6db5977ae42 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md
@@ -1,6 +1,5 @@
---
title: Horizontal Pod Autoscaler 介绍
-weight: 3027
---
[Horizontal Pod Autoscaler(HPA)](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)是一项 Kubernetes 功能,用于将集群配置为自动扩缩其运行的服务。本节介绍 HPA 如何与 Kubernetes 一起工作。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md
index 451f8343d44..a8ff4dd0879 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md
@@ -1,6 +1,5 @@
---
title: 使用 kubectl 管理 HPA
-weight: 3029
---
本文介绍如何使用 `kubectl` 管理 HPA。本文对以下操作进行了说明:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md
index ba146d03c68..42fbec1785a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md
@@ -1,6 +1,5 @@
---
title: 使用 Rancher UI 管理 HPA
-weight: 3028
---
Rancher UI 支持创建、管理和删除 HPA。你可以将 CPU 或内存使用情况配置为用于 HPA 扩缩的指标。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
index 40140465aed..52385fc16f5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
@@ -1,6 +1,5 @@
---
title: 使用 kubectl 测试 HPA
-weight: 3031
---
本文介绍如何在使用负载测试工具扩缩 HPA 后检查 HPA 的状态。有关使用 Rancher UI(最低版本 2.3.x)检查状态的信息,请参阅[使用 Rancher UI 管理 HPA](./manage-hpas-with-kubectl.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md
index dc692786667..8eb1156bd48 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md
@@ -1,7 +1,6 @@
---
title: Kubernetes 镜像仓库和 Docker 镜像仓库
description: 了解 Docker 镜像仓库和 Kubernetes 镜像仓库、它们的用例以及如何在 Rancher UI 中使用私有镜像仓库
-weight: 3063
---
镜像仓库是 Kubernetes 密文(Secret),包含用于向[私有 Docker 镜像仓库](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/)进行身份验证的凭证。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md
index 4ffff921ee9..7eb5ed3c448 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md
@@ -1,7 +1,6 @@
---
title: 添加 Ingress
description: 你可以为工作负载添加 Ingress,从而提供负载均衡、SSL 终止和基于主机/路径的路由。了解如何添加 Rancher Ingress
-weight: 3042
---
你可以为工作负载添加 Ingress,从而提供负载均衡、SSL 终止和基于主机/路径的路由。在项目中使用 Ingress 时,你可以通过设置全局 DNS 条目来将 Ingress 主机名编程到外部 DNS。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/ingress-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/ingress-configuration.md
index a7e99e6dd73..c0a1f3e7c0c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/ingress-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/ingress-configuration.md
@@ -1,7 +1,6 @@
---
title: Ingress 配置
description: Ingress 配置
-weight: 9999
---
### Kubernetes 1.21 中的 NGINX Ingress Controller 变更
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md
index 176f4722199..541a5f0f0a3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md
@@ -1,7 +1,6 @@
---
title: "四层和七层负载均衡"
description: "Kubernetes 支持四层负载均衡和七层负载均衡。了解对不同 deployment 的支持"
-weight: 3041
---
Kubernetes 支持四层负载均衡和七层负载均衡。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md
index f2092362a8d..b15d24e7270 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md
@@ -1,6 +1,5 @@
---
title: 密文
-weight: 3062
---
[密文(secret)](https://kubernetes.io/docs/concepts/configuration/secret/#overview-of-secrets)存储敏感数据,例如密码、令牌或密钥。它们可能包含一个或多个键值对。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
index a58267322fa..cd24e9530e6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
@@ -1,6 +1,5 @@
---
title: 添加 Sidecar
-weight: 3029
---
_sidecar_ 是一个容器,用于扩展或增强 pod 中的主容器。主容器和 Sidecar 共享一个 pod,因此共享相同的网络空间和存储。你可以使用**添加 Sidecar** 选项将 Sidecar 添加到现有工作负载。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
index 4655af98835..b7c7fdf8a5d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
@@ -1,7 +1,6 @@
---
title: 部署工作负载
description: 阅读此步骤指南以部署工作负载。部署工作负载以在一个或多个容器中运行应用程序。
-weight: 3026
---
部署工作负载以在一个或多个容器中运行应用程序。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md
index 4c634aa5863..c12dfdd469a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md
@@ -1,6 +1,5 @@
---
title: 回滚工作负载
-weight: 3027
---
在调试或升级不顺利时,你可能需要将应用程序回滚到先前的版本。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
index 73899f2bce6..0139f80915e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
@@ -1,6 +1,5 @@
---
title: 升级工作负载
-weight: 3028
---
如果 Docker Hub 发布新版本的应用程序镜像,你可以将运行旧版应用程序的工作负载升级到新版本。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/horizontal-pod-autoscaler.md b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/horizontal-pod-autoscaler.md
index 04791df49f4..84e42dedafd 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/horizontal-pod-autoscaler.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/horizontal-pod-autoscaler.md
@@ -1,7 +1,6 @@
---
title: Horizontal Pod Autoscaler
description: 了解 Pod 水平自动扩缩 (HPA)。如何管理 HPA 以及如何使用服务部署来进行测试
-weight: 3026
---
[Horizontal Pod Autoscaler(HPA)](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)是一项 Kubernetes 功能,用于将集群配置为自动扩缩其运行的服务。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/hpa-background/hpa-background.md b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/hpa-background/hpa-background.md
index 5b905b78322..6db5977ae42 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/hpa-background/hpa-background.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/hpa-background/hpa-background.md
@@ -1,6 +1,5 @@
---
title: Horizontal Pod Autoscaler 介绍
-weight: 3027
---
[Horizontal Pod Autoscaler(HPA)](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)是一项 Kubernetes 功能,用于将集群配置为自动扩缩其运行的服务。本节介绍 HPA 如何与 Kubernetes 一起工作。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl/manage-hpa-with-kubectl.md b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl/manage-hpa-with-kubectl.md
index a6fe5db9293..daf7fe82599 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl/manage-hpa-with-kubectl.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl/manage-hpa-with-kubectl.md
@@ -1,6 +1,5 @@
---
title: 使用 kubectl 管理 HPA
-weight: 3029
---
本文介绍如何使用 `kubectl` 管理 HPA。本文对以下操作进行了说明:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-rancher-ui/manage-hpa-with-rancher-ui.md b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-rancher-ui/manage-hpa-with-rancher-ui.md
index a8c8537a902..9ef4841e3f7 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-rancher-ui/manage-hpa-with-rancher-ui.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-rancher-ui/manage-hpa-with-rancher-ui.md
@@ -1,6 +1,5 @@
---
title: 使用 Rancher UI 管理 HPA
-weight: 3028
---
Rancher UI 支持创建、管理和删除 HPA。你可以将 CPU 或内存使用情况配置为用于 HPA 扩缩的指标。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/testing-hpa/testing-hpa.md b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/testing-hpa/testing-hpa.md
index 0e79ce92b6d..10cbd1bdf14 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/testing-hpa/testing-hpa.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/testing-hpa/testing-hpa.md
@@ -1,6 +1,5 @@
---
title: 使用 kubectl 测试 HPA
-weight: 3031
---
本文介绍如何在使用负载测试工具扩缩 HPA 后检查 HPA 的状态。有关使用 Rancher UI(最低版本 2.3.x)检查状态的信息,请参阅[使用 Rancher UI 管理 HPA](k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl/)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-authentication.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-authentication.md
index 1816664ad00..3881404b5ec 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-authentication.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-authentication.md
@@ -1,6 +1,5 @@
---
title: 身份验证
-weight: 10
---
Rancher 向 Kubernetes 添加的关键功能之一,就是集中式用户身份验证。此功能允许你的用户使用一组凭证对你的所有 Kubernetes 集群进行身份验证。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-provisioning-drivers.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-provisioning-drivers.md
index bcb5b4f3696..a263147c26d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-provisioning-drivers.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-provisioning-drivers.md
@@ -1,6 +1,5 @@
---
title: 配置驱动
-weight: 70
---
使用 Rancher 中的驱动,你可以管理可以使用哪些供应商来部署[托管的 Kubernetes 集群](set-up-clusters-from-hosted-kubernetes-providers.md)或[云服务器节点](use-new-nodes-in-an-infra-provider.md),以允许 Rancher 部署和管理 Kubernetes。
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 1a57316beab..d5df2141850 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
@@ -1,6 +1,5 @@
---
title: RKE 模板
-weight: 80
---
RKE 模板旨在让 DevOps 和安全团队标准化和简化 Kubernetes 集群创建的流程。
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 8e5ce3b3673..c395bbe1596 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
@@ -1,6 +1,5 @@
---
title: API
-weight: 24
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/access-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/access-clusters.md
index a70075a139b..1c0757a7d4d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/access-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/access-clusters.md
@@ -1,6 +1,5 @@
---
title: 集群访问
-weight: 1
---
本节介绍可以用来访问 Rancher 管理的集群的工具。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/advanced-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/advanced-configuration.md
index 33a3bebe019..cf942d3dac5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/advanced-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/advanced-configuration.md
@@ -1,6 +1,5 @@
---
title: 高级配置
-weight: 500
---
### Alertmanager
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/advanced-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/advanced-options.md
index 144256da2fb..a613c06eb8b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/advanced-options.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/advanced-options.md
@@ -1,6 +1,5 @@
---
title: 高级配置
-weight: 1000
---
本节将介绍较不常用的用例的资源。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/air-gapped-helm-cli-install.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/air-gapped-helm-cli-install.md
index ad357178c02..df97c6c17b3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/air-gapped-helm-cli-install.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/air-gapped-helm-cli-install.md
@@ -1,6 +1,5 @@
---
title: 离线 Helm CLI 安装
-weight: 1
---
本文介绍如何使用 Helm CLI 在离线环境中安装 Rancher Server。离线环境可以是 Rancher Server 离线安装、防火墙后面或代理后面。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/amazon-eks-permissions.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/amazon-eks-permissions.md
index 227d497f07b..6de98186062 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/amazon-eks-permissions.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/amazon-eks-permissions.md
@@ -1,7 +1,5 @@
---
title: 创建 EKS 集群
-shortTitle: Amazon EKS
-weight: 2110
---
Amazon EKS 为 Kubernetes 集群提供托管的 controlplane。Amazon EKS 跨多个可用区运行 Kubernetes controlplane 实例,以确保高可用性。Rancher 提供了一个直观的用户界面,用于管理和部署你运行在 Amazon EKS 中的 Kubernetes 集群。通过本指南,你将使用 Rancher 在你的 AWS 账户中快速轻松地启动 Amazon EKS Kubernetes 集群。有关 Amazon EKS 的更多信息,请参阅此[文档](https://docs.aws.amazon.com/eks/latest/userguide/what-is-eks.html)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/authentication-permissions-and-global-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/authentication-permissions-and-global-configuration.md
index 4648f68db86..bbd507eb910 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/authentication-permissions-and-global-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/authentication-permissions-and-global-configuration.md
@@ -1,6 +1,5 @@
---
title: 身份验证、权限和全局配置
-weight: 6
---
安装完成后,[系统管理员](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)需要配置 Rancher 来配置身份验证,安全,默认设定,安全策略,驱动和全局 DNS 条目。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/aws-cloud-marketplace.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/aws-cloud-marketplace.md
index cda6ad282e9..6b8b0aae19a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/aws-cloud-marketplace.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/aws-cloud-marketplace.md
@@ -1,6 +1,5 @@
---
title: AWS Marketplace 集成
-weight: 1
---
# 概述
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/backup-restore-and-disaster-recovery.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/backup-restore-and-disaster-recovery.md
index d8d9ba1d6ac..23994671eb6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/backup-restore-and-disaster-recovery.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/backup-restore-and-disaster-recovery.md
@@ -1,6 +1,5 @@
---
title: 备份和灾难恢复
-weight: 5
---
在本节中,你将学习如何创建 Rancher 的备份,如何从备份中恢复 Rancher,以及如何将 Rancher 迁移到新的 Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/backup-restore-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/backup-restore-configuration.md
index 25c7cd48f51..b016cbe2f97 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/backup-restore-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/backup-restore-configuration.md
@@ -1,7 +1,5 @@
---
title: Rancher 备份配置参考
-shortTitle: 配置
-weight: 4
---
- [备份配置](../reference-guides/backup-restore-configuration/backup-configuration.md)
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/best-practices.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/best-practices.md
index 6af69309037..8c7c1fd9d07 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/best-practices.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/best-practices.md
@@ -1,6 +1,5 @@
---
title: 最佳实践
-weight: 4
---
本节介绍 Rancher 实现的最佳实践,其中包括对 Kubernetes、Docker、容器等技术的使用建议。最佳实践旨在利用 Rancher 及其客户的运营经验,助你更好地实现 Rancher。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/checklist-for-production-ready-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/checklist-for-production-ready-clusters.md
index 7baa119417c..5c925f124ed 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/checklist-for-production-ready-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/checklist-for-production-ready-clusters.md
@@ -1,6 +1,5 @@
---
title: 生产就绪集群检查清单
-weight: 2
---
本节将介绍创建生产就绪型 Kubernetes 集群的最佳实践。这个集群可用于运行你的应用和服务。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cis-scans.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cis-scans.md
index 86e5c5e64bd..9460440d625 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cis-scans.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cis-scans.md
@@ -1,6 +1,5 @@
---
title: CIS 扫描
-weight: 17
---
Rancher 可以通过运行安全扫描来检查 Kubernetes 是否按照 CIS Kubernetes Benchmark 中定义的安全最佳实践进行部署。CIS 扫描可以运行在任何 Kubernetes 集群,包括托管的 Kubernetes,例如 EKS、AKS 和 GKE。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cloud-marketplace.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cloud-marketplace.md
index 5313188028b..b42750416fe 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cloud-marketplace.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cloud-marketplace.md
@@ -1,6 +1,5 @@
---
title: 云市场集成
-weight: 6
---
Rancher 提供与云市场的集成,让你能轻松购买云提供商上的安装支持。此外,该集成还支持生成 supportconfig bundle,你可以将该 bundle 提供给 Rancher。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cluster-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cluster-configuration.md
index 1a06704a31a..ca40369352c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cluster-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cluster-configuration.md
@@ -1,6 +1,5 @@
---
title: 集群配置
-weight: 2025
---
使用 Rancher 配置 Kubernetes 集群后,你仍然可以编辑集群的选项和设置。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configuration-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configuration-options.md
index fb6e61cea95..7ad7a01034a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configuration-options.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configuration-options.md
@@ -1,6 +1,5 @@
---
title: 配置选项
-weight: 3
---
### Egress 支持
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
index 0d8f2826a29..aba0270cad8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
@@ -1,6 +1,5 @@
---
title: 配置 Microsoft AD FS (SAML)
-weight: 1205
---
如果你的组织使用 Microsoft 联合身份验证服务 (AD FS) 进行用户身份验证,你可以通过配置 Rancher 来允许用户使用 AD FS 凭证登录。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-openldap.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-openldap.md
index 0cbbda08bf9..acea674859b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-openldap.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-openldap.md
@@ -1,6 +1,5 @@
---
title: 配置 OpenLDAP
-weight: 1113
---
如果你的组织使用 LDAP 进行用户身份验证,则可以配置 Rancher 与 OpenLDAP 服务器通信,从而对用户进行身份验证。这使 Rancher 管理员可以对外部用户系统中的用户和组进行集群和项目的访问控制,同时允许最终用户在登录 Rancher UI 时使用 LDAP 凭证进行身份验证。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-shibboleth-saml.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-shibboleth-saml.md
index 67151f1a670..0502caa81c1 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-shibboleth-saml.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-shibboleth-saml.md
@@ -1,6 +1,5 @@
---
title: 配置 Shibboleth (SAML)
-weight: 1210
---
如果你的组织使用 Shibboleth Identity Provider (IdP)) 进行用户身份验证,你可以通过配置 Rancher 来允许用户使用 Shibboleth 凭证登录。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/create-kubernetes-persistent-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/create-kubernetes-persistent-storage.md
index 59b4c31cdda..376ce1eef3c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/create-kubernetes-persistent-storage.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/create-kubernetes-persistent-storage.md
@@ -1,7 +1,6 @@
---
title: "Kubernetes 持久存储:卷和存储类"
description: "了解在 Kubernetes 中创建持久存储的两种方式:持久卷和存储类"
-weight: 2031
---
在部署需要保留数据的应用时,你需要创建持久存储。持久存储允许你在运行应用的 pod 之外存储应用数据。即使运行应用的 pod 发生故障,这种存储方式也能让你保留应用数据。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/custom-resource-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/custom-resource-configuration.md
index 85e06fc2c90..cb82f6284a9 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/custom-resource-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/custom-resource-configuration.md
@@ -1,6 +1,5 @@
---
title: 自定义资源配置
-weight: 5
---
以下自定义资源定义(Custom Resource Definition,CRD)用于配置 Logging:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/deploy-apps-across-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/deploy-apps-across-clusters.md
index e5e0a00df5d..835dd4b854c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/deploy-apps-across-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/deploy-apps-across-clusters.md
@@ -1,6 +1,5 @@
---
title: 跨集群部署应用
-weight: 12
---
### Fleet
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/deploy-rancher-manager.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/deploy-rancher-manager.md
index 32e537eee98..67e7c60b70c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/deploy-rancher-manager.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/deploy-rancher-manager.md
@@ -1,6 +1,5 @@
---
title: 部署 Rancher Server
-weight: 100
---
你可使用以下指南之一,在你选择的提供商中部署和配置 Rancher 和 Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/deploy-rancher-workloads.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/deploy-rancher-workloads.md
index 6750c06ed2a..01d72560dde 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/deploy-rancher-workloads.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/deploy-rancher-workloads.md
@@ -1,6 +1,5 @@
---
title: 部署工作负载
-weight: 200
---
这些指南指导你完成一个应用的部署,包括如何将应用暴露在集群之外使用。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/enable-experimental-features.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/enable-experimental-features.md
index ded10bb0ec4..a829e28fc8f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/enable-experimental-features.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/enable-experimental-features.md
@@ -1,6 +1,5 @@
---
title: 启用实验功能
-weight: 17
---
Rancher 包含一些默认关闭的实验功能。在某些情况下,例如当你认为使用[不支持的存储类型](../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md)的好处大于使用未经测试的功能的风险时,你可能想要启用实验功能。为了让你能够试用这些默认关闭的功能,我们引入了功能开关(feature flag)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/gke-cluster-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/gke-cluster-configuration.md
index 0c2a9cb12dd..9d8f3861c77 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/gke-cluster-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/gke-cluster-configuration.md
@@ -1,7 +1,5 @@
---
title: GKE 集群配置参考
-shortTitle: GKE 集群配置
-weight: 3
---
## Rancher 2.6 变更
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/helm-charts-in-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/helm-charts-in-rancher.md
index 0e1e53149c2..5a356f3ea2e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/helm-charts-in-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/helm-charts-in-rancher.md
@@ -1,6 +1,5 @@
---
title: Rancher 中的 Helm Chart
-weight: 11
---
在本节中,你将学习如何在 Rancher 中管理 Helm Chart 仓库和应用。你可以在**应用 & 应用市场**中管理 Helm Chart 仓库。它使用类似目录的系统从仓库中导入 Chart 包,然后使用这些 Chart 来部署自定义 Helm 应用或 Rancher 工具(例如监控和 Istio)。Rancher 工具以预加载仓库的方式提供,并能部署为独立的 Helm Chart 。其他仓库只会添加到当前集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/horizontal-pod-autoscaler.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/horizontal-pod-autoscaler.md
index 90b4521b24b..eeee4305c97 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/horizontal-pod-autoscaler.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/horizontal-pod-autoscaler.md
@@ -1,7 +1,6 @@
---
title: Horizontal Pod Autoscaler
description: 了解 Pod 水平自动扩缩 (HPA)。如何管理 HPA 以及如何使用服务部署来进行测试
-weight: 3026
---
[Horizontal Pod Autoscaler(HPA)](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)是一项 Kubernetes 功能,用于将集群配置为自动扩缩其运行的服务。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/infrastructure-setup.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/infrastructure-setup.md
index a54d98cf5ac..16b3b3d4d97 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/infrastructure-setup.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/infrastructure-setup.md
@@ -1,7 +1,5 @@
---
title: Kubernetes 集群基础设施
-shortTitle: 基础设施教程
-weight: 5
---
要为具有外部数据库的高可用 K3s Kubernetes 集群设置基础设施,请参见[本页面](../how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-cluster-autoscaler.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-cluster-autoscaler.md
index bd4e74ab3a5..4b91b4743b0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-cluster-autoscaler.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-cluster-autoscaler.md
@@ -1,6 +1,5 @@
---
title: Cluster Autoscaler
-weight: 1
---
在本文中,你将学习如何使用 AWS EC2 Auto Scaling 组在 Rancher 自定义集群上安装和使用 [Kubernetes cluster-autoscaler](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
index 0e4c86c7bb2..fbf5f6f17b2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
@@ -1,7 +1,6 @@
---
title: 在 Kubernetes 集群上安装/升级 Rancher
description: 了解如何在开发和生产环境中安装 Rancher。了解单节点和高可用安装
-weight: 2
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-and-upgrade.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-and-upgrade.md
index 9bbff8682fd..e8840f47a82 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-and-upgrade.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-and-upgrade.md
@@ -1,7 +1,6 @@
---
title: 安装/升级 Rancher
description: 了解如何在开发和生产环境中安装 Rancher。了解单节点和高可用安装
-weight: 3
---
本节介绍了 Rancher 各种安装方式以及每个安装方式的优点。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-requirements.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-requirements.md
index d7b0640c8c2..da330c6a02e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-requirements.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-requirements.md
@@ -1,7 +1,6 @@
---
title: 安装要求
description: 如果 Rancher 配置在 Docker 或 Kubernetes 中运行时,了解运行 Rancher Server 的每个节点的节点要求
-weight: 1
---
本文描述了对需要安装 Rancher Server 的节点的软件、硬件和网络要求。Rancher Server 可以安装在单个节点或高可用的 Kubernetes 集群上。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio-setup-guide.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio-setup-guide.md
index 4bab3f3f944..700ccac24e5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio-setup-guide.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio-setup-guide.md
@@ -1,6 +1,5 @@
---
title: 设置指南
-weight: 2
---
本文介绍如何启用 Istio 并在你的项目中使用它。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio.md
index 601ca472e27..c66978b4772 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio.md
@@ -1,6 +1,5 @@
---
title: Istio
-weight: 14
---
[Istio](https://istio.io/) 是一种开源工具,可以让 DevOps 团队更轻松地观察、控制、排查并保护复杂的微服务网络中的流量。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-cluster-setup.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-cluster-setup.md
index cc2c873e4a3..67a402ff972 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-cluster-setup.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-cluster-setup.md
@@ -1,6 +1,5 @@
---
title: "Kubernetes 使用教程 "
-weight: 4
---
本章节介绍如何安装 Kubernetes 集群,使得 Rancher Server 可以安装在该集群上。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
index 07b250fbf47..3d2a40ac62a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
@@ -1,7 +1,6 @@
---
title: 在 Rancher 中设置 Kubernetes 集群
description: 配置 Kubernetes 集群
-weight: 7
---
Rancher 允许你通过 Rancher UI 来创建集群,从而简化了集群的创建流程。Rancher 提供了多种启动集群的选项。你可以选择最适合你的用例的选项。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-components.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-components.md
index 470e39beb73..54884654bfd 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-components.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-components.md
@@ -1,6 +1,5 @@
---
title: Kubernetes 组件
-weight: 100
---
本文列出的命令和步骤适用于 [Rancher 启动的 Kubernetes](launch-kubernetes-with-rancher.md) 集群上的核心 Kubernetes 组件。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-resources-setup.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-resources-setup.md
index 5ca2c61a3b0..c8067e478a0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-resources-setup.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-resources-setup.md
@@ -1,6 +1,5 @@
---
title: Kubernetes 资源
-weight: 18
---
你可以在 Rancher UI 中查看和操作 Kubernetes 集群中的所有自定义资源和 CRD。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/launch-kubernetes-with-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/launch-kubernetes-with-rancher.md
index 257b835b96a..f1de80ad091 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/launch-kubernetes-with-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/launch-kubernetes-with-rancher.md
@@ -1,6 +1,5 @@
---
title: 使用 Rancher 启动 Kubernetes
-weight: 4
---
Rancher 可以使用任意节点启动 Kubernetes 集群。在 Rancher 中将 Kubernetes 部署到这些节点上时,你可以选择 [Rancher Kubernetes Engine](https://rancher.com/docs/rke/latest/en/) (RKE) 或 [RKE2](https://docs.rke2.io) 发行版。Rancher 可以在任何计算机上启动 Kubernetes,包括:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/load-balancer-and-ingress-controller.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/load-balancer-and-ingress-controller.md
index 97b093fb923..e88352bc8b3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/load-balancer-and-ingress-controller.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/load-balancer-and-ingress-controller.md
@@ -1,7 +1,6 @@
---
title: 在 Rancher 中设置负载均衡器和 Ingress Controller
description: 了解如何设置负载均衡器和 Ingress Controller 以在 Rancher 中重定向服务请求,并了解负载均衡器的限制
-weight: 3040
---
在 Rancher 中,你可以通过设置负载均衡器和 Ingress Controller 来重定向服务请求。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/logging.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/logging.md
index 0c3d1084176..0d84b14401f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/logging.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/logging.md
@@ -1,9 +1,6 @@
---
title: Rancher Logging 集成
-shortTitle: Logging
description: Rancher 集成了主流的日志服务。了解集成日志服务的要求和优势,并在你的集群上启用 Logging。
-metaDescription: "Rancher 集成了主流的日志服务。了解集成日志服务的要求和优势,并在你的集群上启用 Logging。"
-weight: 15
---
现在,Rancher 的日志管理由 [Banzai Cloud Logging operator](https://banzaicloud.com/docs/one-eye/logging-operator/) 提供支持,它取代了以前的内部解决方案。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-clusters.md
index 01d557294a5..a4d6335985f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-clusters.md
@@ -1,6 +1,5 @@
---
title: 集群管理
-weight: 8
---
在 Rancher 中配置集群后,你可以开始使用强大的 Kubernetes 功能在开发、测试或生产环境中部署和扩展容器化应用。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-project-resource-quotas.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-project-resource-quotas.md
index 607c1efaa9b..2625e7d0fa6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-project-resource-quotas.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-project-resource-quotas.md
@@ -1,6 +1,5 @@
---
title: 项目资源配额
-weight: 2515
---
如果多个团队共享一个集群,某个团队可能会使用过多的可用资源,例如 CPU、内存、存储、服务、Kubernetes 对象(如 Pod 或 Secret)等。你可以应用 _资源配额_ 来防止过度消耗资源。资源配额是 Rancher 用来限制项目或命名空间可用资源的功能。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-projects.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-projects.md
index be6bdf4b397..54d6491e25b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-projects.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-projects.md
@@ -1,6 +1,5 @@
---
title: 项目管理
-weight: 9
---
_项目_ 是 Rancher 中引入的对象,可帮助你更有组织地管理 Kubernetes 集群中的命名空间。你可以使用项目创建多租户集群,这种集群允许一组用户共享相同的底层资源来创建应用,而应用之间不会相互影响。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-role-based-access-control-rbac.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-role-based-access-control-rbac.md
index 5559ffd1b05..a80737a6c1d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-role-based-access-control-rbac.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-role-based-access-control-rbac.md
@@ -1,6 +1,5 @@
---
title: RBAC
-weight: 20
---
Rancher 通过 _用户_ 进行授权管理。如[身份验证](about-authentication.md)中所述,用户可以是本地用户,也可以是外部用户。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-alerting-guides.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-alerting-guides.md
index f757e5e1aa5..6eb23261fa2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-alerting-guides.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-alerting-guides.md
@@ -1,7 +1,5 @@
---
title: Monitoring 指南
-shortTitle: 指南
-weight: 4
---
- [启用 monitoring](../how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md)
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-and-alerting.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-and-alerting.md
index 65804397ede..5d1dda8c1ab 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-and-alerting.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-and-alerting.md
@@ -1,8 +1,6 @@
---
title: 监控和告警
-shortTitle: 监控/告警
description: Prometheus 允许你查看来自不同 Rancher 和 Kubernetes 对象的指标。了解监控范围以及如何启用集群监控
-weight: 13
---
你可以使用 `rancher-monitoring` 应用,将业界领先的开源监控和告警解决方案快速部署到你的集群中。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-v2-configuration-guides.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-v2-configuration-guides.md
index f137ab076d8..53ae5734dbc 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-v2-configuration-guides.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-v2-configuration-guides.md
@@ -1,6 +1,5 @@
---
title: 配置
-weight: 5
---
本文介绍在 Rancher UI 中配置 Monitoring V2 的一些最重要选项。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/nutanix.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/nutanix.md
index 00867300e35..6eed7214d09 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/nutanix.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/nutanix.md
@@ -1,9 +1,6 @@
---
title: 创建 Nutanix AOS 集群
-shortTitle: Nutanix
description: 使用 Rancher 创建 Nutanix AOS (AHV) 集群。集群可能包括具有不同属性的 VM 组,这些属性可用于细粒度控制节点的大小。
-metaDescription: 使用 Rancher 创建 Nutanix AOS (AHV) 集群。集群可能包括具有不同属性的 VM 组,这些属性可用于细粒度控制节点的大小。
-weight: 2225
---
[Nutanix Acropolis 操作系统](https://www.nutanix.com/products/acropolis) (Nutanix AOS) 是适用于 Nutanix 超融合基础架构平台的操作系统。AOS 带有一个名为 [Acropolis Hypervisor(AHV)](https://www.nutanix.com/products/ahv)的内置虚拟机监控程序。你可以结合使用 Rancher 与 Nutanix AOS (AHV),从而在本地体验云环境的操作。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/other-installation-methods.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/other-installation-methods.md
index bfedad1bece..f56c0cbb179 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/other-installation-methods.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/other-installation-methods.md
@@ -1,6 +1,5 @@
---
title: 其他安装方式
-weight: 3
---
### 离线安装
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/pipelines.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/pipelines.md
index 315c42dee08..d795a4669ab 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/pipelines.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/pipelines.md
@@ -1,6 +1,5 @@
---
title: 流水线
-weight: 10
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/prometheus-federator.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/prometheus-federator.md
index f35a6d2fe7c..282d5b8c809 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/prometheus-federator.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/prometheus-federator.md
@@ -1,6 +1,5 @@
---
title: Prometheus Federator
-weight: 7
---
Prometheus Federator(也称为 Project Monitoring V2)基于 [rancher/helm-project-operator](https://github.com/rancher/helm-project-operator) 部署一个 Helm Project Operator。该 Operator 管理 Helm Chart 的部署,每个 Operator 都包含一个 Project Monitoring Stack,而每个堆栈都包含:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/provisioning-storage-examples.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/provisioning-storage-examples.md
index 86042e508e3..1270c62f02f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/provisioning-storage-examples.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/provisioning-storage-examples.md
@@ -1,6 +1,5 @@
---
title: 配置存储示例
-weight: 3053
---
Rancher 通过各种卷插件来支持持久存储。但是,在使用这些插件将持久存储绑定到工作负载之前,无论是使用云解决方案还是你自己管理的本地解决方案,你都必须先配置存储本身。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/quick-start-guides.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/quick-start-guides.md
index e7190ca9855..fd0013e0777 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/quick-start-guides.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/quick-start-guides.md
@@ -1,11 +1,7 @@
---
title: Rancher 部署快速入门指南
-metaDescription: 快速开始 Rancher 部署和测试。本章节包含 Rancher 的简单设置和一些常见用例的说明。
-short title: 快速开始 Rancher 部署和测试。本章节包含 Rancher 的简单设置和一些常见用例的说明。
-weight: 2
-aliases:
- - /rancher/v2.x/en/quick-start-guide/
---
+
:::caution
本章节中提供的指南,旨在帮助你快速启动一个用于 Rancher 的沙盒,以评估 Rancher 是否能满足你的使用需求。快速入门指南不适用于生产环境。如果你需要获取生产环境的操作指导,请参见[安装](installation-and-upgrade.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-behind-an-http-proxy.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-behind-an-http-proxy.md
index fd2d938cb3a..bc8d53c692f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-behind-an-http-proxy.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-behind-an-http-proxy.md
@@ -1,6 +1,5 @@
---
title: 使用 HTTP 代理安装 Rancher
-weight: 4
---
很多企业本地运行的服务器或虚拟机不能直接访问互联网,但是出于安全考虑,他们必须通过 HTTP(S) 代理连接到外部服务。本教程将分步介绍如何在这样的环境中进行高可用的 Rancher 安装。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-managed-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-managed-clusters.md
index bef122dad11..15d2194487a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-managed-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-managed-clusters.md
@@ -1,7 +1,5 @@
---
title: Rancher 管理集群的最佳实践
-shortTitle: Rancher 管理的集群
-weight: 2
---
### Logging
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-manager-architecture.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-manager-architecture.md
index e52f863d76a..ec62aa6ba0c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-manager-architecture.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-manager-architecture.md
@@ -1,6 +1,5 @@
---
title: 架构
-weight: 1
---
本章节重点介绍 [Rancher Server 及其组件](../reference-guides/rancher-manager-architecture/rancher-server-and-components.md) 以及 [Rancher 如何与下游 Kubernetes 集群通信](../reference-guides/rancher-manager-architecture/communicating-with-downstream-user-clusters.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-on-a-single-node-with-docker.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
index 9342995c2b2..cb07323f3d0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
@@ -1,7 +1,6 @@
---
title: 使用 Docker 将 Rancher 安装到单个节点中
description: 在开发和测试环境中,你可以使用 Docker 安装。在单个 Linux 主机上安装 Docker,然后使用一个 Docker 容器部署 Rancher。
-weight: 2
---
Rancher 可以通过运行单个 Docker 容器进行安装。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-security.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-security.md
index 43a072e8ba9..fd22e649867 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-security.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-security.md
@@ -1,8 +1,5 @@
---
title: 安全
-weight: 20
-aliases:
- - /rancher/v2.x/en/security/
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-server.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-server.md
index 997d7475344..0d632b6def6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-server.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-server.md
@@ -1,7 +1,5 @@
---
title: Rancher Server 的最佳实践
-shortTitle: Rancher Server
-weight: 1
---
本指南介绍了让 Rancher 管理下游 Kubernetes 集群的 Rancher Server 运行建议。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-v2.6-hardening-guides.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-v2.6-hardening-guides.md
index c75ca6808a6..f3e06ee52f4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-v2.6-hardening-guides.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-v2.6-hardening-guides.md
@@ -1,13 +1,5 @@
---
title: Rancher 2.6 的自我评估和强化指南
-shortTitle: Rancher 2.6 强化指南
-weight: 1
-aliases:
- - /rancher/v2.6/en/security/rancher-2.5/
- - /rancher/v2.6/en/security/rancher-2.5/1.5-hardening-2.5/
- - /rancher/v2.6/en/security/rancher-2.5/1.5-benchmark-2.5/
- - /rancher/v2.6/en/security/rancher-2.5/1.6-hardening-2.5/
- - /rancher/v2.6/en/security/rancher-2.5/1.6-benchmark-2.5/
---
Rancher 为每个受支持的 Rancher Kubernetes 发行版提供了对应的安全强化指南。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/resources.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/resources.md
index f837886e1ca..0eb6739e463 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/resources.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/resources.md
@@ -1,6 +1,5 @@
---
title: 资源
-weight: 5
---
### Docker 安装
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/selinux-rpm.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/selinux-rpm.md
index a6fcb83902f..6dd562f95e4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/selinux-rpm.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/selinux-rpm.md
@@ -1,6 +1,5 @@
---
title: SELinux RPM
-weight: 4
---
[安全增强型 Linux (SELinux)](https://en.wikipedia.org/wiki/Security-Enhanced_Linux) 是对 Linux 的安全增强。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/set-up-cloud-providers.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/set-up-cloud-providers.md
index 8fd18116029..5aaaa15df8e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/set-up-cloud-providers.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/set-up-cloud-providers.md
@@ -1,6 +1,5 @@
---
title: 设置 Cloud Provider
-weight: 2300
---
_cloud provider_ 是 Kubernetes 中的一个模块,它提供了一个用于管理节点、负载均衡器和网络路由的接口。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md
index db1f73204f8..3ea832bf5c0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md
@@ -1,6 +1,5 @@
---
title: 通过托管 Kubernetes 提供商设置集群
-weight: 3
---
在这种情况下,Rancher 不会配置 Kubernetes,因为它是由 Google Kubernetes Engine (GKE)、Amazon Elastic Container Service for Kubernetes 或 Azure Kubernetes Service 等提供商安装的。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-existing-nodes.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-existing-nodes.md
index f0c05169f3b..e6055ae6934 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-existing-nodes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-existing-nodes.md
@@ -1,8 +1,6 @@
---
title: 在现有自定义节点上启动 Kubernetes
description: 要创建具有自定义节点的集群,你需要访问集群中的服务器,并根据 Rancher 的要求配置服务器。
-metaDescription: "要创建具有自定义节点的集群,你需要访问集群中的服务器,并根据 Rancher 的要求配置服务器。"
-weight: 2225
---
创建自定义集群时,Rancher 使用 RKE(Rancher Kubernetes Engine)在本地裸机服务器、本地虚拟机或云服务器节点中创建 Kubernetes 集群。
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 05ce4cc5559..a9133d78053 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
@@ -1,6 +1,5 @@
---
title: 在云厂商的新节点上启动 Kubernetes
-weight: 2205
---
在 Rancher 中使用节点模板来创建 RKE 或 RKE2 集群时,每个生成的节点池都会显示在新的**主机池**选项卡中。你可以通过执行以下操作来查看主机池:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-windows-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-windows-clusters.md
index 2470a900b37..2ff3b0b6dce 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-windows-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-windows-clusters.md
@@ -1,6 +1,5 @@
---
title: 在 Windows 集群上启动 Kubernetes
-weight: 2240
---
使用 Rancher 配置[自定义集群](use-existing-nodes.md)时,Rancher 通过 RKE(Rancher Kubernetes Engine)在现有节点上安装 Kubernetes。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/user-settings.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/user-settings.md
index 74df9618997..ca3aa1f18df 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/user-settings.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/user-settings.md
@@ -1,6 +1,5 @@
---
title: 用户设置
-weight: 23
---
在 Rancher 中,每个用户都有很多与登录相关的设置,例如个人偏好、API 密钥等。你可以从**用户设置**菜单中配置这些设置。你可以单击主菜单中的头像来打开此菜单。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere-cloud-provider.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere-cloud-provider.md
index e1bbf035db3..2924737967c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere-cloud-provider.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere-cloud-provider.md
@@ -1,6 +1,5 @@
---
title: 设置 vSphere 云提供商
-weight: 4
---
在本节中,你将了解如何在 vSphere 中为 Rancher 管理的 RKE Kubernetes 集群设置 vSphere 云提供商。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere.md
index 119fb70c02c..98c8357b304 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere.md
@@ -1,9 +1,6 @@
---
title: 创建 vSphere 集群
-shortTitle: vSphere
description: 使用 Rancher 创建 vSphere 集群。集群可能包括具有不同属性的 VM 组,这些属性可用于细粒度控制节点的大小。
-metaDescription: 使用 Rancher 创建 vSphere 集群。集群可能包括具有不同属性的 VM 组,这些属性可用于细粒度控制节点的大小。
-weight: 2225
---
import YouTube from '@site/src/components/YouTube'
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/workloads-and-pods.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/workloads-and-pods.md
index 9a3c795f1b9..d2f6bba4258 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/workloads-and-pods.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/workloads-and-pods.md
@@ -1,7 +1,6 @@
---
title: "Kubernetes 工作负载和 Pod"
description: "了解在 Kubernetes 中构建复杂容器化应用程序的两种结构:Kubernetes 工作负载和 Pod"
-weight: 3025
---
你可以使用两种基本结构(pod 和工作负载)在 Kubernetes 中构建复杂的容器化应用程序。构建应用程序后,你可以使用第三种结构(service)在集群中或互联网上公开应用程序。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/rancher-manager.md b/i18n/zh/docusaurus-plugin-content-docs/current/rancher-manager.md
index 4c03f72efb8..e7d453c593f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/rancher-manager.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/rancher-manager.md
@@ -1,15 +1,7 @@
---
slug: /
-weight: 1
title: "Rancher 2.6"
-shortTitle: "Rancher 2.6(最新)"
description: "Rancher 在 Kubernetes 之上添加了新的功能,让你一站式管理上百个集群,统一 RBAC,开启监控和告警。了解更多。"
-metaTitle: "Rancher 2.6 文档:了解新功能"
-metaDescription: "Rancher 2 在 Kubernetes 之上添加了新的功能,让你一站式管理上百个集群,统一 RBAC,开启监控和告警。了解更多。"
-insertOneSix: false
-ctaBanner: 0
-aliases:
- - /rancher/v2.x/en/
---
Rancher 是一个 Kubernetes 管理工具,让你能在任何地方和任何提供商上部署和运行集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/about-the-api/api-tokens.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/about-the-api/api-tokens.md
index 9880d81d147..294faf111ab 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/about-the-api/api-tokens.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/about-the-api/api-tokens.md
@@ -1,6 +1,5 @@
---
title: API 令牌
-weight: 1
---
默认情况下,某些集群级别的 API 令牌是使用无限期 TTL(`ttl=0`)生成的。换言之,除非你让令牌失效,否则 `ttl=0` 的 API 令牌永远不会过期。令牌不会因为更改密码而失效。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/amazon-eks-permissions/minimum-eks-permissions.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/amazon-eks-permissions/minimum-eks-permissions.md
index 98e36753378..f2a503dcced 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/amazon-eks-permissions/minimum-eks-permissions.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/amazon-eks-permissions/minimum-eks-permissions.md
@@ -1,6 +1,5 @@
---
title: 最小 EKS 权限
-weight: 1
---
此处提供在 Rancher 中使用 EKS 驱动所有功能所需的最小权限。Rancher 需要额外的权限来配置`服务角色`和 `VPC` 资源。你可以选择在创建集群**之前**创建这些资源,以便在定义集群配置时选择这些资源。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/backup-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/backup-configuration.md
index 8c2bfbaf6b8..e4971a9ff48 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/backup-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/backup-configuration.md
@@ -1,7 +1,5 @@
---
title: 备份配置
-shortTitle: 备份
-weight: 1
---
你可以在备份创建页面配置调度,启用加密,并指定备份的存储位置。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/examples.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/examples.md
index 24d300cc163..5f568aa1b1a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/examples.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/examples.md
@@ -1,6 +1,5 @@
---
title: 示例
-weight: 5
---
本节包含 Backup 和 Restore 自定义资源的示例。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/restore-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/restore-configuration.md
index e446c61cf06..5931f1f82d8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/restore-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/restore-configuration.md
@@ -1,7 +1,5 @@
---
title: 还原配置
-shortTitle: 还原
-weight: 2
---
你可以在还原创建页面提供还原备份的详细信息。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/storage-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/storage-configuration.md
index ddd0b0b71b7..7c39c78286c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/storage-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/storage-configuration.md
@@ -1,7 +1,5 @@
---
title: 备份存储位置配置
-shortTitle: 存储
-weight: 3
---
配置一个用于保存所有备份的默认存储位置。你可以选择对每个备份进行覆盖,但仅限于使用 S3 对象存储。
@@ -35,7 +33,7 @@ weight: 3
:::note 重要提示:
-强烈建议使用回收策略为 "Retain" 的 StorageClass。否则,如果 `rancher-backup` Chart 创建的 PVC 在应用升级期间或意外被删除后,PV 也会被删除,也就是说所有保存在其中的备份都会被删除。
+强烈建议使用回收策略为 "Retain" 的 StorageClass。否则,如果 `rancher-backup` Chart 创建的 PVC 在应用升级期间或意外被删除后,PV 也会被删除,也就是说所有保存在其中的备份都会被删除。
如果没有这样的 StorageClass,则在设置 PV 之后,一定要将它的回收策略设置为 "Retain",然后再将备份存储在其中。
:::
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md
index 9be47e82426..49e3d5e7345 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md
@@ -1,6 +1,5 @@
---
title: Logging 最佳实践
-weight: 1
---
本指南介绍了集群级别日志和应用日志的最佳实践。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/monitoring-best-practices.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/monitoring-best-practices.md
index ac43a70dd22..7aced6c29e0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/monitoring-best-practices.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/monitoring-best-practices.md
@@ -1,6 +1,5 @@
---
title: 监控最佳实践
-weight: 2
---
配置合理的监控和告警规则对于安全、可靠地运行生产环境中的工作负载至关重要。在使用 Kubernetes 和 Rancher 时也是如此。幸运的是,你可以使用集成的监控和告警功能来简化整个过程。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/rancher-managed-clusters-in-vsphere.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/rancher-managed-clusters-in-vsphere.md
index 4645d90b4f2..983541f1ebd 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/rancher-managed-clusters-in-vsphere.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/rancher-managed-clusters-in-vsphere.md
@@ -1,6 +1,5 @@
---
title: Rancher 管理 vSphere 集群的最佳实践
-shortTitle: Rancher 在 vSphere 托管的集群
---
本指南概述了在 vSphere 环境中配置下游 Rancher 集群的参考架构,以及 VMware 记录的标准 vSphere 最佳实践。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/tips-to-set-up-containers.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/tips-to-set-up-containers.md
index e2632314654..d48c0cf2af2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/tips-to-set-up-containers.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/tips-to-set-up-containers.md
@@ -1,6 +1,5 @@
---
title: 设置容器的技巧
-weight: 100
---
配置良好的容器可以极大地提高环境的整体性能和安全性。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/on-premises-rancher-in-vsphere.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/on-premises-rancher-in-vsphere.md
index 377dbbae4e7..d08d7c10b8c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/on-premises-rancher-in-vsphere.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/on-premises-rancher-in-vsphere.md
@@ -1,7 +1,5 @@
---
title: 在 vSphere 环境中安装 Rancher
-shortTitle: vSphere 环境中的 Rancher
-weight: 3
---
本指南概述了在 vSphere 环境中在 RKE Kubernetes 集群上安装 Rancher 的参考架构,以及 VMware 记录的标准 vSphere 最佳实践。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/rancher-deployment-strategy.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/rancher-deployment-strategy.md
index ab97b704cf7..a141627265c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/rancher-deployment-strategy.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/rancher-deployment-strategy.md
@@ -1,6 +1,5 @@
---
title: Rancher 部署策略
-weight: 100
---
本文提供 Rancher Server 的两种部署策略,用于管理下游 Kubernetes 集群。每种策略都有优缺点。请按照你的实际情况选择最适合的部署策略:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/tips-for-running-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/tips-for-running-rancher.md
index 537652dfde0..0c47b75fa06 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/tips-for-running-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/tips-for-running-rancher.md
@@ -1,6 +1,5 @@
---
title: Rancher 运行技巧
-weight: 100
---
本指南适用于使用 Rancher 管理下游 Kubernetes 集群的用例。高可用设置可以防止 Rancher Server 不可用时无法访问下游集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cli-with-rancher/rancher-cli.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cli-with-rancher/rancher-cli.md
index a7a23da2b1d..622cebe360c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cli-with-rancher/rancher-cli.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cli-with-rancher/rancher-cli.md
@@ -1,7 +1,6 @@
---
title: Rancher CLI
description: Rancher CLI 是一个命令行工具,用于在工作站中与 Rancher 进行交互。
-weight: 21
---
Rancher CLI(命令行界面)是一个命令行工具,可用于与 Rancher 进行交互。使用此工具,你可以使用命令行而不用通过 GUI 来操作 Rancher。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/amazon-ec2.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/amazon-ec2.md
index 19945c1c3e5..98e6b500737 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/amazon-ec2.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/amazon-ec2.md
@@ -1,6 +1,5 @@
---
title: EC2 主机配置参考
-weight: 2
---
有关 EC2 和节点的更多详细信息,请参阅 [EC2 管理控制台](https://aws.amazon.com/ec2)的官方文档。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/azure.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/azure.md
index 71454c552cb..6ea2549ccf8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/azure.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/azure.md
@@ -1,6 +1,5 @@
---
title: Azure 主机配置
-weight: 2
---
有关 Azure 的更多信息,请参阅官方 [Azure 文档](https://docs.microsoft.com/en-us/azure/?product=featured)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/digitalocean.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/digitalocean.md
index e5ae02672de..7a464650614 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/digitalocean.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/digitalocean.md
@@ -1,6 +1,5 @@
---
title: DigitalOcean 主机配置
-weight: 2
---
有关 DigitalOcean、Droplet 的更多详细信息,请参阅[官方文档](https://docs.digitalocean.com/products/compute/)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
index e835bc4423b..d99eff8506b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
@@ -1,6 +1,5 @@
---
title: EC2 节点模板配置
-weight: 1
---
有关 EC2 和节点的更多详细信息,请参阅 [EC2 管理控制台](https://aws.amazon.com/ec2)的官方文档。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md
index ba005475499..7b995054096 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md
@@ -1,6 +1,5 @@
---
title: Azure 节点模板配置
-weight: 1
---
有关 Azure 的更多信息,请参阅官方 [Azure 文档](https://docs.microsoft.com/en-us/azure/?product=featured)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md
index 8df38f69c0d..3a29a7e2d82 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md
@@ -1,6 +1,5 @@
---
title: DigitalOcean 节点模板配置
-weight: 1
---
账户访问信息存储在云凭证中。云凭证存储在 Kubernetes 密文中。多个节点模板可以使用相同的云凭证。你可以使用现有的云凭证或创建新的凭证。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md
index 060db7628aa..096924cc2b3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md
@@ -1,6 +1,5 @@
---
title: Nutanix 节点模板配置
-weight: 2
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md
index fb6b8e2825d..ca900d97bd8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md
@@ -1,6 +1,5 @@
---
title: vSphere 节点模板配置
-weight: 2
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/aks-cluster-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/aks-cluster-configuration.md
index ccbddaf2d7a..a296187be6b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/aks-cluster-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/aks-cluster-configuration.md
@@ -1,7 +1,5 @@
---
-shortTitle: AKS 集群配置
title: AKS 集群配置参考
-weight: 4
---
## Rancher 2.6 变更
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/eks-cluster-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/eks-cluster-configuration.md
index 45ba8519b7a..5de68eb41ae 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/eks-cluster-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/eks-cluster-configuration.md
@@ -1,7 +1,5 @@
---
title: EKS 集群配置参考
-shortTitle: EKS 集群配置
-weight: 2
---
### 账号访问
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/gke-cluster-configuration/gke-private-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/gke-cluster-configuration/gke-private-clusters.md
index b50c96997b8..ff4638fc589 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/gke-cluster-configuration/gke-private-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/gke-cluster-configuration/gke-private-clusters.md
@@ -1,6 +1,5 @@
---
title: 私有集群
-weight: 2
---
在 GKE 中,[私有集群](https://cloud.google.com/kubernetes-engine/docs/concepts/private-cluster-concept)是一种集群,其节点仅通过分配内部 IP 地址与入站和出站流量相隔离。GKE 中的私有集群可以选择将 controlplane 端点作为公开访问的地址或作为私有地址。这与其他 Kubernetes 提供商不同,后者可能将具有私有 controlplane 端点的集群称为“私有集群”,但仍允许进出节点的流量。基于你的组织的网络和安全要求,你可能想创建一个有私有节点的集群,其中有或没有公共 controlplane 端点。从 Rancher 配置的 GKE 集群可以通过在**集群选项**中选择**私有集群**(在**显示高级选项**下)来使用隔离的节点。通过选择**启用私有端点**,可以选择将 controlplane 端点设为私有。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/k3s-cluster-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/k3s-cluster-configuration.md
index 254e3b406c4..b24c9e84093 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/k3s-cluster-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/k3s-cluster-configuration.md
@@ -1,7 +1,5 @@
---
title: K3s 集群配置参考
-shortTitle: K3s 集群配置
-weight: 6
---
本文介绍 Rancher 中可用于新的或现有的 K3s Kubernetes 集群的配置选项。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
index 535b31945ad..584a4b3473f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
@@ -1,7 +1,5 @@
---
title: RKE 集群配置参考
-shortTitle: RKE 集群配置
-weight: 1
---
Rancher 安装 Kubernetes 时,它使用 [RKE](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) 或 [RKE2](https://docs.rke2.io/) 作为 Kubernetes 发行版。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
index a3a20ce7ec0..68c9079fb7a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
@@ -1,7 +1,5 @@
---
title: RKE2 集群配置参考
-shortTitle: RKE2 集群配置
-weight: 5
---
本文介绍 Rancher 中可用于新的或现有的 RKE2 Kubernetes 集群的配置选项。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/sync-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/sync-clusters.md
index 11c31371f96..3a4138ca44d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/sync-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/sync-clusters.md
@@ -1,6 +1,5 @@
---
title: 同步
-weight: 10
---
同步是 EKS 和 GKE 集群的功能,它使 Rancher 更新集群的值,以便它们与托管在 Kubernetes 提供商中的相应集群对象保持一致。这使得 Rancher 不是托管集群状态的唯一所有者。其最大的局限性是,在同一时间或在 5 分钟内处理 Rancher 和另一个来源的更新时,可能会导致其中一个来源的状态被完全覆盖。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md
index 76a716a5dd7..5a79ab68384 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md
@@ -1,6 +1,5 @@
---
title: Rancher Agent 选项
-weight: 2500
---
Rancher 在每个节点上部署一个 Agent 来与节点通信。本文描述了可以传递给 Agent 的选项。要使用这些选项,你需要[使用自定义节点创建集群](../../../../pages-for-subheaders/use-existing-nodes.md),并在添加节点时将选项添加到生成的 `docker run` 命令。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/configure-openldap/openldap-config-reference.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/configure-openldap/openldap-config-reference.md
index 72ffd00eb31..be6f60de615 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/configure-openldap/openldap-config-reference.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/configure-openldap/openldap-config-reference.md
@@ -1,6 +1,5 @@
---
title: OpenLDAP 配置参考
-weight: 2
---
本文提供在 Rancher 中设置 OpenLDAP 身份验证的参考。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/helm-chart-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/helm-chart-options.md
index b85c3c0a830..05a5fa00d36 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/helm-chart-options.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/helm-chart-options.md
@@ -1,8 +1,5 @@
---
title: Rancher Helm Chart 选项
-weight: 1
-aliases:
- - /rancher/v2.6/en/installation/resources/chart-options
---
本文提供了 Rancher Helm Chart 的配置参考。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/tls-settings.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/tls-settings.md
index e3e2aa9df95..3459988f584 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/tls-settings.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/tls-settings.md
@@ -1,6 +1,5 @@
---
title: TLS 设置
-weight: 3
---
更改默认 TLS 设置的方法取决于它的安装方式。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/kubernetes-concepts.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/kubernetes-concepts.md
index 08035e1c117..17a1bc2b969 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/kubernetes-concepts.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/kubernetes-concepts.md
@@ -1,6 +1,5 @@
---
title: Kubernetes 概念
-weight: 4
---
本文解释了 Kubernetes 的相关概念,以便让你更好地了解 Rancher 的运行机制。本文仅对 Kubernetes 组件进行了简单的描述。如需了解更多详情,请参见 [Kubernetes 组件的官方文档](https://kubernetes.io/docs/concepts/overview/components/)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/examples.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/examples.md
index 74e7c083698..6e3b6ae65ad 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/examples.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/examples.md
@@ -1,6 +1,5 @@
---
title: 示例
-weight: 400
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/helm-chart-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/helm-chart-options.md
index 478ab6f4675..146742546ef 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/helm-chart-options.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/helm-chart-options.md
@@ -1,6 +1,5 @@
---
title: Helm Chart 选项
-weight: 8
---
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 1d64dec2941..aab015481bb 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
@@ -1,7 +1,5 @@
---
title: 接收器配置
-shortTitle: 接收器
-weight: 1
---
import Tabs from '@theme/Tabs';
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 4f769bb8849..7c41e0e15f0 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
@@ -1,7 +1,5 @@
---
title: 路由配置
-shortTitle: 路由
-weight: 5
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
index d4df82878e1..a0262b9b636 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
@@ -1,7 +1,5 @@
---
title: ServiceMonitor 和 PodMonitor 配置
-shortTitle: ServiceMonitor 和 PodMonitor
-weight: 7
---
ServiceMonitor 和 PodMonitor 都是伪 CRD,它们映射 Prometheus 自定义资源的抓取配置。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/concepts.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/concepts.md
index db7ed310634..e277e96b61e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/concepts.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/concepts.md
@@ -1,6 +1,5 @@
---
title: 概念
-weight: 1
---
本文解释与流水线相关的常见概念和术语。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/configure-persistent-data.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/configure-persistent-data.md
index 103356e13fe..2fed75b6df0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/configure-persistent-data.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/configure-persistent-data.md
@@ -1,6 +1,5 @@
---
title: 为流水线组件配置持久数据
-weight: 600
---
import Tabs from '@theme/Tabs';
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/example-repositories.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/example-repositories.md
index 72506bbfdf1..3b89bb5b69c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/example-repositories.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/example-repositories.md
@@ -1,6 +1,5 @@
---
title: 示例仓库
-weight: 500
---
Rancher 附带了几个示例仓库,你可以通过这些仓库来熟悉流水线(pipeline)。在生产环境中为你的仓库使用流水线之前,我们建议你先配置和测试与你的环境最相似的示例仓库。你可以把这个示例仓库用作沙盒来配置仓库和构建演示等。Rancher 包含以下示例仓库:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/example-yaml.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/example-yaml.md
index c0a79c21339..e46a18f9698 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/example-yaml.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/example-yaml.md
@@ -1,6 +1,5 @@
---
title: 示例 YAML 文件
-weight: 501
---
你可以通过 UI 或使用仓库中的 YAML 文件(即 `.rancher-pipeline.yml` 或 `.rancher-pipeline.yaml`)配置流水线。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/pipeline-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/pipeline-configuration.md
index c71e8d85e0a..fe6565d6475 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/pipeline-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/pipeline-configuration.md
@@ -1,6 +1,5 @@
---
title: 流水线配置参考
-weight: 1
---
在本文中,你将学习如何配置流水线。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/prometheus-federator/rbac.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/prometheus-federator/rbac.md
index 013e1778dc1..a519b5a8cbc 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/prometheus-federator/rbac.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/prometheus-federator/rbac.md
@@ -1,7 +1,5 @@
---
title: RBAC
-shortTitle: RBAC
-weight: 2
---
本文介绍 Prometheus Federator RBAC。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-cluster-tools.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-cluster-tools.md
index 7beed00180c..a77cadb2276 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-cluster-tools.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-cluster-tools.md
@@ -1,6 +1,5 @@
---
title: 集群工具:Logging,Monitoring 和可视化
-weight: 2033
---
Rancher 包含 Kubernetes 中未包含的各种工具来协助你进行 DevOps 操作。Rancher 可以与外部服务集成,让你的集群更高效地运行。工具分为以下几类:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-manager-architecture/architecture-recommendations.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-manager-architecture/architecture-recommendations.md
index 11485bb4661..ab24429cd71 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-manager-architecture/architecture-recommendations.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-manager-architecture/architecture-recommendations.md
@@ -1,6 +1,5 @@
---
title: 架构推荐
-weight: 3
---
如果你准备在单个节点上安装 Rancher,我们推荐你[分开部署 Rancher 与下游集群](#分开部署-rancher-与下游集群)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-project-tools.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-project-tools.md
index 9158e8488b6..ad05d4166e0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-project-tools.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-project-tools.md
@@ -1,6 +1,5 @@
---
title: 项目工具:Logging,Monitoring 和可视化
-weight: 2525
---
Rancher 包含 Kubernetes 中未包含的各种工具来协助你进行 DevOps 操作。Rancher 可以与外部服务集成,让你的集群更高效地运行。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/kubernetes-security-best-practices.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/kubernetes-security-best-practices.md
index 893a78dd830..af9746e899f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/kubernetes-security-best-practices.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/kubernetes-security-best-practices.md
@@ -1,6 +1,5 @@
---
title: Kubernetes 安全最佳实践
-weight: 5
---
### 限制云元数据 API 访问
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md
index 4b4673b7edb..36b80c7e030 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md
@@ -1,8 +1,5 @@
---
title: 使用 CIS 1.6 Benchmark 的 RKE 强化指南
-weight: 100
-aliases:
- - /rancher/v2.6/en/security/hardening-guides/1.6-hardening-2.6/
---
本文档提供了用于强化 RKE 集群(使用 Rancher 2.6 进行配置)生产安装的说明。此处概述了遵循 CIS 的 Kubernetes Benchmark 管控所需的配置和控制。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-self-assessment-guide-with-cis-v1.6-benchmark.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-self-assessment-guide-with-cis-v1.6-benchmark.md
index 833b0f1677f..2aaee70b263 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-self-assessment-guide-with-cis-v1.6-benchmark.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-self-assessment-guide-with-cis-v1.6-benchmark.md
@@ -1,8 +1,5 @@
---
title: RKE CIS 1.6 Benchmark - 自我评估指南 - Rancher 2.6
-weight: 101
-aliases:
- - /rancher/v2.6/en/security/hardening-guides/1.6-benchmark-2.6/
---
### RKE CIS 1.6 Kubernetes Benchmark - Rancher 2.6 与 Kubernetes 1.18 到 1.23
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-hardening-guide-with-cis-v1.6-benchmark.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-hardening-guide-with-cis-v1.6-benchmark.md
index 73da07d0373..560c06b71cb 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-hardening-guide-with-cis-v1.6-benchmark.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-hardening-guide-with-cis-v1.6-benchmark.md
@@ -1,6 +1,5 @@
---
title: 使用 CIS 1.6 Benchmark 的 RKE2 强化指南
-weight: 100
---
本文档提供了用于强化 RKE2 集群(使用 Rancher 2.6.5 进行配置)生产安装的说明。此处概述了遵循 CIS 的 Kubernetes Benchmark 管控所需的配置和控制。
@@ -316,7 +315,7 @@ spec:
profile: cis-1.6
protect-kernel-defaults: true
# - config:
-#
+#
# machineLabelSelector:
# matchExpressions:
# - key: string
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-self-assessment-guide-with-cis-v1.6-benchmark.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-self-assessment-guide-with-cis-v1.6-benchmark.md
index 2ff5d7af080..085b1cd49b3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-self-assessment-guide-with-cis-v1.6-benchmark.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke2-self-assessment-guide-with-cis-v1.6-benchmark.md
@@ -1,6 +1,5 @@
---
title: RKE2 CIS 1.6 Benchmark - 自我评估指南 - Rancher 2.6
-weight: 101
---
### CIS 1.6 Kubernetes Benchmark - Rancher 2.6 RKE2 与 Kubernetes 1.21 到 1.23
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/security-advisories-and-cves.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/security-advisories-and-cves.md
index b7c295fbaed..ee75e67cef8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/security-advisories-and-cves.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/security-advisories-and-cves.md
@@ -1,8 +1,5 @@
---
title: 安全公告和 CVE
-weight: 300
-aliases:
- - /rancher/v2.x/en/security/cve/
---
Rancher 致力于向社区披露我们产品的安全问题。我们会针对已解决的问题发布安全公告和 CVE(Common Vulnerabilities and Exposures,通用漏洞披露)。Rancher GitHub 上的[安全页面](https://github.com/rancher/rancher/security/advisories)也会发布新的安全公告。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rke1-template-example-yaml.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rke1-template-example-yaml.md
index 4c556cc93a6..b59e4ea724e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rke1-template-example-yaml.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rke1-template-example-yaml.md
@@ -1,6 +1,5 @@
---
title: RKE1 示例 YAML
-weight: 60
---
以下是一个供参考的 RKE 模板配置文件示例。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/single-node-rancher-in-docker/advanced-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/single-node-rancher-in-docker/advanced-options.md
index 15f80582a24..0635141b340 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/single-node-rancher-in-docker/advanced-options.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/single-node-rancher-in-docker/advanced-options.md
@@ -1,6 +1,5 @@
---
title: Docker 安装高级选项
-weight: 5
---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md
index 07106d65fd5..94cd67f2ac3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md
@@ -1,6 +1,5 @@
---
title: HTTP 代理配置
-weight: 251
---
如果你通过代理来操作 Rancher,并想要通过代理访问服务(例如拉取应用商店),你需要提供 Rancher 代理的信息。由于 Rancher 是用 Go 编写的,Rancher 使用如下常见的代理环境变量。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/system-tools.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/system-tools.md
index 56e75101df4..93cbf931bc3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/system-tools.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/system-tools.md
@@ -1,6 +1,5 @@
---
title: 系统工具
-weight: 22
---
:::note
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/api-keys.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/api-keys.md
index fbea65b383e..afcf9caffd3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/api-keys.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/api-keys.md
@@ -1,6 +1,5 @@
---
title: API 密钥
-weight: 7005
---
## API 密钥和用户身份验证
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-cloud-credentials.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-cloud-credentials.md
index ce0a04e3bd7..d569ae2b861 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-cloud-credentials.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-cloud-credentials.md
@@ -1,6 +1,5 @@
---
title: 管理云凭证
-weight: 7011
---
如果要创建[由基础设施提供商托管](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)的集群,则可以使用[节点模板](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点模板)来配置集群节点。这些模板使用 Docker Machine 配置选项来定义节点的操作系统镜像以及设置/参数。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-node-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-node-templates.md
index b19948e4c84..269e1b87016 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-node-templates.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-node-templates.md
@@ -1,6 +1,5 @@
---
title: 管理节点模板
-weight: 7010
---
如果要配置[由基础设施提供商托管](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)的集群,则可以使用[节点模板](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点模板)来配置集群节点。这些模板使用 Docker Machine 配置选项来定义节点的操作系统镜像以及设置/参数。你可以在两种情况下创建节点模板:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/user-preferences.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/user-preferences.md
index f6dae3cc8cb..03aa5849061 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/user-preferences.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/user-preferences.md
@@ -1,6 +1,5 @@
---
title: 用户偏好
-weight: 7012
---
每个用户都可以设置自己的偏好,从而按照自己的喜好调整 Rancher UI 界面。要更改偏好设置,请打开**用户设置**菜单,然后选择**偏好设置**。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/security/security-scan/security-scan.md b/i18n/zh/docusaurus-plugin-content-docs/current/security/security-scan/security-scan.md
index 9f1983b7f52..32cf9e17a4c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/security/security-scan/security-scan.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/security/security-scan/security-scan.md
@@ -1,6 +1,5 @@
---
title: 安全扫描
-weight: 299
---
CIS 安全扫描的文档已移至[此处](../../pages-for-subheaders/cis-scan-guides.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting.md
index f99bd413cb3..e94dc715b60 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting.md
@@ -1,6 +1,5 @@
---
title: 故障排除
-weight: 600
---
本文用于帮助你解决使用 Rancher 时遇到的问题。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md
index 0fdd57666fc..7aafae5e832 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md
@@ -1,6 +1,5 @@
---
title: Controlplane 节点故障排除
-weight: 2
---
本文适用于具有 `controlplane` 角色的节点。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md
index 0351ab0bed8..ed14034b739 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md
@@ -1,6 +1,5 @@
---
title: etcd 节点故障排除
-weight: 1
---
本文介绍了对具有 `etcd` 角色的节点进行故障排除的命令和提示。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md
index 78b711c2e9b..f86039effd5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md
@@ -1,6 +1,5 @@
---
title: nginx-proxy 故障排除
-weight: 3
---
每个没有 `controlplane` 角色的节点上都部署了 `nginx-proxy` 容器。`nginx-proxy` 基于具有 `controlplane` 角色的可用节点来动态生成 NGINX 配置,从而提供对这些 `controlplane` 角色节点的访问。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md
index a7d69b970be..180e16a1d1c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md
@@ -1,6 +1,5 @@
---
title: Worker 节点和通用组件故障排除
-weight: 4
---
本文包括了运行在所有角色节点上的组件,因此适用于每个节点。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/dns.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/dns.md
index eb0563447cf..069b16dae6a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/dns.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/dns.md
@@ -1,6 +1,5 @@
---
title: DNS
-weight: 103
---
本文列出的命令/步骤可用于检查集群中的名称解析问题。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md
index 3a420b15a54..8cb5fd34104 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md
@@ -1,6 +1,5 @@
---
title: 过期 Webhook 证书轮换
-weight: 120
---
如果你的 Rancher 版本安装了 `rancher-webhook`,某些版本创建的证书将在一年后过期。如果证书未续订,你需要轮换你的 webhook 证书。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md
index f61ad4e479b..33e7a22738d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md
@@ -1,6 +1,5 @@
---
title: Kubernetes 资源
-weight: 101
---
本文列出的命令/步骤可用于检查最重要的 Kubernetes 资源,并应用于 [Rancher 启动的 Kubernetes](../../pages-for-subheaders/launch-kubernetes-with-rancher.md) 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/logging.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/logging.md
index e68038ea7e2..a58ee8b2b82 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/logging.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/logging.md
@@ -1,6 +1,5 @@
---
title: Logging
-weight: 110
---
Rancher 使用了以下日志级别:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/networking.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/networking.md
index 6a2032d3480..47c806b0278 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/networking.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/networking.md
@@ -1,6 +1,5 @@
---
title: 网络
-weight: 102
---
本文列出的命令/步骤可用于检查集群中的网络问题。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/rancher-ha.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/rancher-ha.md
index 11050647d19..630f4f13de6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/rancher-ha.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/rancher-ha.md
@@ -1,6 +1,5 @@
---
title: Rancher HA
-weight: 104
---
本文列出的命令/步骤可用于检查你的 Rancher Kubernetes 安装。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/registered-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/registered-clusters.md
index c3fbde8f4d8..58eff6a97ed 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/registered-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/registered-clusters.md
@@ -1,6 +1,5 @@
---
title: 注册集群
-weight: 105
---
本文列出的命令/步骤可用于检查你正在注册或已在 Rancher 中注册的集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md
index 520664beb5e..a63c4c406c4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md
@@ -1,6 +1,5 @@
---
title: 审计日志中的用户 ID 跟踪
-weight: 110
---
Rancher 使用以下审计日志来跟踪本地和下游集群中发生的事件:
@@ -14,7 +13,7 @@ Rancher 2.6 增强了审计日志,在 Rancher 和下游 Kubernetes 审计日
要知道这个映射,集群管理员需要能够访问 Rancher API、UI 和 local 管理集群。
有了这个功能之后,下游集群管理员就能够查看 Kubernetes 审计日志,并且可以不在 Rancher 中查看任何内容就能知道哪个外部身份提供程序 (IDP) 用户执行了某项操作。
-如果集群传出了审计日志,日志系统的用户就能够识别外部身份提供程序中的用户。
+如果集群传出了审计日志,日志系统的用户就能够识别外部身份提供程序中的用户。
Rancher 管理员现在能够查看 Rancher 审计日志,并使用外部身份提供程序用户名来跟踪 Kubernetes 审计日志。
### 功能描述
diff --git a/versioned_docs/version-2.0-2.4/backups/backup/backup.md b/versioned_docs/version-2.0-2.4/backups/backup/backup.md
index 98597995706..417595a7326 100644
--- a/versioned_docs/version-2.0-2.4/backups/backup/backup.md
+++ b/versioned_docs/version-2.0-2.4/backups/backup/backup.md
@@ -1,15 +1,7 @@
---
title: Backup
-weight: 50
-aliases:
- - /rancher/v2.0-v2.4/en/installation/after-installation/
- - /rancher/v2.0-v2.4/en/backups/
- - /rancher/v2.0-v2.4/en/backups/backups
- - /rancher/v2.0-v2.4/en/backups/legacy/backup
- - /rancher/v2.0-v2.4/en/backups/v2.0.x-v2.4.x/backup/
- - /rancher/v2.x/en/backups/v2.0.x-v2.4.x/
- - /rancher/v2.x/en/backups/v2.0.x-v2.4.x/backup/
---
+
This section contains information about how to create backups of your Rancher data and how to restore them in a disaster scenario.
- Rancher server backups:
diff --git a/versioned_docs/version-2.0-2.4/backups/restore/restore.md b/versioned_docs/version-2.0-2.4/backups/restore/restore.md
index 98211eedc30..7467b146f48 100644
--- a/versioned_docs/version-2.0-2.4/backups/restore/restore.md
+++ b/versioned_docs/version-2.0-2.4/backups/restore/restore.md
@@ -1,12 +1,7 @@
---
title: Restore
-weight: 1010
-aliases:
- - /rancher/v2.0-v2.4/en/backups/restorations
- - /rancher/v2.0-v2.4/en/backups/legacy/restore
- - /rancher/v2.0-v2.4/en/backups/v2.0.x-v2.4.x/restore
- - /rancher/v2.x/en/backups/v2.0.x-v2.4.x/restore/
---
+
If you lose the data on your Rancher Server, you can restore it if you have backups stored in a safe location.
- [Restoring backups for Rancher installed with Docker](../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md)
diff --git a/versioned_docs/version-2.0-2.4/contribute-to-rancher.md b/versioned_docs/version-2.0-2.4/contribute-to-rancher.md
index 8c4b863b171..26132b9e985 100644
--- a/versioned_docs/version-2.0-2.4/contribute-to-rancher.md
+++ b/versioned_docs/version-2.0-2.4/contribute-to-rancher.md
@@ -1,8 +1,5 @@
---
title: Contributing to Rancher
-weight: 27
-aliases:
- - /rancher/v2.0-v2.4/en/faq/contributing/
---
This section explains the repositories used for Rancher, how to build the repositories, and what information to include when you file an issue.
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
index 67e5d801129..86585268cf8 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
@@ -1,11 +1,5 @@
---
title: Skipped and Not Applicable Tests
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/cis-scans/legacy/skipped-tests
- - /rancher/v2.0-v2.4/en/cis-scans/v2.4/skipped-tests
- - /rancher/v2.0-v2.4/en/cis-scans/skipped-tests
- - /rancher/v2.x/en/cis-scans/v2.4/skipped-tests/
---
This section lists the tests that are skipped in the permissive test profile for RKE.
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-alerts/default-alerts.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-alerts/default-alerts.md
index b107afb212b..0fa0661ea21 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-alerts/default-alerts.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-alerts/default-alerts.md
@@ -1,10 +1,5 @@
---
title: Default Alerts for Cluster Monitoring
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/alerts/default-alerts
- - /rancher/v2.0-v2.4/en/monitoring-alerting/legacy/alerts/cluster-alerts/default-alerts
- - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-alerts/default-alerts
---
When you create a cluster, some alert rules are predefined. These alerts notify you about signs that the cluster could be unhealthy. You can receive these alerts if you configure a [notifier](../notifiers.md) for them.
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/elasticsearch.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/elasticsearch.md
index 293ea184959..3a5365fe36a 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/elasticsearch.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/elasticsearch.md
@@ -1,12 +1,5 @@
---
title: Elasticsearch
-weight: 200
-aliases:
- - /rancher/v2.0-v2.4/en/tools/logging/elasticsearch/
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/logging/elasticsearch
- - /rancher/v2.0-v2.4/en/logging/legacy/cluster-logging/elasticsearch
- - /rancher/v2.0-v2.4/en/logging/v2.0.x-v2.4.x/cluster-logging/elasticsearch
- - /rancher/v2.x/en/logging/v2.0.x-v2.4.x/cluster-logging/elasticsearch/
---
If your organization uses [Elasticsearch](https://www.elastic.co/), either on premise or in the cloud, you can configure Rancher to send it Kubernetes logs. Afterwards, you can log into your Elasticsearch deployment to view logs.
@@ -43,5 +36,5 @@ If your instance of Elasticsearch uses SSL, your **Endpoint** will need to begin
1. Select whether or not you want to verify your SSL.
- * If you are using a self-signed certificate, select **Enabled - Input trusted server certificate**, provide the **CA Certificate PEM**. You can copy and paste the certificate or upload it using the **Read from a file** button.
+ * If you are using a self-signed certificate, select **Enabled - Input trusted server certificate**, provide the **CA Certificate PEM**. You can copy and paste the certificate or upload it using the **Read from a file** button.
* If you are using a certificate from a certificate authority, select **Enabled - Input trusted server certificate**. You do not need to provide a **CA Certificate PEM**.
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/fluentd.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/fluentd.md
index 200fb6c564c..a5a73629d8a 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/fluentd.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/fluentd.md
@@ -1,11 +1,5 @@
---
title: Fluentd
-weight: 600
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/logging/fluentd
- - /rancher/v2.0-v2.4/en/logging/legacy/cluster-logging/fluentd
- - /rancher/v2.0-v2.4/en/logging/v2.0.x-v2.4.x/cluster-logging/fluentd
- - /rancher/v2.x/en/logging/v2.0.x-v2.4.x/cluster-logging/fluentd/
---
If your organization uses [Fluentd](https://www.fluentd.org/), you can configure Rancher to send it Kubernetes logs. Afterwards, you can log into your Fluentd server to view logs.
@@ -36,4 +30,4 @@ After adding all the Fluentd servers, you have the option to select **Enable Gzi
If your Fluentd servers are using TLS, you need to select **Use TLS**. If you are using a self-signed certificate, provide the **CA Certificate PEM**. You can copy and paste the certificate or upload it using the **Read from a file** button.
->**Note:** Fluentd does not support self-signed certificates when client authentication is enabled.
+>**Note:** Fluentd does not support self-signed certificates when client authentication is enabled.
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/kafka.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/kafka.md
index ec15f61ea6a..bc3626c45d0 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/kafka.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/kafka.md
@@ -1,12 +1,5 @@
---
title: Kafka
-weight: 400
-aliases:
- - /rancher/v2.0-v2.4/en/tools/logging/kafka/
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/logging/kafka
- - /rancher/v2.0-v2.4/en/logging/legacy/cluster-logging/kafka
- - /rancher/v2.0-v2.4/en/logging/v2.0.x-v2.4.x/cluster-logging/kafka
- - /rancher/v2.x/en/logging/v2.0.x-v2.4.x/cluster-logging/kafka/
---
If your organization uses [Kafka](https://kafka.apache.org/), you can configure Rancher to send it Kubernetes logs. Afterwards, you can log into your Kafka server to view logs.
@@ -32,7 +25,7 @@ If your Kafka cluster is using SSL for the **Broker**, you need to complete the
1. Provide the **CA Certificate PEM**. You can either copy and paste the certificate or upload it using the **Read from a file** button.
->**Note:** Kafka does not support self-signed certificates when client authentication is enabled.
+>**Note:** Kafka does not support self-signed certificates when client authentication is enabled.
### SASL configuration
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/splunk.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/splunk.md
index ea64c24e5fa..69786265ffc 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/splunk.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/splunk.md
@@ -1,14 +1,5 @@
---
title: Splunk
-weight: 300
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/logging/splunk/
- - /rancher/v2.0-v2.4/en/tools/logging/splunk/
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/logging/splunk
- - /rancher/v2.0-v2.4/en/logging/legacy/cluster-logging/splunk
- - /rancher/v2.0-v2.4/en/logging/v2.0.x-v2.4.x/cluster-logging/splunk
- - /rancher/v2.x/en/logging/v2.0.x-v2.4.x/cluster-logging/splunk/
- - /rancher/v2.x/en/cluster-admin/tools/logging/splunk
---
If your organization uses [Splunk](https://www.splunk.com/), you can configure Rancher to send it Kubernetes logs. Afterwards, you can log into your Splunk server to view logs.
@@ -50,7 +41,7 @@ If your instance of Splunk uses SSL, your **Endpoint** will need to begin with `
1. Select whether or not you want to verify your SSL.
- * If you are using a self-signed certificate, select **Enabled - Input trusted server certificate**, provide the **CA Certificate PEM**. You can copy and paste the certificate or upload it using the **Read from a file** button.
+ * If you are using a self-signed certificate, select **Enabled - Input trusted server certificate**, provide the **CA Certificate PEM**. You can copy and paste the certificate or upload it using the **Read from a file** button.
* If you are using a certificate from a certificate authority, select **Enabled - Input trusted server certificate**. You do not need to provide a **CA Certificate PEM**.
## Viewing Logs
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/syslog.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/syslog.md
index 9f959319c08..0df74c846f5 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/syslog.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-logging/syslog.md
@@ -1,12 +1,5 @@
---
title: Syslog
-weight: 500
-aliases:
- - /rancher/v2.0-v2.4/en/tools/logging/syslog/
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/logging/syslog
- - /rancher/v2.0-v2.4/en/logging/legacy/cluster-logging/syslog
- - /rancher/v2.0-v2.4/en/logging/v2.0.x-v2.4.x/cluster-logging/syslog
- - /rancher/v2.x/en/logging/v2.0.x-v2.4.x/cluster-logging/syslog/
---
If your organization uses [Syslog](https://tools.ietf.org/html/rfc5424), you can configure Rancher to send it Kubernetes logs. Afterwards, you can log into your Syslog server to view logs.
@@ -43,5 +36,5 @@ If your Syslog server is using **TCP** protocol and uses TLS, you need to select
1. Select whether or not you want to verify your SSL.
- * If you are using a self-signed certificate, select **Enabled - Input trusted server certificate**, provide the **CA Certificate PEM**. You can copy and paste the certificate or upload it using the **Read from a file** button.
+ * If you are using a self-signed certificate, select **Enabled - Input trusted server certificate**, provide the **CA Certificate PEM**. You can copy and paste the certificate or upload it using the **Read from a file** button.
* If you are using a certificate from a certificate authority, select **Enabled - Input trusted server certificate**. You do not need to provide a **CA Certificate PEM**.
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/cluster-metrics.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/cluster-metrics.md
index f081f977ef6..379fc6d33a1 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/cluster-metrics.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/cluster-metrics.md
@@ -1,12 +1,5 @@
---
title: Cluster Metrics
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/project-admin/tools/monitoring/cluster-metrics
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/monitoring/cluster-metrics
- - /rancher/v2.0-v2.4/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/cluster-metrics
- - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/cluster-metrics
- - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/cluster-metrics/
---
_Available as of v2.2.0_
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/custom-metrics.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/custom-metrics.md
index fd90daf406c..5854c0068a3 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/custom-metrics.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/custom-metrics.md
@@ -1,12 +1,5 @@
---
title: Prometheus Custom Metrics Adapter
-weight: 5
-aliases:
- - /rancher/v2.0-v2.4/en/project-admin/tools/monitoring/custom-metrics
- - /rancher/v2.0-v2.4/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/custom-metrics
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/monitoring/custom-metrics/
- - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/custom-metrics
- - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/custom-metrics/
---
After you've enabled [cluster level monitoring](../../../pages-for-subheaders/cluster-monitoring.md), You can view the metrics data from Rancher. You can also deploy the Prometheus custom metrics adapter then you can use the HPA with metrics stored in cluster monitoring.
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/expression.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/expression.md
index 24aa96e50bc..a4bb296b62f 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/expression.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/expression.md
@@ -1,12 +1,5 @@
---
title: Prometheus Expressions
-weight: 4
-aliases:
- - /rancher/v2.0-v2.4/en/project-admin/tools/monitoring/expression
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/monitoring/expression
- - /rancher/v2.0-v2.4/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/expression
- - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/expression
- - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/expression/
---
The PromQL expressions in this doc can be used to configure [alerts.](../../../pages-for-subheaders/cluster-alerts.md)
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/project-monitoring.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/project-monitoring.md
index 84026c59477..69da12c7903 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/project-monitoring.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/project-monitoring.md
@@ -1,10 +1,5 @@
---
title: Project Monitoring
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/project-admin/tools/monitoring
- - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/monitoring/project-monitoring
- - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/project-monitoring
---
_Available as of v2.2.4_
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/prometheus.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/prometheus.md
index fee3aa1aeb7..af9a782c160 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/prometheus.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/prometheus.md
@@ -1,12 +1,5 @@
---
title: Prometheus Configuration
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/project-admin/tools/monitoring/prometheus
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/monitoring/prometheus/
- - /rancher/v2.0-v2.4/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/prometheus
- - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/prometheus
- - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/prometheus/
---
_Available as of v2.2.0_
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/viewing-metrics.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/viewing-metrics.md
index 5a8d0c52eca..f1975825359 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/viewing-metrics.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/cluster-monitoring/viewing-metrics.md
@@ -1,12 +1,5 @@
---
title: Viewing Metrics
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/project-admin/tools/monitoring/viewing-metrics
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/monitoring/viewing-metrics
- - /rancher/v2.0-v2.4/en/monitoring-alerting/legacy/monitoring/cluster-monitoring/viewing-metrics
- - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/viewing-metrics
- - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/viewing-metrics/
---
_Available as of v2.2.0_
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
index f460ce16177..01545b281bc 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
@@ -1,14 +1,7 @@
---
title: CPU and Memory Allocations
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/project-admin/istio/configuring-resource-allocations/
- - /rancher/v2.0-v2.4/en/project-admin/istio/config/
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/resources
- - /rancher/v2.0-v2.4/en/istio/legacy/resources
- - /rancher/v2.0-v2.4/en/istio/v2.3.x-v2.4.x/resources
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/resources/
---
+
_Available as of v2.3.0_
This section describes the minimum recommended computing resources for the Istio components in a cluster.
@@ -26,13 +19,13 @@ In Kubernetes, the resource request indicates that the workload will not deploye
Workload | Container | CPU - Request | Mem - Request | CPU - Limit | Mem - Limit | Configurable
---------|-----------|---------------|---------------|-------------|-------------|-------------
istio-pilot |discovery| 500m | 2048Mi | 1000m | 4096Mi | Y
- istio-telemetry |mixer| 1000m | 1024Mi | 4800m | 4096Mi | Y
- istio-policy | mixer | 1000m | 1024Mi | 4800m | 4096Mi | Y
- istio-tracing | jaeger | 100m | 100Mi | 500m | 1024Mi | Y
- prometheus | prometheus | 750m | 750Mi | 1000m | 1024Mi | Y
- grafana | grafana | 100m | 100Mi | 200m | 512Mi | Y
- Others | - | 500m | 500Mi | - | - | N
- **Total** | **-** | **3950m** | **5546Mi** | **>12300m** | **>14848Mi** | **-**
+ istio-telemetry |mixer| 1000m | 1024Mi | 4800m | 4096Mi | Y
+ istio-policy | mixer | 1000m | 1024Mi | 4800m | 4096Mi | Y
+ istio-tracing | jaeger | 100m | 100Mi | 500m | 1024Mi | Y
+ prometheus | prometheus | 750m | 750Mi | 1000m | 1024Mi | Y
+ grafana | grafana | 100m | 100Mi | 200m | 512Mi | Y
+ Others | - | 500m | 500Mi | - | - | N
+ **Total** | **-** | **3950m** | **5546Mi** | **>12300m** | **>14848Mi** | **-**
## Configuring Resource Allocations
@@ -43,7 +36,7 @@ To make it easier to schedule the workloads to a node, a cluster administrator c
You can find more information about Istio configuration in the [official Istio documentation](https://istio.io/docs/concepts/what-is-istio).
-To configure the resources allocated to an Istio component,
+To configure the resources allocated to an Istio component,
1. In Rancher, go to the cluster where you have Istio installed.
1. Click **Tools > Istio.** This opens the Istio configuration page.
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/disable-istio.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/disable-istio.md
index 27c14e7caa6..7b53260c1f6 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/disable-istio.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/disable-istio.md
@@ -1,11 +1,5 @@
---
title: Disabling Istio
-weight: 4
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/disabling-istio
- - /rancher/v2.0-v2.4/en/istio/legacy/disabling-istio
- - /rancher/v2.0-v2.4/en/istio/v2.3.x-v2.4.x/disabling-istio
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/disabling-istio/
---
This section describes how to disable Istio in a cluster, namespace, or workload.
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/rbac-for-istio.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/rbac-for-istio.md
index 498dfa16f52..85ab75e9f16 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/rbac-for-istio.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/rbac-for-istio.md
@@ -1,11 +1,5 @@
---
title: Role-based Access Control
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/rbac
- - /rancher/v2.0-v2.4/en/istio/legacy/rbac
- - /rancher/v2.0-v2.4/en/istio/v2.3.x-v2.4.x/rbac
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/rbac/
---
This section describes the permissions required to access Istio features and how to configure access to the Kiali and Jaeger visualizations.
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/release-notes.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/release-notes.md
index 2fd7ad70c2b..9b819eb4500 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/release-notes.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/istio/release-notes.md
@@ -1,10 +1,5 @@
---
title: Release Notes
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/release-notes
- - /rancher/v2.0-v2.4/en/istio/legacy/release-notes
- - /rancher/v2.0-v2.4/en/istio/v2.3.x-v2.4.x/release-notes
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/release-notes/
---
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/notifiers.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/notifiers.md
index 8d09cfff0db..721038ba487 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/notifiers.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/notifiers.md
@@ -1,13 +1,5 @@
---
title: Notifiers
-weight: 4
-aliases:
- - /rancher/v2.0-v2.4/en/project-admin/tools/notifiers
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/notifiers
- - /rancher/v2.0-v2.4/en/monitoring-alerting/legacy/notifiers
- - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/notifiers
- - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/notifiers/
- - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-alerts/default-alerts/
---
Notifiers are services that inform you of alert events. You can configure notifiers to send alert notifications to staff best suited to take corrective action.
diff --git a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/opa-gatekeeper.md b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/opa-gatekeeper.md
index cb5c6343874..80b6ca1249a 100644
--- a/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/opa-gatekeeper.md
+++ b/versioned_docs/version-2.0-2.4/explanations/integrations-in-rancher/opa-gatekeeper.md
@@ -1,11 +1,7 @@
---
title: OPA Gatekeeper
-weight: 17
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/opa-gatekeeper
- - /rancher/v2.0-v2.4/en/opa-gatekeper/Open%20Policy%20Agent
- - /rancher/v2.0-v2.4/en/opa-gatekeper
---
+
_Available as of v2.4.0_
To ensure consistency and compliance, every organization needs the ability to define and enforce policies in its environment in an automated way. [OPA (Open Policy Agent)](https://www.openpolicyagent.org/) is a policy engine that facilitates policy-based control for cloud native environments. Rancher provides the ability to enable OPA Gatekeeper in Kubernetes clusters, and also installs a couple of built-in policy definitions, which are also called constraint templates.
diff --git a/versioned_docs/version-2.0-2.4/faq.md b/versioned_docs/version-2.0-2.4/faq.md
index 2c580cdfba5..7307f18ba25 100644
--- a/versioned_docs/version-2.0-2.4/faq.md
+++ b/versioned_docs/version-2.0-2.4/faq.md
@@ -1,8 +1,5 @@
---
title: FAQ
-weight: 25
-aliases:
- - /rancher/v2.0-v2.4/en/about/
---
This FAQ is a work in progress designed to answers the questions our users most frequently ask about Rancher v2.x.
diff --git a/versioned_docs/version-2.0-2.4/faq/container-network-interface-providers.md b/versioned_docs/version-2.0-2.4/faq/container-network-interface-providers.md
index 4eb3d0b5626..372290f8a9d 100644
--- a/versioned_docs/version-2.0-2.4/faq/container-network-interface-providers.md
+++ b/versioned_docs/version-2.0-2.4/faq/container-network-interface-providers.md
@@ -1,7 +1,6 @@
---
title: Container Network Interface (CNI) Providers
description: Learn about Container Network Interface (CNI), the CNI providers Rancher provides, the features they offer, and how to choose a provider for you
-weight: 2300
---
## What is CNI?
diff --git a/versioned_docs/version-2.0-2.4/faq/install-and-configure-kubectl.md b/versioned_docs/version-2.0-2.4/faq/install-and-configure-kubectl.md
index b4172ab0a40..f059edb284d 100644
--- a/versioned_docs/version-2.0-2.4/faq/install-and-configure-kubectl.md
+++ b/versioned_docs/version-2.0-2.4/faq/install-and-configure-kubectl.md
@@ -1,6 +1,5 @@
---
title: Installing and Configuring kubectl
-weight: 100
---
`kubectl` is a CLI utility for running commands against Kubernetes clusters. It's required for many maintenance and administrative tasks in Rancher 2.x.
diff --git a/versioned_docs/version-2.0-2.4/faq/networking.md b/versioned_docs/version-2.0-2.4/faq/networking.md
index 580786492ce..f6cc330a531 100644
--- a/versioned_docs/version-2.0-2.4/faq/networking.md
+++ b/versioned_docs/version-2.0-2.4/faq/networking.md
@@ -1,6 +1,5 @@
---
title: Networking
-weight: 8005
---
Networking FAQ's
diff --git a/versioned_docs/version-2.0-2.4/faq/rancher-is-no-longer-needed.md b/versioned_docs/version-2.0-2.4/faq/rancher-is-no-longer-needed.md
index ba6847d10b7..7c4d614915f 100644
--- a/versioned_docs/version-2.0-2.4/faq/rancher-is-no-longer-needed.md
+++ b/versioned_docs/version-2.0-2.4/faq/rancher-is-no-longer-needed.md
@@ -1,11 +1,5 @@
---
title: Rancher is No Longer Needed
-weight: 8010
-aliases:
- - /rancher/v2.0-v2.4/en/installation/removing-rancher/cleaning-cluster-nodes/
- - /rancher/v2.0-v2.4/en/installation/removing-rancher/
- - /rancher/v2.0-v2.4/en/admin-settings/removing-rancher/
- - /rancher/v2.0-v2.4/en/admin-settings/removing-rancher/rancher-cluster-nodes/
---
This page is intended to answer questions about what happens if you don't want Rancher anymore, if you don't want a cluster to be managed by Rancher anymore, or if the Rancher server is deleted.
diff --git a/versioned_docs/version-2.0-2.4/faq/security.md b/versioned_docs/version-2.0-2.4/faq/security.md
index aee42e0fb93..e86c8023672 100644
--- a/versioned_docs/version-2.0-2.4/faq/security.md
+++ b/versioned_docs/version-2.0-2.4/faq/security.md
@@ -1,7 +1,5 @@
---
title: Security
-weight: 8007
-
---
**Is there a Hardening Guide?**
diff --git a/versioned_docs/version-2.0-2.4/faq/technical-items.md b/versioned_docs/version-2.0-2.4/faq/technical-items.md
index b4204794601..9d62c8bf7c1 100644
--- a/versioned_docs/version-2.0-2.4/faq/technical-items.md
+++ b/versioned_docs/version-2.0-2.4/faq/technical-items.md
@@ -1,6 +1,5 @@
---
title: Technical
-weight: 8006
---
### How can I reset the administrator password?
diff --git a/versioned_docs/version-2.0-2.4/faq/telemetry.md b/versioned_docs/version-2.0-2.4/faq/telemetry.md
index 6ab582667e1..f0866ac2b55 100644
--- a/versioned_docs/version-2.0-2.4/faq/telemetry.md
+++ b/versioned_docs/version-2.0-2.4/faq/telemetry.md
@@ -1,6 +1,5 @@
---
title: Telemetry
-weight: 8008
---
### What is Telemetry?
diff --git a/versioned_docs/version-2.0-2.4/faq/upgrades-to-2x.md b/versioned_docs/version-2.0-2.4/faq/upgrades-to-2x.md
index bae4da16a67..50190872188 100644
--- a/versioned_docs/version-2.0-2.4/faq/upgrades-to-2x.md
+++ b/versioned_docs/version-2.0-2.4/faq/upgrades-to-2x.md
@@ -1,8 +1,5 @@
---
title: Questions about Upgrading to Rancher v2.x
-weight: 1
-aliases:
- - /rancher/v2.x/en/faq/upgrades-to-2x/
---
This page contains frequently asked questions about the changes between Rancher v1.x and v2.x, and how to upgrade from Rancher v1.x to v2.x.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/install-rancher.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/install-rancher.md
index c5500347571..dd63b2f9dd9 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/install-rancher.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/install-rancher.md
@@ -1,14 +1,5 @@
---
title: 4. Install Rancher
-weight: 400
-aliases:
- - /rancher/v2.0-v2.4/en/installation/air-gap-installation/install-rancher/
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/config-rancher-system-charts/
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/config-rancher-for-private-reg/
- - /rancher/v2.0-v2.4/en/installation/air-gap-single-node/install-rancher
- - /rancher/v2.0-v2.4/en/installation/air-gap/install-rancher
- - /rancher/v2.0-v2.4/en/installation/options/air-gap-helm2/install-rancher
- - /rancher/v2.x/en/installation/resources/advanced/air-gap-helm2/install-rancher/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/launch-kubernetes.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/launch-kubernetes.md
index 0d7508f8f24..7c931e0f0cf 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/launch-kubernetes.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/launch-kubernetes.md
@@ -1,10 +1,5 @@
---
title: '3. Install Kubernetes with RKE (Kubernetes Installs Only)'
-weight: 300
-aliases:
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/install-kube
- - /rancher/v2.0-v2.4/en/installation/options/air-gap-helm2/launch-kubernetes
- - /rancher/v2.x/en/installation/resources/advanced/air-gap-helm2/launch-kubernetes/
---
This section is about how to prepare to launch a Kubernetes cluster which is used to deploy Rancher server for your air gapped environment.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/populate-private-registry.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/populate-private-registry.md
index c570c827559..63950a59726 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/populate-private-registry.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/populate-private-registry.md
@@ -1,14 +1,5 @@
---
title: '2. Collect and Publish Images to your Private Registry'
-weight: 200
-aliases:
- - /rancher/v2.0-v2.4/en/installation/air-gap-installation/prepare-private-reg/
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/prepare-private-registry/
- - /rancher/v2.0-v2.4/en/installation/air-gap-single-node/prepare-private-registry/
- - /rancher/v2.0-v2.4/en/installation/air-gap-single-node/config-rancher-for-private-reg/
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/config-rancher-for-private-reg/
- - /rancher/v2.0-v2.4/en/installation/options/air-gap-helm2/populate-private-registry
- - /rancher/v2.x/en/installation/resources/advanced/air-gap-helm2/populate-private-registry/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/prepare-nodes.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/prepare-nodes.md
index c00632bebc4..b46ba8bc838 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/prepare-nodes.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/air-gap-helm2/prepare-nodes.md
@@ -1,11 +1,5 @@
---
title: '1. Prepare your Node(s)'
-weight: 100
-aliases:
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/provision-hosts
- - /rancher/v2.0-v2.4/en/installation/air-gap-single-node/provision-host
- - /rancher/v2.0-v2.4/en/installation/options/air-gap-helm2/prepare-nodes
- - /rancher/v2.x/en/installation/resources/advanced/air-gap-helm2/prepare-nodes/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-certificate-recognizedca.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-certificate-recognizedca.md
index 3af4b3fe53a..2ce4437c555 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-certificate-recognizedca.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-certificate-recognizedca.md
@@ -1,9 +1,5 @@
---
title: Template for an RKE Cluster with a Certificate Signed by Recognized CA and a Layer 4 Load Balancer
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/cluster-yml-templates/3-node-certificate-recognizedca
- - /rancher/v2.x/en/installation/resources/advanced/cluster-yml-templates/3-node-certificate-recognizedca/
---
RKE uses a cluster.yml file to install and configure your Kubernetes cluster.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-certificate.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-certificate.md
index 86c06424c78..e206fe2d79d 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-certificate.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-certificate.md
@@ -1,10 +1,7 @@
---
title: Template for an RKE Cluster with a Self-signed Certificate and Layer 4 Load Balancer
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/cluster-yml-templates/3-node-certificate
- - /rancher/v2.x/en/installation/resources/advanced/cluster-yml-templates/3-node-certificate/
---
+
RKE uses a cluster.yml file to install and configure your Kubernetes cluster.
This template is intended to be used for RKE add-on installs, which are only supported up to Rancher v2.0.8. Please use the Rancher Helm chart if you are installing a newer Rancher version.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-externalssl-certificate.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-externalssl-certificate.md
index 59cf796e1ed..3b10e06b723 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-externalssl-certificate.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-externalssl-certificate.md
@@ -1,9 +1,5 @@
---
title: Template for an RKE Cluster with a Self-signed Certificate and SSL Termination on Layer 7 Load Balancer
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/cluster-yml-templates/3-node-externalssl-certificate
- - /rancher/v2.x/en/installation/resources/advanced/cluster-yml-templates/3-node-externalssl-certificate/
---
RKE uses a cluster.yml file to install and configure your Kubernetes cluster.
@@ -13,7 +9,7 @@ This template is intended to be used for RKE add-on installs, which are only sup
The following template can be used for the cluster.yml if you have a setup with:
- Layer 7 load balancer with self-signed SSL termination (HTTPS)
-- [NGINX Ingress controller](https://kubernetes.github.io/ingress-nginx/)
+- [NGINX Ingress controller](https://kubernetes.github.io/ingress-nginx/)
> For more options, refer to [RKE Documentation: Config Options](https://rancher.com/docs/rke/latest/en/config-options/).
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-externalssl-recognizedca.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-externalssl-recognizedca.md
index 57107fbcc4a..f6d7b4ffaa7 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-externalssl-recognizedca.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/cluster-yml-templates/node-externalssl-recognizedca.md
@@ -1,9 +1,5 @@
---
title: Template for an RKE Cluster with a Recognized CA Certificate and SSL Termination on Layer 7 Load Balancer
-weight: 4
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/cluster-yml-templates/3-node-externalssl-recognizedca
- - /rancher/v2.x/en/installation/resources/advanced/cluster-yml-templates/3-node-externalssl-recognizedca/
---
RKE uses a cluster.yml file to install and configure your Kubernetes cluster.
@@ -13,7 +9,7 @@ This template is intended to be used for RKE add-on installs, which are only sup
The following template can be used for the cluster.yml if you have a setup with:
- Layer 7 load balancer with SSL termination (HTTPS)
-- [NGINX Ingress controller](https://kubernetes.github.io/ingress-nginx/)
+- [NGINX Ingress controller](https://kubernetes.github.io/ingress-nginx/)
> For more options, refer to [RKE Documentation: Config Options](https://rancher.com/docs/rke/latest/en/config-options/).
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
index 8d66e18655c..e4b1c517cef 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
@@ -1,11 +1,5 @@
---
title: Docker Install with TLS Termination at Layer-7 NGINX Load Balancer
-weight: 252
-aliases:
- - /rancher/v2.0-v2.4/en/installation/single-node/single-node-install-external-lb/
- - /rancher/v2.0-v2.4/en/installation/other-installation-methods/single-node-docker/single-node-install-external-lb
- - /rancher/v2.0-v2.4/en/installation/options/single-node-install-external-lb
- - /rancher/v2.0-v2.4/en/installation/single-node-install-external-lb
---
For development and testing environments that have a special requirement to terminate TLS/SSL at a load balancer instead of your Rancher Server container, deploy Rancher and configure a load balancer to work with it conjunction.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
index 9590438ceda..886cc0f0c40 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
@@ -1,9 +1,5 @@
---
title: Enabling the API Audit Log to Record System Events
-weight: 4
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/api-audit-log/
- - /rancher/v2.0-v2.4/en/installation/api-auditing
---
You can enable the API audit log to record the sequence of system events initiated by individual users. You can know what happened, when it happened, who initiated it, and what cluster it affected. When you enable this feature, all requests to the Rancher API and all responses from it are written to a log.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/create-nodes-lb/nginx.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/create-nodes-lb/nginx.md
index 95df7645012..2658eca080e 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/create-nodes-lb/nginx.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/create-nodes-lb/nginx.md
@@ -1,10 +1,7 @@
---
title: NGINX
-weight: 270
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/create-nodes-lb/nginx
- - /rancher/v2.x/en/installation/resources/advanced/helm2/create-nodes-lb/nginx/
---
+
NGINX will be configured as Layer 4 load balancer (TCP) that forwards connections to one of your Rancher nodes.
>**Note:**
@@ -29,7 +26,7 @@ After installing NGINX, you need to update the NGINX configuration file, `nginx.
>**Note:** See [NGINX Documentation: TCP and UDP Load Balancing](https://docs.nginx.com/nginx/admin-guide/load-balancer/tcp-udp-load-balancer/) for all configuration options.
Example NGINX config
-
+
```
worker_processes 4;
worker_rlimit_nofile 40000;
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/create-nodes-lb/nlb.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/create-nodes-lb/nlb.md
index 66eb969595f..3bcb038089c 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/create-nodes-lb/nlb.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/create-nodes-lb/nlb.md
@@ -1,10 +1,7 @@
---
title: Amazon NLB
-weight: 277
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/create-nodes-lb/nlb
- - /rancher/v2.x/en/installation/resources/advanced/helm2/create-nodes-lb/nlb/
---
+
## Objectives
Configuring an Amazon NLB is a multistage process. We've broken it down into multiple tasks so that it's easy to follow.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-init/troubleshooting.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-init/troubleshooting.md
index 94749fa0c78..1f709d1b7c4 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-init/troubleshooting.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-init/troubleshooting.md
@@ -1,9 +1,5 @@
---
title: Troubleshooting
-weight: 276
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/helm-init/troubleshooting
- - /rancher/v2.x/en/installation/resources/advanced/helm2/helm-init/troubleshooting/
---
### Helm commands show forbidden
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-rancher/chart-options.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-rancher/chart-options.md
index ce7e006487d..d263104e22b 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-rancher/chart-options.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-rancher/chart-options.md
@@ -1,9 +1,5 @@
---
title: Chart Options
-weight: 276
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/helm-rancher/chart-options
- - /rancher/v2.x/en/installation/resources/advanced/helm2/helm-rancher/chart-options/
---
### Common Options
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-rancher/tls-secrets.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-rancher/tls-secrets.md
index 3f964fa1459..d2895f02d68 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-rancher/tls-secrets.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-rancher/tls-secrets.md
@@ -1,10 +1,6 @@
---
title: Adding Kubernetes TLS Secrets
-description: Read about how to populate the Kubernetes TLS secret for a Rancher installation
-weight: 276
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/helm-rancher/tls-secrets
- - /rancher/v2.x/en/installation/resources/advanced/helm2/helm-rancher/tls-secrets/
+description: Read about how to populate the Kubernetes TLS secret for a Rancher installation
---
Kubernetes will create all the objects and services for Rancher, but it will not become available until we populate the `tls-rancher-ingress` secret in the `cattle-system` namespace with the certificate and key.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-rancher/troubleshooting.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-rancher/troubleshooting.md
index df9f7d23e32..a0246b90b24 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-rancher/troubleshooting.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/helm-rancher/troubleshooting.md
@@ -1,9 +1,5 @@
---
title: Troubleshooting
-weight: 276
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/helm-rancher/troubleshooting
- - /rancher/v2.x/en/installation/resources/advanced/helm2/helm-rancher/troubleshooting/
---
### Where is everything
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/kubernetes-rke/troubleshooting.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/kubernetes-rke/troubleshooting.md
index 81ec584c614..6cb83205033 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/kubernetes-rke/troubleshooting.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/kubernetes-rke/troubleshooting.md
@@ -1,9 +1,5 @@
---
title: Troubleshooting
-weight: 276
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/kubernetes-rke/troubleshooting
- - /rancher/v2.x/en/installation/resources/advanced/helm2/kubernetes-rke/troubleshooting/
---
### canal Pods show READY 2/3
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/api-auditing.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/api-auditing.md
index f7f0f09c8f8..295410613a7 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/api-auditing.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/api-auditing.md
@@ -1,10 +1,5 @@
---
title: Enable API Auditing
-weight: 300
-aliases:
- - /rke/latest/en/config-options/add-ons/api-auditing/
- - /rancher/v2.0-v2.4/en/installation/options/helm2/rke-add-on/api-auditing
- - /rancher/v2.x/en/installation/resources/advanced/helm2/rke-add-on/api-auditing/
---
>**Important: RKE add-on install is only supported up to Rancher v2.0.8**
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/layer-4-lb/nlb.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/layer-4-lb/nlb.md
index dd772931137..e917c2eede8 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/layer-4-lb/nlb.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/layer-4-lb/nlb.md
@@ -1,10 +1,5 @@
---
title: Amazon NLB Configuration
-weight: 277
-aliases:
- - /rancher/v2.0-v2.4/en/installation/ha-server-install/nlb/
- - /rancher/v2.0-v2.4/en/installation/options/helm2/rke-add-on/layer-4-lb/nlb
- - /rancher/v2.x/en/installation/resources/advanced/helm2/rke-add-on/layer-4-lb/nlb/
---
> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/layer-7-lb/alb.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/layer-7-lb/alb.md
index e2d7fcb6350..b62a9f78830 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/layer-7-lb/alb.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/layer-7-lb/alb.md
@@ -1,10 +1,5 @@
---
title: Amazon ALB Configuration
-weight: 277
-aliases:
- - /rancher/v2.0-v2.4/en/installation/ha-server-install-external-lb/alb/
- - /rancher/v2.0-v2.4/en/installation/options/helm2/rke-add-on/layer-7-lb/alb
- - /rancher/v2.x/en/installation/resources/advanced/helm2/rke-add-on/layer-7-lb/alb/
---
> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/layer-7-lb/nginx.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/layer-7-lb/nginx.md
index 0f588c569bb..1b2b61808d1 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/layer-7-lb/nginx.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/layer-7-lb/nginx.md
@@ -1,10 +1,5 @@
---
title: NGINX Configuration
-weight: 277
-aliases:
- - /rancher/v2.0-v2.4/en/installation/ha-server-install-external-lb/nginx/
- - /rancher/v2.0-v2.4/en/installation/options/helm2/rke-add-on/layer-7-lb/nginx
- - /rancher/v2.x/en/installation/resources/advanced/helm2/rke-add-on/layer-7-lb/nginx/
---
> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/proxy.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/proxy.md
index c4457c287b7..2b8aea62d74 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/proxy.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/proxy.md
@@ -1,9 +1,5 @@
---
title: HTTP Proxy Configuration
-weight: 277
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/rke-add-on/proxy
- - /rancher/v2.x/en/installation/resources/advanced/helm2/rke-add-on/proxy/
---
> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/troubleshooting/404-default-backend.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/troubleshooting/404-default-backend.md
index 37ed0aa90d8..d9f6d5c4385 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/troubleshooting/404-default-backend.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/troubleshooting/404-default-backend.md
@@ -1,11 +1,5 @@
---
title: 404 - default backend
-weight: 30
-aliases:
- - /rancher/v2.0-v2.4/en/installation/troubleshooting-ha/404-default-backend/
- - /rancher/v2.0-v2.4/en/installation/options/helm2/rke-add-on/troubleshooting/404-default-backend
- - /404-default-backend/
- - /rancher/v2.x/en/installation/resources/advanced/helm2/rke-add-on/troubleshooting/404-default-backend/
---
> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/troubleshooting/generic-troubleshooting.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/troubleshooting/generic-troubleshooting.md
index 981d12bb23e..d86888b15f9 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/troubleshooting/generic-troubleshooting.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/troubleshooting/generic-troubleshooting.md
@@ -1,10 +1,5 @@
---
title: Generic troubleshooting
-weight: 5
-aliases:
- - /rancher/v2.0-v2.4/en/installation/troubleshooting-ha/generic-troubleshooting/
- - /rancher/v2.0-v2.4/en/installation/options/helm2/rke-add-on/troubleshooting/generic-troubleshooting
- - /rancher/v2.x/en/installation/resources/advanced/helm2/rke-add-on/troubleshooting/generic-troubleshooting/
---
> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/troubleshooting/job-complete-status.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/troubleshooting/job-complete-status.md
index 4a3f350ad49..5558c118286 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/troubleshooting/job-complete-status.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/helm2/rke-add-on/troubleshooting/job-complete-status.md
@@ -1,10 +1,5 @@
---
title: Failed to get job complete status
-weight: 20
-aliases:
- - /rancher/v2.0-v2.4/en/installation/troubleshooting-ha/job-complete-status/
- - /rancher/v2.0-v2.4/en/installation/options/helm2/rke-add-on/troubleshooting/job-complete-status
- - /rancher/v2.x/en/installation/resources/advanced/helm2/rke-add-on/troubleshooting/job-complete-status/
---
> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
index 78b4313e145..f2b9c80842c 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
@@ -1,6 +1,5 @@
---
title: Opening Ports with firewalld
-weight: 1
---
> We recommend disabling firewalld. For Kubernetes 1.19.x and higher, firewalld must be turned off.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/rke-add-on/layer-4-lb.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/rke-add-on/layer-4-lb.md
index 593ac25326b..3416b12e363 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/rke-add-on/layer-4-lb.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/rke-add-on/layer-4-lb.md
@@ -1,11 +1,5 @@
---
title: Kubernetes Install with External Load Balancer (TCP/Layer 4)
-weight: 275
-aliases:
- - /rancher/v2.0-v2.4/en/installation/ha/rke-add-on/layer-4-lb
- - /rancher/v2.0-v2.4/en/installation/options/helm2/rke-add-on/layer-4-lb
- - /rancher/v2.0-v2.4/en/installation/options/rke-add-on/layer-4-lb
- - /rancher/v2.x/en/installation/resources/advanced/rke-add-on/layer-4-lb/
---
import SSlFaqHa from '@site/src/components/SslFaqHa'
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/rke-add-on/layer-7-lb.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/rke-add-on/layer-7-lb.md
index 539c5820719..1674fcf0cc2 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/rke-add-on/layer-7-lb.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/rke-add-on/layer-7-lb.md
@@ -1,11 +1,5 @@
---
title: Kubernetes Install with External Load Balancer (HTTPS/Layer 7)
-weight: 276
-aliases:
- - /rancher/v2.0-v2.4/en/installation/ha/rke-add-on/layer-7-lb
- - /rancher/v2.0-v2.4/en/installation/options/rke-add-on/layer-7-lb/
- - /rancher/v2.0-v2.4/en/installation/options/rke-add-on/layer-7-lb
- - /rancher/v2.x/en/installation/resources/advanced/rke-add-on/layer-7-lb/
---
import SslFaqHa from '@site/src/components/SslFaqHa'
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
index eeb5913daab..28ba391c403 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
@@ -1,8 +1,5 @@
---
title: Tuning etcd for Large Installations
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/etcd
---
When running larger Rancher installations with 15 or more clusters it is recommended to increase the default keyspace for etcd from the default 2GB. The maximum setting is 8GB and the host should have enough RAM to keep the entire dataset in memory. When increasing this value you should also increase the size of the host. The keyspace size can also be adjusted in smaller installations if you anticipate a high rate of change of pods during the garbage collection interval.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
index f4bb029cf68..b57cbc7f360 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
@@ -1,8 +1,5 @@
---
title: UI for Istio Virtual Services and Destination Rules
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/feature-flags/istio-virtual-service-ui
---
This feature enables a UI that lets you create, read, update and delete virtual services and destination rules, which are traffic management features of Istio.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
index 776ce5b1ee6..5b7a3396c8c 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
@@ -1,8 +1,5 @@
---
title: "Running on ARM64 (Experimental)"
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/arm64-platform
---
> **Important:**
@@ -15,18 +12,18 @@ The following options are available when using an ARM64 platform:
- Only for Docker Install. Please note that the following installation command replaces the examples found in the [Docker Install](../../../../pages-for-subheaders/rancher-on-a-single-node-with-docker.md) link:
```
- # In the last line `rancher/rancher:vX.Y.Z`, be certain to replace "X.Y.Z" with a released version in which ARM64 builds exist. For example, if your matching version is v2.5.8, you would fill in this line with `rancher/rancher:v2.5.8`.
+ # In the last line `rancher/rancher:vX.Y.Z`, be certain to replace "X.Y.Z" with a released version in which ARM64 builds exist. For example, if your matching version is v2.5.8, you would fill in this line with `rancher/rancher:v2.5.8`.
docker run -d --restart=unless-stopped \
-p 80:80 -p 443:443 \
--privileged \
- rancher/rancher:vX.Y.Z
+ rancher/rancher:vX.Y.Z
```
-> **Note:** To check if your specific released version is compatible with the ARM64 architecture, you may navigate to your
+> **Note:** To check if your specific released version is compatible with the ARM64 architecture, you may navigate to your
> version's release notes in the following two ways:
>
> - Manually find your version using https://github.com/rancher/rancher/releases.
-> - Go directly to your version using the tag and the specific version number. If you plan to use v2.5.8, for example, you may
-> navigate to https://github.com/rancher/rancher/releases/tag/v2.5.8.
+> - Go directly to your version using the tag and the specific version number. If you plan to use v2.5.8, for example, you may
+> navigate to https://github.com/rancher/rancher/releases/tag/v2.5.8.
- Create custom cluster and adding ARM64 based node(s)
- Kubernetes cluster version must be 1.12 or higher
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
index 64964ad0564..f4023795ba1 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
@@ -1,8 +1,5 @@
---
title: Allow Unsupported Storage Drivers
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/feature-flags/enable-not-default-storage-drivers/
---
This feature allows you to use types for storage providers and provisioners that are not enabled by default.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md
index c18a66b06fb..c63abd4866d 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md
@@ -1,13 +1,5 @@
---
title: Rollbacks
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/upgrades/rollbacks
- - /rancher/v2.0-v2.4/en/installation/upgrades-rollbacks/rollbacks
- - /rancher/v2.0-v2.4/en/upgrades/ha-server-rollbacks
- - /rancher/v2.0-v2.4/en/upgrades/rollbacks/ha-server-rollbacks
- - /rancher/v2.0-v2.4/en/installation/upgrades-rollbacks/rollbacks/ha-server-rollbacks
- - /rancher/v2.0-v2.4/en/installation/install-rancher-on-k8s/upgrades-rollbacks/rollbacks
---
### Rolling Back to Rancher v2.2-v2.4
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md
index 3ac55a1a7a1..d800fe345ae 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md
@@ -1,11 +1,5 @@
---
title: Troubleshooting the Rancher Server Kubernetes Cluster
-weight: 276
-aliases:
- - /rancher/v2.0-v2.4/en/installation/k8s-install/helm-rancher/troubleshooting
- - /rancher/v2.0-v2.4/en/installation/ha/kubernetes-rke/troubleshooting
- - /rancher/v2.0-v2.4/en/installation/k8s-install/kubernetes-rke/troubleshooting
- - /rancher/v2.0-v2.4/en/installation/options/troubleshooting
---
This section describes how to troubleshoot an installation of Rancher on a Kubernetes cluster.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades/helm2.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades/helm2.md
index bf8f8fdedc9..132d6cc5489 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades/helm2.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades/helm2.md
@@ -1,13 +1,5 @@
---
title: Upgrading Rancher Installed on Kubernetes with Helm 2
-weight: 1050
-aliases:
- - /rancher/v2.0-v2.4/en/upgrades/upgrades/ha/helm2
- - /rancher/v2.0-v2.4/en/upgrades/helm2
- - /rancher/v2.0-v2.4/en/installation/upgrades-rollbacks/upgrades/ha/helm2
- - /rancher/v2.0-v2.4/en/installation/install-rancher-on-k8s/upgrades-rollbacks/upgrades/ha/helm2
- - /rancher/v2.0-v2.4/en/installation/install-rancher-on-k8s/upgrades-rollbacks/upgrades/helm2
- - /rancher/v2.x/en/installation/install-rancher-on-k8s/upgrades/helm2/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades/migrating-from-rke-add-on.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades/migrating-from-rke-add-on.md
index ffab37b01e5..68527ba79ec 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades/migrating-from-rke-add-on.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades/migrating-from-rke-add-on.md
@@ -1,13 +1,5 @@
---
title: Migrating from a Kubernetes Install with an RKE Add-on
-weight: 1030
-aliases:
- - /rancher/v2.0-v2.4/en/upgrades/ha-server-upgrade/
- - /rancher/v2.0-v2.4/en/upgrades/upgrades/ha-server-upgrade/
- - /rancher/v2.0-v2.4/en/upgrades/upgrades/migrating-from-rke-add-on
- - /rancher/v2.0-v2.4/en/installation/upgrades-rollbacks/upgrades/migrating-from-rke-add-on
- - /rancher/v2.0-v2.4/en/installation/install-rancher-on-k8s/upgrades-rollbacks/upgrades/migrating-from-rke-add-on
- - /rancher/v2.x/en/installation/install-rancher-on-k8s/upgrades/migrating-from-rke-add-on/
---
> **Important: RKE add-on install is only supported up to Rancher v2.0.8**
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades/namespace-migration.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades/namespace-migration.md
index e81ee286b7d..1a2addd1af2 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades/namespace-migration.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades/namespace-migration.md
@@ -1,11 +1,5 @@
---
title: Upgrading to v2.0.7+ — Namespace Migration
-weight: 1040
-aliases:
- - /rancher/v2.0-v2.4/en/upgrades/upgrades/namespace-migration
- - /rancher/v2.0-v2.4/en/installation/upgrades-rollbacks/upgrades/namespace-migration
- - /rancher/v2.0-v2.4/en/installation/install-rancher-on-k8s/upgrades-rollbacks/upgrades/namespace-migration
- - /rancher/v2.x/en/installation/install-rancher-on-k8s/upgrades/namespace-migration/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/installation-requirements/install-docker.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
index 9fdeb407a47..efbb31a1cd9 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
@@ -1,6 +1,5 @@
---
title: Installing Docker
-weight: 1
---
Docker is required to be installed on nodes where the Rancher server will be installed with Helm or Docker.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
index 5a134ff58c0..70b699fdf78 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
@@ -1,7 +1,6 @@
---
title: Port Requirements
description: Read about port requirements needed in order for Rancher to operate properly, both for Rancher nodes and downstream Kubernetes cluster nodes
-weight: 300
---
import PortsIaasNodes from '@site/src/components/PortsIaasNodes'
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
index 8bc32ba4882..67332093504 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
@@ -1,8 +1,5 @@
---
title: '1. Set up Infrastructure and Private Registry'
-weight: 100
-aliases:
- - /rancher/v2.0-v2.4/en/installation/air-gap-single-node/provision-host
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
index 0ca3cd15a45..4c12e8cef8c 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
@@ -1,8 +1,5 @@
---
title: '3. Install Kubernetes (Skip for Docker Installs)'
-weight: 300
-aliases:
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/install-kube
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
index b9752030224..fbe224fb464 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
@@ -1,12 +1,5 @@
---
title: 4. Install Rancher
-weight: 400
-aliases:
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/config-rancher-system-charts/
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/config-rancher-for-private-reg/
- - /rancher/v2.0-v2.4/en/installation/air-gap-single-node/install-rancher
- - /rancher/v2.0-v2.4/en/installation/air-gap/install-rancher
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/install-rancher/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md
index 56b49853f80..68baa679e83 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md
@@ -1,11 +1,5 @@
---
title: '2. Collect and Publish Images to your Private Registry'
-weight: 200
-aliases:
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/prepare-private-registry/
- - /rancher/v2.0-v2.4/en/installation/air-gap-single-node/prepare-private-registry/
- - /rancher/v2.0-v2.4/en/installation/air-gap-single-node/config-rancher-for-private-reg/
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/config-rancher-for-private-reg/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md
index 1a1314b2655..c66f4e27ce0 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md
@@ -1,6 +1,5 @@
---
title: '2. Install Kubernetes'
-weight: 200
---
Once the infrastructure is ready, you can continue with setting up an RKE cluster to install Rancher in.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
index 3729d461547..b82d2b48074 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
@@ -1,6 +1,5 @@
---
title: 3. Install Rancher
-weight: 300
---
Now that you have a running RKE cluster, you can install Rancher in it. For security reasons all traffic to Rancher must be encrypted with TLS. For this tutorial you are going to automatically issue a self-signed certificate through [cert-manager](https://cert-manager.io/). In a real-world use-case you will likely use Let's Encrypt or provide your own certificate.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
index 06764549972..50100000b1f 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
@@ -1,6 +1,5 @@
---
title: '1. Set up Infrastructure'
-weight: 100
---
In this section, you will provision the underlying infrastructure for your Rancher management server with internete access through a HTTP proxy.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md
index 9a1fc02ee8d..7e91622ab4d 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md
@@ -1,6 +1,5 @@
---
title: Certificate Troubleshooting
-weight: 4
---
### How Do I Know if My Certificates are in PEM Format?
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md
index 34e1f3efc81..c0cdd7afb27 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md
@@ -1,9 +1,5 @@
---
title: Rolling Back Rancher Installed with Docker
-weight: 1015
-aliases:
- - /rancher/v2.0-v2.4/en/upgrades/single-node-rollbacks
- - /rancher/v2.0-v2.4/en/upgrades/rollbacks/single-node-rollbacks
---
If a Rancher upgrade does not complete successfully, you'll have to roll back to your Rancher setup that you were using before [Docker Upgrade](./upgrade-docker-installed-rancher.md). Rolling back restores:
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
index 13e543f1773..631c53f6d31 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
@@ -1,12 +1,5 @@
---
title: Upgrading Rancher Installed with Docker
-weight: 1010
-aliases:
- - /rancher/v2.0-v2.4/en/upgrades/single-node-upgrade/
- - /rancher/v2.0-v2.4/en/upgrades/upgrades/single-node-air-gap-upgrade
- - /rancher/v2.0-v2.4/en/upgrades/upgrades/single-node
- - /rancher/v2.0-v2.4/en/upgrades/upgrades/single-node-upgrade/
- - /rancher/v2.0-v2.4/en/installation/install-rancher-on-k8s/upgrades/upgrades/single-node/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/add-tls-secrets.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/add-tls-secrets.md
index f9b2d4a4352..6c31231b0db 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/add-tls-secrets.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/add-tls-secrets.md
@@ -1,13 +1,12 @@
---
title: Adding TLS Secrets
-weight: 2
---
Kubernetes will create all the objects and services for Rancher, but it will not become available until we populate the `tls-rancher-ingress` secret in the `cattle-system` namespace with the certificate and key.
Combine the server certificate followed by any intermediate certificate(s) needed into a file named `tls.crt`. Copy your certificate key into a file named `tls.key`.
-For example, [acme.sh](https://acme.sh) provides server certificate and CA chains in `fullchain.cer` file.
+For example, [acme.sh](https://acme.sh) provides server certificate and CA chains in `fullchain.cer` file.
This `fullchain.cer` should be renamed to `tls.crt` & certificate key file as `tls.key`.
Use `kubectl` with the `tls` secret type to create the secrets.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md
index c7b551267f3..bd77ce6a119 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md
@@ -1,8 +1,5 @@
---
title: Choosing a Rancher Version
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/server-tags
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
index 892d6ae6e76..5d5dee35d7c 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
@@ -1,9 +1,5 @@
---
title: About Custom CA Root Certificates
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/custom-ca-root-certificate/
- - /rancher/v2.0-v2.4/en/installation/resources/choosing-version/encryption/custom-ca-root-certificate
---
If you're using Rancher in an internal production environment where you aren't exposing apps publicly, use a certificate from a private certificate authority (CA).
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/helm-version-requirements.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/helm-version-requirements.md
index 94134b3f5ea..a281475b7b9 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/helm-version-requirements.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/helm-version-requirements.md
@@ -1,11 +1,5 @@
---
title: Helm Version Requirements
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm-version
- - /rancher/v2.0-v2.4/en/installation/options/helm2
- - /rancher/v2.0-v2.4/en/installation/options/helm2/helm-init
- - /rancher/v2.0-v2.4/en/installation/options/helm2/helm-rancher
---
This section contains the requirements for Helm, which is the tool used to install Rancher on a high-availability Kubernetes cluster.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/local-system-charts.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/local-system-charts.md
index 6e30255a119..f844065ed66 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/local-system-charts.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/local-system-charts.md
@@ -1,10 +1,5 @@
---
title: Setting up Local System Charts for Air Gapped Installations
-weight: 120
-aliases:
- - /rancher/v2.0-v2.4/en/installation/air-gap-single-node/config-rancher-system-charts/_index.md
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/config-rancher-system-charts/_index.md
- - /rancher/v2.0-v2.4/en/installation/options/local-system-charts
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md
index f6b30a398b7..4951198d00f 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md
@@ -1,6 +1,5 @@
---
title: Updating the Rancher Certificate
-weight: 10
---
# Updating a Private CA Certificate
@@ -76,7 +75,7 @@ Also get the version string of the currently deployed Rancher chart:
$ helm ls -A
```
-Upgrade the Helm application instance using the original configuration values and making sure to specify `ingress.tls.source=secret` as well as the current chart version to prevent an application upgrade.
+Upgrade the Helm application instance using the original configuration values and making sure to specify `ingress.tls.source=secret` as well as the current chart version to prevent an application upgrade.
If the certificate was signed by a private CA, add the `set privateCA=true` argument as well. Also make sure to read the documentation describing the initial installation using custom certificates.
@@ -207,7 +206,7 @@ Also get the version string of the currently deployed Rancher chart:
$ helm ls -A
```
-Upgrade the Helm application instance using the original configuration values and making sure to specify the current chart version to prevent an application upgrade.
+Upgrade the Helm application instance using the original configuration values and making sure to specify the current chart version to prevent an application upgrade.
Also make sure to read the documentation describing the initial installation using custom certificates.
@@ -219,9 +218,9 @@ helm upgrade rancher rancher-stable/rancher \
--set ...
```
-On upgrade, you can either
+On upgrade, you can either
-- remove `--set ingress.tls.source=secret \` from the Helm upgrade command, as shown above, or
+- remove `--set ingress.tls.source=secret \` from the Helm upgrade command, as shown above, or
- remove the `privateCA` parameter or set it to `false` because the CA is valid:
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/upgrade-cert-manager-helm-2.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/upgrade-cert-manager-helm-2.md
index aa78c36688a..d2b8ac19e51 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/upgrade-cert-manager-helm-2.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/upgrade-cert-manager-helm-2.md
@@ -1,10 +1,5 @@
---
title: Upgrading Cert-Manager with Helm 2
-weight: 2040
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/upgrading-cert-manager/helm-2-instructions
- - /rancher/v2.0-v2.4/en/installation/resources/choosing-version/encryption/upgrading-cert-manager/helm-2-instructions
- - /rancher/v2.x/en/installation/resources/upgrading-cert-manager/helm-2-instructions/
---
Rancher uses cert-manager to automatically generate and renew TLS certificates for HA deployments of Rancher. As of Fall 2019, three important changes to cert-manager are set to occur that you need to take action on if you have an HA deployment of Rancher:
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md
index e865ff13799..953f7bbcd8d 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md
@@ -1,10 +1,5 @@
---
title: Upgrading Cert-Manager
-weight: 4
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/upgrading-cert-manager
- - /rancher/v2.0-v2.4/en/installation/options/upgrading-cert-manager/helm-2-instructions
- - /rancher/v2.0-v2.4/en/installation/resources/encryption/upgrading-cert-manager
---
Rancher uses cert-manager to automatically generate and renew TLS certificates for HA deployments of Rancher. As of Fall 2019, three important changes to cert-manager are set to occur that you need to take action on if you have an HA deployment of Rancher:
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
index b21d00950fc..fdcd07955a1 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
@@ -1,6 +1,5 @@
---
title: Upgrading and Rolling Back Kubernetes
-weight: 70
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
index 810fa193368..e8dbb98f330 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
@@ -1,6 +1,5 @@
---
title: Upgrading Kubernetes without Upgrading Rancher
-weight: 1120
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/getting-started/introduction/overview.md b/versioned_docs/version-2.0-2.4/getting-started/introduction/overview.md
index f923dcd060b..22aa55bd068 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/introduction/overview.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/introduction/overview.md
@@ -1,7 +1,7 @@
---
title: Overview
-weight: 1
---
+
Rancher is a container management platform built for organizations that deploy containers in production. Rancher makes it easy to run Kubernetes everywhere, meet IT requirements, and empower DevOps teams.
# Run Kubernetes Everywhere
diff --git a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/cli.md b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/cli.md
index 198d810a0f2..5be7c897596 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/cli.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/cli.md
@@ -1,6 +1,5 @@
---
title: CLI with Rancher
-weight: 100
---
Interact with Rancher using command line interface (CLI) tools from your workstation.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/aws.md b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/aws.md
index a7b829710d7..e360c58aacf 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/aws.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/aws.md
@@ -1,7 +1,6 @@
---
title: Rancher AWS Quick Start Guide
description: Read this step by step Rancher AWS guide to quickly deploy a Rancher Server with a single node cluster attached.
-weight: 100
---
The following steps will quickly deploy a Rancher Server on AWS with a single node cluster attached.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/azure.md b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/azure.md
index db6e0c89eb6..b7d58557a12 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/azure.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/azure.md
@@ -1,7 +1,6 @@
---
title: Rancher Azure Quick Start Guide
description: Read this step by step Rancher Azure guide to quickly deploy a Rancher Server with a single node cluster attached.
-weight: 100
---
The following steps will quickly deploy a Rancher server on Azure in a single-node RKE Kubernetes cluster, with a single-node downstream Kubernetes cluster attached.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md
index 9dc4553dccc..517a9d9342f 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md
@@ -1,7 +1,6 @@
---
title: Rancher DigitalOcean Quick Start Guide
description: Read this step by step Rancher DigitalOcean guide to quickly deploy a Rancher Server with a single node cluster attached.
-weight: 100
---
The following steps will quickly deploy a Rancher Server on DigitalOcean with a single node cluster attached.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md
index 2e8838ced54..12337bcdb76 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md
@@ -1,7 +1,6 @@
---
title: Rancher GCP Quick Start Guide
description: Read this step by step Rancher GCP guide to quickly deploy a Rancher Server with a single node cluster attached.
-weight: 100
---
The following steps will quickly deploy a Rancher server on GCP in a single-node RKE Kubernetes cluster, with a single-node downstream Kubernetes cluster attached.
diff --git a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md
index 064f39ae9e4..fb4346ba3b8 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md
@@ -1,7 +1,7 @@
---
title: Manual Quick Start
-weight: 300
---
+
Howdy Partner! This tutorial walks you through:
- Installation of Rancher 2.x
diff --git a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md
index 6af812ede72..63647a811e7 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md
@@ -1,7 +1,7 @@
---
title: Vagrant Quick Start
-weight: 200
---
+
The following steps quickly deploy a Rancher Server with a single node cluster attached.
>**Note:** The intent of these guides is to quickly launch a sandbox that you can use to evaluate Rancher. These guides are not intended for production environments. For comprehensive setup instructions, see [Installation](../../../pages-for-subheaders/installation-and-upgrade.md).
diff --git a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-workloads/nodeports.md b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-workloads/nodeports.md
index f4a3364bacf..7d5cace4523 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-workloads/nodeports.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-workloads/nodeports.md
@@ -1,6 +1,5 @@
---
title: Workload with NodePort Quick Start
-weight: 200
---
### Prerequisite
diff --git a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md
index f35292de528..3a3524f76d8 100644
--- a/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md
+++ b/versioned_docs/version-2.0-2.4/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md
@@ -1,6 +1,5 @@
---
title: Workload with Ingress Quick Start
-weight: 100
---
### Prerequisite
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
index 687c1615853..32255d23c34 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
@@ -1,8 +1,5 @@
---
title: Configuring Active Directory (AD)
-weight: 1112
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/authentication/active-directory/
---
If your organization uses Microsoft Active Directory as central user repository, you can configure Rancher to communicate with an Active Directory server to authenticate users. This allows Rancher admins to control access to clusters and projects based on users and groups managed externally in the Active Directory, while allowing end-users to authenticate with their AD credentials when logging in to the Rancher UI.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
index e58a1b75f64..9176f4552e6 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
@@ -1,8 +1,5 @@
---
title: Configuring Azure AD
-weight: 1115
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/authentication/azure-ad/
---
_Available as of v2.0.3_
@@ -159,11 +156,11 @@ As your final step in Azure, copy the data that you'll use to configure Rancher

2. Copy the following endpoints to your clipboard and paste them into your [text file](#tip) (these values will be your Rancher endpoint values).
-
+
- **Microsoft Graph API endpoint** (Graph Endpoint)
- **OAuth 2.0 token endpoint (v1)** (Token Endpoint)
- **OAuth 2.0 authorization endpoint (v1)** (Auth Endpoint)
-
+
>**Note:** Copy the v1 version of the endpoints
### 6. Configure Azure AD in Rancher
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
index e45fb86808e..1c935111228 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
@@ -1,8 +1,5 @@
---
title: Configuring FreeIPA
-weight: 1114
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/authentication/freeipa/
---
_Available as of v2.0.5_
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
index 2b8e577a3bc..43b4f548ecd 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
@@ -1,8 +1,5 @@
---
title: Configuring GitHub
-weight: 1116
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/authentication/github/
---
In environments using GitHub, you can configure Rancher to allow sign on using GitHub credentials.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
index ae5fb3aaded..31593ebfacd 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
@@ -1,6 +1,7 @@
---
title: Configuring Google OAuth
---
+
_Available as of v2.3.0_
If your organization uses G Suite for user authentication, you can configure Rancher to allow your users to log in using their G Suite credentials.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak.md
index 44f4abcef02..987845ce8fc 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak.md
@@ -1,8 +1,8 @@
---
title: Configuring Keycloak (SAML)
description: Create a Keycloak SAML client and configure Rancher to work with Keycloak. By the end your users will be able to sign into Rancher using their Keycloak logins
-weight: 1200
---
+
_Available as of v2.1.0_
If your organization uses Keycloak Identity Provider (IdP) for user authentication, you can configure Rancher to allow your users to log in using their IdP credentials.
@@ -24,34 +24,34 @@ If your organization uses Keycloak Identity Provider (IdP) for user authenticati
>1: Optionally, you can enable either one or both of these settings.
>2: Rancher SAML metadata won't be generated until a SAML provider is configured and saved.
-
+

-
+
- In the new SAML client, create Mappers to expose the users fields
- Add all "Builtin Protocol Mappers"

- Create a new "Group list" mapper to map the member attribute to a user's groups
- 
+ 
- Export a `metadata.xml` file from your Keycloak client:
From the `Installation` tab, choose the `SAML Metadata IDPSSODescriptor` format option and download your file.
-
+
>**Note**
> Keycloak versions 6.0.0 and up no longer provide the IDP metadata under the `Installation` tab.
> You can still get the XML from the following url:
- >
+ >
> `https://{KEYCLOAK-URL}/auth/realms/{REALM-NAME}/protocol/saml/descriptor`
- >
+ >
> The XML obtained from this URL contains `EntitiesDescriptor` as the root element. Rancher expects the root element to be `EntityDescriptor` rather than `EntitiesDescriptor`. So before passing this XML to Rancher, follow these steps to adjust it:
- >
+ >
> * Copy all the attributes from `EntitiesDescriptor` to the `EntityDescriptor` that are not present.
> * Remove the `` tag from the beginning.
> * Remove the `` from the end of the xml.
- >
+ >
> You are left with something similar as the example below:
- >
+ >
> ```
>
- > ....
+ > ....
>
> ```
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
index a81a42aced5..3ebb92cb0c6 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
@@ -1,6 +1,5 @@
---
title: Configuring Okta (SAML)
-weight: 1210
---
_Available as of v2.2.0_
@@ -13,7 +12,7 @@ If your organization uses Okta Identity Provider (IdP) for user authentication,
In Okta, create a SAML Application with the settings below. See the [Okta documentation](https://developer.okta.com/standards/SAML/setting_up_a_saml_application_in_okta) for help.
-Setting | Value
+Setting | Value
------------|------------
`Single Sign on URL` | `https://yourRancherHostURL/v1-saml/okta/saml/acs`
`Audience URI (SP Entity ID)` | `https://yourRancherHostURL/v1-saml/okta/saml/metadata`
@@ -37,7 +36,7 @@ Setting | Value
| Metadata XML | The `Identity Provider metadata` file that you find in the application `Sign On` section. |
>**Tip:** You can generate a key/certificate pair using an openssl command. For example:
- >
+ >
> openssl req -x509 -sha256 -nodes -days 365 -newkey rsa:2048 -keyout myservice.key -out myservice.crt
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
index 91c22f0c15e..5c1c8d7e797 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
@@ -1,7 +1,7 @@
---
title: Configuring PingIdentity (SAML)
-weight: 1200
---
+
_Available as of v2.0.7_
If your organization uses Ping Identity Provider (IdP) for user authentication, you can configure Rancher to allow your users to log in using their IdP credentials.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
index 3b9e48c1538..c7bb63539fd 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
@@ -1,8 +1,5 @@
---
title: Local Authentication
-weight: 1111
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/authentication/local-authentication/
---
Local authentication is the default until you configure an external authentication provider. Local authentication is where Rancher stores the user information, i.e. names and passwords, of who can log in to Rancher. By default, the `admin` user that logs in to Rancher for the first time is a local user.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
index 864c7be106d..624898ddae8 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
@@ -1,6 +1,5 @@
---
title: Users and Groups
-weight: 1
---
Rancher relies on users and groups to determine who is allowed to log in to Rancher and which resources they can access. When you configure an external authentication provider, users from that provider will be able to log in to your Rancher server. When a user logs in, the authentication provider will supply your Rancher server with a list of groups to which the user belongs.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
index 13c946a6666..802245db536 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
@@ -1,66 +1,65 @@
---
title: 1. Configuring Microsoft AD FS for Rancher
-weight: 1205
---
-Before configuring Rancher to support AD FS users, you must add Rancher as a [relying party trust](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/technical-reference/understanding-key-ad-fs-concepts) in AD FS.
+Before configuring Rancher to support AD FS users, you must add Rancher as a [relying party trust](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/technical-reference/understanding-key-ad-fs-concepts) in AD FS.
1. Log into your AD server as an administrative user.
1. Open the **AD FS Management** console. Select **Add Relying Party Trust...** from the **Actions** menu and click **Start**.
-
+

1. Select **Enter data about the relying party manually** as the option for obtaining data about the relying party.

-
+
1. Enter your desired **Display name** for your Relying Party Trust. For example, `Rancher`.

-
+
1. Select **AD FS profile** as the configuration profile for your relying party trust.
-
+

-
+
1. Leave the **optional token encryption certificate** empty, as Rancher AD FS will not be using one.
-
+

-
+
1. Select **Enable support for the SAML 2.0 WebSSO protocol**
and enter `https:///v1-saml/adfs/saml/acs` for the service URL.
-
+

-
+
1. Add `https:///v1-saml/adfs/saml/metadata` as the **Relying party trust identifier**.
-
+

-
+
1. This tutorial will not cover multi-factor authentication; please refer to the [Microsoft documentation](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/operations/configure-additional-authentication-methods-for-ad-fs) if you would like to configure multi-factor authentication.
-
+

-
+
1. From **Choose Issuance Authorization RUles**, you may select either of the options available according to use case. However, for the purposes of this guide, select **Permit all users to access this relying party**.
-
+

1. After reviewing your settings, select **Next** to add the relying party trust.
-
+

-
+
1. Select **Open the Edit Claim Rules...** and click **Close**.
-
+

-
+
1. On the **Issuance Transform Rules** tab, click **Add Rule...**.
-
+

-
+
1. Select **Send LDAP Attributes as Claims** as the **Claim rule template**.

-
+
1. Set the **Claim rule name** to your desired name (for example, `Rancher Attributes`) and select **Active Directory** as the **Attribute store**. Create the following mapping to reflect the table below:
| LDAP Attribute | Outgoing Claim Type |
@@ -72,7 +71,7 @@ Before configuring Rancher to support AD FS users, you must add Rancher as a [re

-1. Download the `federationmetadata.xml` from your AD server at:
+1. Download the `federationmetadata.xml` from your AD server at:
```
https:///federationmetadata/2007-06/federationmetadata.xml
```
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
index 11deb4d2de0..c890013cdb1 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
@@ -1,13 +1,13 @@
---
title: 2. Configuring Rancher for Microsoft AD FS
-weight: 1205
---
+
_Available as of v2.0.7_
After you complete [Configuring Microsoft AD FS for Rancher](configure-ms-adfs-for-rancher.md), enter your AD FS information into Rancher to allow AD FS users to authenticate with Rancher.
>**Important Notes For Configuring Your AD FS Server:**
->
+>
>- The SAML 2.0 WebSSO Protocol Service URL is: `https:///v1-saml/adfs/saml/acs`
>- The Relying Party Trust identifier URL is: `https:///v1-saml/adfs/saml/metadata`
>- You must export the `federationmetadata.xml` file from your AD FS server. This can be found at: `https:///federationmetadata/2007-06/federationmetadata.xml`
@@ -19,13 +19,13 @@ After you complete [Configuring Microsoft AD FS for Rancher](configure-ms-adfs-f
1. Complete the **Configure AD FS Account** form. Microsoft AD FS lets you specify an existing Active Directory (AD) server. The [configuration section below](#configuration) describe how you can map AD attributes to fields within Rancher.
-
-
-
-
-
+
+
+
+
+
1. After you complete the **Configure AD FS Account** form, click **Authenticate with AD FS**, which is at the bottom of the page.
Rancher redirects you to the AD FS login page. Enter credentials that authenticate with Microsoft AD FS to validate your Rancher AD FS configuration.
@@ -47,7 +47,7 @@ After you complete [Configuring Microsoft AD FS for Rancher](configure-ms-adfs-f
| Metadata XML | The `federationmetadata.xml` file exported from your AD FS server.
You can find this file at `https:///federationmetadata/2007-06/federationmetadata.xml`. |
-
+
**Tip:** You can generate a certificate using an openssl command. For example:
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
index e1bca2e6d03..b91226c0fb0 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
@@ -1,11 +1,10 @@
---
title: Group Permissions with Shibboleth and OpenLDAP
-weight: 1
---
_Available as of Rancher v2.4_
-This page provides background information and context for Rancher users who intend to set up the Shibboleth authentication provider in Rancher.
+This page provides background information and context for Rancher users who intend to set up the Shibboleth authentication provider in Rancher.
Because Shibboleth is a SAML provider, it does not support searching for groups. While a Shibboleth integration can validate user credentials, it can't be used to assign permissions to groups in Rancher without additional configuration.
@@ -31,4 +30,3 @@ When a member of the OpenLDAP group logs in to Rancher, she is redirected to Shi
Shibboleth validates her credentials, and retrieves user attributes from OpenLDAP, including groups. Then Shibboleth sends a SAML assertion to Rancher including the user attributes. Rancher uses the group data so that she can access all of the resources and permissions that her groups have permissions for.

-
\ No newline at end of file
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
index e0a4f920328..4b2977e9704 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
@@ -1,6 +1,5 @@
---
title: Cluster Drivers
-weight: 1
---
_Available as of v2.2.0_
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
index c47ddbc51b0..8c702111360 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
@@ -1,9 +1,5 @@
---
title: Node Drivers
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/global-configuration/node-drivers/
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/node-drivers/
---
Node drivers are used to provision hosts, which Rancher uses to launch and manage Kubernetes clusters. A node driver is the same as a [Docker Machine driver](https://docs.docker.com/machine/drivers/). The availability of which node driver to display when creating node templates is defined based on the node driver's status. Only `active` node drivers will be displayed as an option for creating node templates. By default, Rancher is packaged with many existing Docker Machine drivers, but you can also create custom node drivers to add to Rancher.
@@ -29,7 +25,7 @@ By default, Rancher only activates drivers for the most popular cloud providers,
If you want to use a node driver that Rancher doesn't support out-of-the-box, you can add that provider's driver in order to start using them to create node templates and eventually node pools for your Kubernetes cluster.
-1. From the **Global** view, choose **Tools > Drivers** in the navigation bar. From the **Drivers** page, select the **Node Drivers** tab. In version before v2.2.0, you can select **Node Drivers** directly in the navigation bar.
+1. From the **Global** view, choose **Tools > Drivers** in the navigation bar. From the **Drivers** page, select the **Node Drivers** tab. In version before v2.2.0, you can select **Node Drivers** directly in the navigation bar.
2. Click **Add Node Driver**.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
index aa435277b72..4c104ac767b 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
@@ -1,6 +1,5 @@
---
title: Access and Sharing
-weight: 31
---
If you are an RKE template owner, you can share it with users or groups of users, who can then use the template to create clusters.
@@ -12,7 +11,7 @@ When you share a template, each user can have one of two access levels:
- **Owner:** This user can update, delete, and share the templates that they own. The owner can also share the template with other users.
- **User:** These users can create clusters using the template. They can also upgrade those clusters to new revisions of the same template. When you share a template as **Make Public (read-only),** all users in your Rancher setup have the User access level for the template.
-If you create a template, you automatically become an owner of that template.
+If you create a template, you automatically become an owner of that template.
If you want to delegate responsibility for updating the template, you can share ownership of the template. For details on how owners can modify templates, refer to the [documentation about revising templates.](manage-rke1-templates.md)
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
index b2a12927645..429dd0e96c3 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
@@ -1,6 +1,5 @@
---
title: Applying Templates
-weight: 50
---
You can create a cluster from an RKE template that you created, or from a template that has been [shared with you.](access-or-share-templates.md)
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
index 75dbd23828c..dcadeb51b2f 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
@@ -1,6 +1,5 @@
---
title: Template Creator Permissions
-weight: 10
---
Administrators have the permission to create RKE templates, and only administrators can give that permission to other users.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
index 5df3a1f5a19..b7fee55de3a 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
@@ -1,6 +1,5 @@
---
title: Template Enforcement
-weight: 32
---
This section describes how template administrators can enforce templates in Rancher, restricting the ability of users to create clusters without a template.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
index 1f6f907a2eb..9f4d719192e 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
@@ -1,6 +1,5 @@
---
title: Example Scenarios
-weight: 5
---
These example scenarios describe how an organization could use templates to standardize cluster creation.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
index 749f2173717..1a224d34b87 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
@@ -1,6 +1,5 @@
---
title: RKE Templates and Infrastructure
-weight: 90
---
In Rancher, RKE templates are used to provision Kubernetes and define Rancher settings, while node templates are used to provision nodes.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
index cc179d8b89a..6edd3902df7 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
@@ -1,6 +1,5 @@
---
title: Creating and Revising Templates
-weight: 32
---
This section describes how to manage RKE templates and revisions. You an create, share, update, and delete templates from the **Global** view under **Tools > RKE Templates.**
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
index 4fa8a4dbca0..a16c246d425 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
@@ -1,6 +1,5 @@
---
title: Overriding Template Settings
-weight: 33
---
When a user creates an RKE template, each setting in the template has a switch in the Rancher UI that indicates if users can override the setting. This switch marks those settings as **Allow User Override.**
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
index 29d218cc5ba..f400ea0d343 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
@@ -1,10 +1,5 @@
---
title: Pod Security Policies
-weight: 1135
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/global-configuration/pod-security-policies/
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/pod-security-policies/
- - /rancher/v2.0-v2.4/en/tasks/clusters/adding-a-pod-security-policy/
---
_Pod Security Policies_ (or PSPs) are objects that control security-sensitive aspects of pod specification (like root privileges).
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
index 471b48c892a..7c5eca369b1 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
@@ -1,7 +1,5 @@
---
title: Configuring a Global Default Private Registry
-weight: 400
-aliases:
---
You might want to use a private container registry to share your custom base images within your organization. With a private registry, you can keep a private, consistent, and centralized source of truth for the container images that are used in your clusters.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
index 3067a8c0328..238c3c19bd6 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
@@ -1,6 +1,5 @@
---
title: Cluster and Project Roles
-weight: 1127
---
Cluster and project roles define user authorization inside a cluster or project. You can manage these roles from the **Global > Security > Roles** page.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
index 26f11198257..920549e4989 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
@@ -1,8 +1,5 @@
---
title: Custom Roles
-weight: 1128
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/roles/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
index b2ae5dea843..e235d1df755 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
@@ -1,6 +1,5 @@
---
title: Global Permissions
-weight: 1126
---
_Permissions_ are individual access rights that you can assign when selecting a custom permission for a user.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
index 0929bca9c05..db5ea2811d8 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
@@ -1,6 +1,5 @@
---
title: Locked Roles
-weight: 1129
---
You can set roles to a status of `locked`. Locking roles prevent them from being assigned users in the future.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster-with-psp.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster-with-psp.md
index daee63644c7..a67d97fd2bc 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster-with-psp.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster-with-psp.md
@@ -1,15 +1,10 @@
---
title: Enable Istio with Pod Security Policies
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/setup/enable-istio-in-cluster/enable-istio-with-psp
- - /rancher/v2.0-v2.4/en/istio/legacy/setup/enable-istio-in-cluster/enable-istio-with-psp
- - /rancher/v2.0-v2.4/en/istio/v2.3.x-v2.4.x/setup/enable-istio-in-cluster/enable-istio-with-psp
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/setup/enable-istio-in-cluster/enable-istio-with-psp/
---
>**Note:** The following guide is only for RKE provisioned clusters.
-If you have restrictive Pod Security Policies enabled, then Istio may not be able to function correctly, because it needs certain permissions in order to install itself and manage pod infrastructure. In this section, we will configure a cluster with PSPs enabled for an Istio install, and also set up the Istio CNI plugin.
+If you have restrictive Pod Security Policies enabled, then Istio may not be able to function correctly, because it needs certain permissions in order to install itself and manage pod infrastructure. In this section, we will configure a cluster with PSPs enabled for an Istio install, and also set up the Istio CNI plugin.
The Istio CNI plugin removes the need for each application pod to have a privileged `NET_ADMIN` container. For further information, see the [Istio CNI Plugin docs](https://istio.io/docs/setup/additional-setup/cni). Please note that the [Istio CNI Plugin is in alpha](https://istio.io/about/feature-stages/).
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
index 463cf794df6..ab576bfd910 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
@@ -1,11 +1,5 @@
---
title: 1. Enable Istio in the Cluster
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/setup/enable-istio-in-cluster
- - /rancher/v2.0-v2.4/en/istio/legacy/setup/enable-istio-in-cluster
- - /rancher/v2.0-v2.4/en/istio/v2.3.x-v2.4.x/setup/enable-istio-in-cluster
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/setup/enable-istio-in-cluster/
---
This cluster uses the default Nginx controller to allow traffic into the cluster.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md
index ddc35756ceb..6ff01cc125a 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md
@@ -1,18 +1,12 @@
---
title: 2. Enable Istio in a Namespace
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/setup/enable-istio-in-namespace
- - /rancher/v2.0-v2.4/en/istio/legacy/setup/enable-istio-in-namespace
- - /rancher/v2.0-v2.4/en/istio/v2.3.x-v2.4.x/setup/enable-istio-in-namespace
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/setup/enable-istio-in-namespace/
---
You will need to manually enable Istio in each namespace that you want to be tracked or controlled by Istio. When Istio is enabled in a namespace, the Envoy sidecar proxy will be automatically injected into all new workloads that are deployed in the namespace.
This namespace setting will only affect new workloads in the namespace. Any preexisting workloads will need to be re-deployed to leverage the sidecar auto injection.
-> **Prerequisite:** To enable Istio in a namespace, the cluster must have Istio enabled.
+> **Prerequisite:** To enable Istio in a namespace, the cluster must have Istio enabled.
1. In the Rancher UI, go to the cluster view. Click the **Projects/Namespaces** tab.
1. Go to the namespace where you want to enable the Istio sidecar auto injection and click the **⋮.**
@@ -47,7 +41,7 @@ To add the annotation to a workload,
**Result:** The Istio sidecar will not be injected into the workload.
-> **NOTE:** If you are having issues with a Job you deployed not completing, you will need to add this annotation to your pod using the provided steps. Since Istio Sidecars run indefinitely, a Job cannot be considered complete even after its task has completed.
+> **NOTE:** If you are having issues with a Job you deployed not completing, you will need to add this annotation to your pod using the provided steps. Since Istio Sidecars run indefinitely, a Job cannot be considered complete even after its task has completed.
### [Next: Select the Nodes ](node-selectors.md)
\ No newline at end of file
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
index 566f6aef2c5..76103d2cc3e 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
@@ -1,11 +1,5 @@
---
title: 7. Generate and View Traffic
-weight: 7
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/setup/view-traffic
- - /rancher/v2.0-v2.4/en/istio/legacy/setup/view-traffic
- - /rancher/v2.0-v2.4/en/istio/v2.3.x-v2.4.x/setup/view-traffic
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/setup/view-traffic/
---
This section describes how to view the traffic that is being managed by Istio.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/node-selectors.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/node-selectors.md
index de315a961cc..ff1d63a0e3b 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/node-selectors.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/node-selectors.md
@@ -1,11 +1,5 @@
---
title: 3. Select the Nodes Where Istio Components Will be Deployed
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/setup/node-selectors
- - /rancher/v2.0-v2.4/en/istio/legacy/setup/node-selectors
- - /rancher/v2.0-v2.4/en/istio/v2.3.x-v2.4.x/setup/node-selectors
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/setup/node-selectors/
---
> **Prerequisite:** Your cluster needs a worker node that can designated for Istio. The worker node should meet the [resource requirements.](../../../explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md)
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md
index 1526f5a4d71..dabb8e75a81 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md
@@ -1,14 +1,8 @@
---
title: 5. Set up the Istio Gateway
-weight: 5
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/setup/gateway
- - /rancher/v2.0-v2.4/en/istio/legacy/setup/gateway
- - /rancher/v2.0-v2.4/en/istio/v2.3.x-v2.4.x/setup/gateway
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/setup/gateway/
---
-The gateway to each cluster can have its own port or load balancer, which is unrelated to a service mesh. By default, each Rancher-provisioned cluster has one NGINX ingress controller allowing traffic into the cluster.
+The gateway to each cluster can have its own port or load balancer, which is unrelated to a service mesh. By default, each Rancher-provisioned cluster has one NGINX ingress controller allowing traffic into the cluster.
You can use the NGINX ingress controller with or without Istio installed. If this is the only gateway to your cluster, Istio will be able to route traffic from service to service, but Istio will not be able to receive traffic from outside the cluster.
@@ -18,7 +12,7 @@ You will also need to set up a Kubernetes gateway for your services. This Kubern
You can route traffic into the service mesh with a load balancer or just Istio's NodePort gateway. This section describes how to set up the NodePort gateway.
-For more information on the Istio gateway, refer to the [Istio documentation.](https://istio.io/docs/reference/config/networking/v1alpha3/gateway/)
+For more information on the Istio gateway, refer to the [Istio documentation.](https://istio.io/docs/reference/config/networking/v1alpha3/gateway/)

@@ -109,7 +103,7 @@ To test and see if the BookInfo app deployed correctly, the app can be viewed a
To get the ingress gateway URL and port,
1. Go to the `System` project in your cluster.
-1. Within the `System` project, go to `Resources` > `Workloads` then scroll down to the `istio-system` namespace.
+1. Within the `System` project, go to `Resources` > `Workloads` then scroll down to the `istio-system` namespace.
1. Within `istio-system`, there is a workload named `istio-ingressgateway`. Under the name of this workload, you should see links, such as `80/tcp`.
1. Click one of those links. This should show you the URL of the ingress gateway in your web browser. Append `/productpage` to the URL.
@@ -128,7 +122,7 @@ You can try the steps in this section to make sure the Kubernetes gateway is con
In the gateway resource, the selector refers to Istio's default ingress controller by its label, in which the key of the label is `istio` and the value is `ingressgateway`. To make sure the label is appropriate for the gateway, do the following:
1. Go to the `System` project in your cluster.
-1. Within the `System` project, go to the namespace `istio-system`.
+1. Within the `System` project, go to the namespace `istio-system`.
1. Within `istio-system`, there is a workload named `istio-ingressgateway`.
1. Click the name of this workload and go to the **Labels and Annotations** section. You should see that it has the key `istio` and the value `ingressgateway`. This confirms that the selector in the Gateway resource matches Istio's default ingress controller.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md
index be98965cf9b..6255a767576 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md
@@ -1,11 +1,5 @@
---
title: 6. Set up Istio's Components for Traffic Management
-weight: 6
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/setup/set-up-traffic-management
- - /rancher/v2.0-v2.4/en/istio/legacy/setup/set-up-traffic-management
- - /rancher/v2.0-v2.4/en/istio/v2.3.x-v2.4.x/setup/set-up-traffic-management
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/setup/set-up-traffic-management/
---
A central advantage of traffic management in Istio is that it allows dynamic request routing. Some common applications for dynamic request routing include canary deployments and blue/green deployments. The two key resources in Istio traffic management are *virtual services* and *destination rules*.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md
index 68d1a60df1e..9e0de0f856c 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md
@@ -1,14 +1,8 @@
---
title: 4. Add Deployments and Services with the Istio Sidecar
-weight: 4
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/setup/deploy-workloads
- - /rancher/v2.0-v2.4/en/istio/legacy/setup/deploy-workloads
- - /rancher/v2.0-v2.4/en/istio/v2.3.x-v2.4.x/setup/deploy-workloads
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/setup/deploy-workloads/
---
-> **Prerequisite:** To enable Istio for a workload, the cluster and namespace must have Istio enabled.
+> **Prerequisite:** To enable Istio for a workload, the cluster and namespace must have Istio enabled.
Enabling Istio in a namespace only enables automatic sidecar injection for new workloads. To enable the Envoy sidecar for existing workloads, you need to enable it manually for each workload.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
index c5ca26f6d6d..381d0ca6315 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
@@ -1,10 +1,5 @@
---
title: Adding Users to Clusters
-weight: 2020
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/clusters/adding-managing-cluster-members/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/cluster-members/
- - /rancher/v2.0-v2.4/en/cluster-admin/cluster-members
---
If you want to provide a user with access and permissions to _all_ projects, nodes, and resources within a cluster, assign the user a cluster membership.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
index 2a1cbab7f70..fc848232671 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
@@ -1,6 +1,5 @@
---
title: How the Authorized Cluster Endpoint Works
-weight: 2015
---
This section describes how the kubectl CLI, the kubeconfig file, and the authorized cluster endpoint work together to allow you to access a downstream Kubernetes cluster directly, without authenticating through the Rancher server. It is intended to provide background information and context to the instructions for [how to set up kubectl to directly access a cluster.](use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster)
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
index b686020fe3f..3dad3b8b4e3 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
@@ -1,13 +1,6 @@
---
title: "Access a Cluster with Kubectl and kubeconfig"
description: "Learn how you can access and manage your Kubernetes clusters using kubectl with kubectl Shell or with kubectl CLI and kubeconfig file. A kubeconfig file is used to configure access to Kubernetes. When you create a cluster with Rancher, it automatically creates a kubeconfig for your cluster."
-weight: 2010
-aliases:
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/kubectl/
- - /rancher/v2.0-v2.4/en/cluster-admin/kubectl
- - /rancher/v2.0-v2.4/en/concepts/clusters/kubeconfig-files/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/kubeconfig/
- - /rancher/2.x/en/cluster-admin/kubeconfig
---
This section describes how to manipulate your downstream Kubernetes cluster with kubectl from the Rancher UI or from your workstation.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
index ca7ead1b75a..c04d124b489 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
@@ -1,9 +1,8 @@
---
title: Adding a Pod Security Policy
-weight: 80
---
-> **Prerequisite:** The options below are available only for clusters that are [launched using RKE.](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md)
+> **Prerequisite:** The options below are available only for clusters that are [launched using RKE.](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md)
When your cluster is running pods with security-sensitive configurations, assign it a [pod security policy](../authentication-permissions-and-global-configuration/create-pod-security-policies.md), which is a set of rules that monitors the conditions and settings in your pods. If a pod doesn't meet the rules specified in your policy, the policy stops it from running.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
index a3a955ed025..72cd255f22e 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
@@ -1,6 +1,5 @@
---
title: Assigning Pod Security Policies
-weight: 2260
---
_Pod Security Policies_ are objects that control security-sensitive aspects of pod specification (like root privileges).
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/backing-up-etcd.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/backing-up-etcd.md
index 5293be13f3c..50de7b1edf1 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/backing-up-etcd.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/backing-up-etcd.md
@@ -1,6 +1,5 @@
---
title: Backing up a Cluster
-weight: 2045
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
index e9d53423448..7f3640fab69 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
@@ -1,7 +1,6 @@
---
title: Removing Kubernetes Components from Nodes
description: Learn about cluster cleanup when removing nodes from your Rancher-launched Kubernetes cluster. What is removed, how to do it manually
-weight: 2055
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
index e787c544fd2..fbd55516d86 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
@@ -1,8 +1,5 @@
---
title: Cloning Clusters
-weight: 2035
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-provisioning/cloning-clusters/
---
If you have a cluster in Rancher that you want to use as a template for creating similar clusters, you can use Rancher CLI to clone the cluster's configuration, edit it, and then use it to quickly launch the cloned cluster.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
index fbafbeffe4a..83cadc01a34 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
@@ -1,6 +1,5 @@
---
title: GlusterFS Volumes
-weight: 5000
---
> This section only applies to [RKE clusters.](../../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md)
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
index 131cd7dda3f..bdfcd57913d 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
@@ -1,8 +1,5 @@
---
title: How Persistent Storage Works
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/workloads/add-persistent-volume-claim
---
A persistent volume (PV) is a piece of storage in the Kubernetes cluster, while a persistent volume claim (PVC) is a request for storage.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
index 9b5ccfaaa4b..f1398680b66 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
@@ -1,6 +1,5 @@
---
title: Dynamically Provisioning New Storage in Rancher
-weight: 2
---
This section describes how to provision new persistent storage for workloads in Rancher.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
index 2c82e065479..2cae40c7957 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
@@ -1,6 +1,5 @@
---
title: iSCSI Volumes
-weight: 6000
---
In [Rancher Launched Kubernetes clusters](../../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) that store data on iSCSI volumes, you may experience an issue where kubelets fail to automatically connect with iSCSI volumes. This failure is likely due to an incompatibility issue involving the iSCSI initiator tool. You can resolve this issue by installing the iSCSI initiator tool on each of your cluster nodes.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
index c21fb887ce9..fb39b6f18a5 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
@@ -1,6 +1,5 @@
---
title: Setting up Existing Storage
-weight: 1
---
This section describes how to set up existing persistent storage for workloads in Rancher.
@@ -23,9 +22,9 @@ To set up storage, follow these steps:
Creating a persistent volume in Rancher will not create a storage volume. It only creates a Kubernetes resource that maps to an existing volume. Therefore, before you can create a persistent volume as a Kubernetes resource, you must have storage provisioned.
-The steps to set up a persistent storage device will differ based on your infrastructure. We provide examples of how to set up storage using [vSphere,](../provisioning-storage-examples/vsphere-storage.md) [NFS,](../provisioning-storage-examples/nfs-storage.md) or Amazon's [EBS.](../provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)
+The steps to set up a persistent storage device will differ based on your infrastructure. We provide examples of how to set up storage using [vSphere,](../provisioning-storage-examples/vsphere-storage.md) [NFS,](../provisioning-storage-examples/nfs-storage.md) or Amazon's [EBS.](../provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)
-If you have a pool of block storage, and you don't want to use a cloud provider, Longhorn could help you provide persistent storage to your Kubernetes cluster.
+If you have a pool of block storage, and you don't want to use a cloud provider, Longhorn could help you provide persistent storage to your Kubernetes cluster.
### 2. Add a persistent volume that refers to the persistent storage
@@ -57,7 +56,7 @@ These steps describe how to set up a PVC in the namespace where your stateful wo
1. Go to the project containing a workload that you want to add a persistent volume claim to.
-1. Then click the **Volumes** tab and click **Add Volume**. (In versions before v2.3.0, click **Workloads** on the main navigation bar, then **Volumes.**)
+1. Then click the **Volumes** tab and click **Add Volume**. (In versions before v2.3.0, click **Workloads** on the main navigation bar, then **Volumes.**)
1. Enter a **Name** for the volume claim.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
index fa962766337..6282fb5e0b2 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
@@ -1,8 +1,5 @@
---
title: NFS Storage
-weight: 3054
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/clusters/adding-storage/provisioning-storage/nfs/
---
Before you can use the NFS storage volume plug-in with Rancher deployments, you need to provision an NFS server.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
index b5a5788c3c5..a9e3e200de1 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
@@ -1,6 +1,5 @@
---
title: Creating Persistent Storage in Amazon's EBS
-weight: 3053
---
This section describes how to set up Amazon's Elastic Block Store in EC2.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
index cca3afc9b9e..1d328a48d53 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
@@ -1,8 +1,5 @@
---
title: vSphere Storage
-weight: 3055
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/clusters/adding-storage/provisioning-storage/vsphere/
---
To provide stateful workloads with vSphere storage, we recommend creating a vSphereVolume StorageClass. This practice dynamically provisions vSphere storage when workloads request volumes through a [persistent volume claim](../../../../../pages-for-subheaders/create-kubernetes-persistent-storage.md).
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
index c9f834b9181..845235fbb0a 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
@@ -1,6 +1,5 @@
---
title: Cluster Autoscaler with AWS EC2 Auto Scaling Groups
-weight: 1
---
This guide will show you how to install and use [Kubernetes cluster-autoscaler](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/) on Rancher custom clusters using AWS EC2 Auto Scaling Groups.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
index 2c9b78c2316..54fc4609406 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
@@ -1,6 +1,5 @@
---
title: Nodes and Node Pools
-weight: 2030
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
index 4f05ad22973..baf222a9d1c 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
@@ -1,12 +1,6 @@
---
title: Projects and Kubernetes Namespaces with Rancher
description: Rancher Projects ease the administrative burden of your cluster and support multi-tenancy. Learn to create projects and divide projects into Kubernetes namespaces
-weight: 2032
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/projects/
- - /rancher/v2.0-v2.4/en/tasks/projects/
- - /rancher/v2.0-v2.4/en/tasks/projects/create-project/
- - /rancher/v2.0-v2.4/en/tasks/projects/create-project/
---
A namespace is a Kubernetes concept that allows a virtual cluster within a cluster, which is useful for dividing the cluster into separate "virtual clusters" that each have their own access control and resource quotas.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/restoring-etcd.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/restoring-etcd.md
index ea5ebc8cb3c..bc1d1f3bd8a 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/restoring-etcd.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/restoring-etcd.md
@@ -1,6 +1,5 @@
---
title: Restoring a Cluster from Backup
-weight: 2050
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
index 357ab776e07..9c9261cf51a 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
@@ -1,6 +1,5 @@
---
title: Certificate Rotation
-weight: 2040
---
> **Warning:** Rotating Kubernetes certificates may result in your cluster being temporarily unavailable as components are restarted. For production environments, it's recommended to perform this action during a maintenance window.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
index 5ee15ee8042..26aff08fa38 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
@@ -1,9 +1,5 @@
---
title: Adding Users to Projects
-weight: 2505
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/projects/add-project-members/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/projects-and-namespaces/project-members/
---
If you want to provide a user with access and permissions to _specific_ projects and resources within a cluster, assign the user a project membership.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md
index 8196ec792f7..a52e1cb135c 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md
@@ -1,11 +1,6 @@
---
title: Rancher's CI/CD Pipelines
description: Use Rancher’s CI/CD pipeline to automatically checkout code, run builds or scripts, publish Docker images, and deploy software to users
-weight: 4000
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/ci-cd-pipelines/
- - /rancher/v2.0-v2.4/en/tasks/pipelines/
- - /rancher/v2.0-v2.4/en/tools/pipelines/configurations/
---
Using Rancher, you can integrate with a GitHub repository to setup a continuous integration (CI) pipeline.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
index 529043a2487..2bbd0d060d0 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
@@ -1,6 +1,5 @@
---
title: Namespaces
-weight: 2520
---
Within Rancher, you can further divide projects into different [namespaces](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/), which are virtual clusters within a project backed by a physical cluster. Should you require another level of organization beyond projects and the `default` namespace, you can use multiple namespaces to isolate applications and resources.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
index 1eb528cbbe4..fe08d0afe49 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
@@ -1,16 +1,15 @@
---
title: Pod Security Policies
-weight: 5600
---
-> These cluster options are only available for [clusters in which Rancher has launched Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md).
+> These cluster options are only available for [clusters in which Rancher has launched Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md).
You can always assign a pod security policy (PSP) to an existing project if you didn't assign one during creation.
### Prerequisites
- Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies](../authentication-permissions-and-global-configuration/create-pod-security-policies.md).
-- Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [the documentation about adding a pod security policy to a cluster](../manage-clusters/add-a-pod-security-policy.md).
+- Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [the documentation about adding a pod security policy to a cluster](../manage-clusters/add-a-pod-security-policy.md).
### Applying a Pod Security Policy
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
index 349dbf5d032..640e612dbc1 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
@@ -1,6 +1,5 @@
---
title: How Resource Quotas Work in Rancher Projects
-weight: 1
---
Resource quotas in Rancher include the same functionality as the [native version of Kubernetes](https://kubernetes.io/docs/concepts/policy/resource-quotas/). However, in Rancher, resource quotas have been extended so that you can apply them to projects.
@@ -25,7 +24,7 @@ The resource quota includes two limits, which you set while creating or editing
- **Namespace Default Limits:**
This value is the default resource limit available for each namespace. When the resource quota is created at the project level, this limit is automatically propagated to each namespace in the project. Each namespace is bound to this default limit unless you override it.
-
+
In the following diagram, a Rancher administrator wants to apply a resource quota that sets the same CPU and memory limit for every namespace in their project (`Namespace 1-4`). However, in Rancher, the administrator can set a resource quota for the project (`Project Resource Quota`) rather than individual namespaces. This quota includes resource limits for both the entire project (`Project Limit`) and individual namespaces (`Namespace Default Limit`). Rancher then propagates the `Namespace Default Limit` quotas to each namespace (`Namespace Resource Quota`) when created.
Rancher: Resource Quotas Propagating to Each Namespace
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
index 6fb96774ef3..d0bb519de80 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
@@ -1,6 +1,5 @@
---
title: Overriding the Default Limit for a Namespace
-weight: 2
---
Although the **Namespace Default Limit** propagates from the project to each namespace when created, in some cases, you may need to increase (or decrease) the quotas for a specific namespace. In this situation, you can override the default limits by editing the namespace.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md
index 18005bc817a..4a67e20a9bd 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md
@@ -1,6 +1,5 @@
---
title: Resource Quota Type Reference
-weight: 4
---
When you create a resource quota, you are configuring the pool of resources available to the project. You can set the following resource limits for the following resource types.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md
index 4ea90a310f7..c1fecad9624 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md
@@ -1,6 +1,5 @@
---
title: Setting Container Default Resource Limits
-weight: 3
---
_Available as of v2.2.0_
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md
index 3b566170c4f..94d21b5d85a 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md
@@ -1,15 +1,5 @@
---
title: Backing up Rancher Installed with Docker
-shortTitle: Docker Installs
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/installation/after-installation/single-node-backup-and-restoration/
- - /rancher/v2.0-v2.4/en/installation/after-installation/single-node-backup-and-restoration/
- - /rancher/v2.0-v2.4/en/backups/backups/single-node-backups/
- - /rancher/v2.0-v2.4/en/backups/legacy/backup/single-node-backups/
- - /rancher/v2.0-v2.4/en/backups/v2.0.x-v2.4.x/backup/docker-backups
- - /rancher/v2.0-v2.4/en/installation/backups-and-restoration/single-node-backup-and-restoration/
- - /rancher/v2.x/en/backups/v2.0.x-v2.4.x/backup/docker-backups/
---
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-k3s-installed-rancher.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-k3s-installed-rancher.md
index cd1e23e79bf..e82e4ace6c6 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-k3s-installed-rancher.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-k3s-installed-rancher.md
@@ -1,15 +1,5 @@
---
title: Backing up Rancher Installed on a K3s Kubernetes Cluster
-shortTitle: K3s Installs
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/backups/backups/k3s-backups
- - /rancher/v2.0-v2.4/en/backups/backups/k8s-backups/k3s-backups
- - /rancher/v2.0-v2.4/en/backups/legacy/backup/k8s-backups/k3s-backups/
- - /rancher/v2.0-v2.4/en/backups/legacy/backups/k3s-backups
- - /rancher/v2.0-v2.4/en/backups/legacy/backup/k3s-backups
- - /rancher/v2.0-v2.4/en/backups/v2.0.x-v2.4.x/backup/k3s-backups
- - /rancher/v2.x/en/backups/v2.0.x-v2.4.x/backup/k3s-backups/
---
When Rancher is installed on a high-availability Kubernetes cluster, we recommend using an external database to store the cluster data.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md
index 41b067689eb..4a65f33cd8c 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md
@@ -1,17 +1,5 @@
---
title: Backing up Rancher Installed on an RKE Kubernetes Cluster
-shortTitle: RKE Installs
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/installation/after-installation/k8s-install-backup-and-restoration/
- - /rancher/v2.0-v2.4/en/installation/backups-and-restoration/ha-backup-and-restoration/
- - /rancher/v2.0-v2.4/en/backups/backups/ha-backups
- - /rancher/v2.0-v2.4/en/backups/backups/k8s-backups/ha-backups
- - /rancher/v2.0-v2.4/en/backups/legacy/backup/k8s-backups/ha-backups/
- - /rancher/v2.0-v2.4/en/backups/legacy/backups/ha-backups
- - /rancher/v2.0-v2.4/en/backups/legacy/backup/ha-backups
- - /rancher/v2.0-v2.4/en/backups/v2.0.x-v2.4.x/backup/rke-backups
- - /rancher/v2.x/en/backups/v2.0.x-v2.4.x/backup/rke-backups/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md
index 6ddd2e9bb64..5b4dddb4083 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md
@@ -1,12 +1,5 @@
---
title: Restoring Backups—Docker Installs
-shortTitle: Docker Installs
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/installation/after-installation/single-node-backup-and-restoration/
- - /rancher/v2.0-v2.4/en/backups/restorations/single-node-restoration
- - /rancher/v2.0-v2.4/en/backups/v2.0.x-v2.4.x/restore/docker-restores
- - /rancher/v2.x/en/backups/v2.0.x-v2.4.x/restore/docker-restores/
---
If you encounter a disaster scenario, you can restore your Rancher Server to your most recent backup.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-k3s-installed-rancher.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-k3s-installed-rancher.md
index 2336cdcb398..2d0a02d7edd 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-k3s-installed-rancher.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-k3s-installed-rancher.md
@@ -1,14 +1,5 @@
---
title: Restoring Rancher Installed on a K3s Kubernetes Cluster
-shortTitle: K3s Installs
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/backups/restorations/k3s-restoration
- - /rancher/v2.0-v2.4/en/backups/restorations/k8s-restore/k3s-restore
- - /rancher/v2.0-v2.4/en/backups/legacy/restore/k8s-restore/k3s-restore/
- - /rancher/v2.0-v2.4/en/backups/legacy/restore/k3s-restore
- - /rancher/v2.0-v2.4/en/backups/v2.0.x-v2.4.x/restore/k3s-restore
- - /rancher/v2.x/en/backups/v2.0.x-v2.4.x/restore/k3s-restore/
---
When Rancher is installed on a high-availability Kubernetes cluster, we recommend using an external database to store the cluster data.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
index 35c008542ac..073b4ae43f6 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
@@ -1,15 +1,5 @@
---
title: Restoring Backups—Kubernetes installs
-shortTitle: RKE Installs
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/installation/after-installation/ha-backup-and-restoration/
- - /rancher/v2.0-v2.4/en/backups/restorations/ha-restoration
- - /rancher/v2.0-v2.4/en/backups/restorations/k8s-restore/rke-restore
- - /rancher/v2.0-v2.4/en/backups/legacy/restore/k8s-restore/rke-restore/
- - /rancher/v2.0-v2.4/en/backups/legacy/restore/rke-restore
- - /rancher/v2.0-v2.4/en/backups/v2.0.x-v2.4.x/restore/rke-restore
- - /rancher/v2.x/en/backups/v2.0.x-v2.4.x/restore/rke-restore/
---
This procedure describes how to use RKE to restore a snapshot of the Rancher Kubernetes cluster.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup/roll-back-to-v2.0-v2.1.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup/roll-back-to-v2.0-v2.1.md
index 1c990277d36..c3d28ea4fa4 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup/roll-back-to-v2.0-v2.1.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup/roll-back-to-v2.0-v2.1.md
@@ -1,8 +1,5 @@
---
title: "Rolling back to v2.0.0-v2.1.5"
-weight: 1
-aliases:
- - /rancher/v2.x/en/backups/v2.0.x-v2.4.x/restore/rke-restore/v2.0-v2.1/
---
> Rolling back to Rancher v2.0-v2.1 is no longer supported. The instructions for rolling back to these versions are preserved here and are intended to be used only in cases where upgrading to Rancher v2.2+ is not feasible.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/deploy-apps-across-clusters.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/deploy-apps-across-clusters.md
index ddb9d204f10..6a185c3c7b4 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/deploy-apps-across-clusters.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/deploy-apps-across-clusters.md
@@ -1,8 +1,5 @@
---
title: Deploying Applications across Clusters
-weight: 13
-aliases:
- - /rancher/v2.0-v2.4/en/deploy-across-clusters/multi-cluster-apps
---
_Available as of v2.2.0_
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/adding-catalogs.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/adding-catalogs.md
index d2e2617642e..df8f507b15c 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/adding-catalogs.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/adding-catalogs.md
@@ -1,12 +1,5 @@
---
title: Creating Custom Catalogs
-weight: 200
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/catalog/adding-custom-catalogs/
- - /rancher/v2.0-v2.4/en/catalog/custom/adding
- - /rancher/v2.0-v2.4/en/catalog/adding-catalogs
- - /rancher/v2.0-v2.4/en/catalog/custom/
- - /rancher/v2.0-v2.4/en/helm-charts/legacy-catalogs/adding-catalogs
---
Custom catalogs can be added into Rancher at a global scope, cluster scope, or project scope.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/built-in.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/built-in.md
index f0a544b841c..27518ecaa15 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/built-in.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/built-in.md
@@ -1,10 +1,5 @@
---
title: Enabling and Disabling Built-in Global Catalogs
-weight: 100
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/catalog/enabling-default-catalogs/
- - /rancher/v2.0-v2.4/en/catalog/built-in
- - /rancher/v2.0-v2.4/en/helm-charts/legacy-catalogs/built-in
---
There are default global catalogs packaged as part of Rancher.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/catalog-config.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/catalog-config.md
index 94e2031e575..5b70a79e345 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/catalog-config.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/catalog-config.md
@@ -1,10 +1,5 @@
---
title: Custom Catalog Configuration Reference
-weight: 300
-aliases:
- - /rancher/v2.0-v2.4/en/catalog/catalog-config
- - /rancher/v2.0-v2.4/en/catalog/catalog-config
- - /rancher/v2.0-v2.4/en/helm-charts/legacy-catalogs/catalog-config
---
Any user can create custom catalogs to add into Rancher. Besides the content of the catalog, users must ensure their catalogs are able to be added into Rancher.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/creating-apps.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/creating-apps.md
index 0afe9a8dd10..cf9ef65a5b9 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/creating-apps.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/creating-apps.md
@@ -1,12 +1,5 @@
---
title: Creating Catalog Apps
-weight: 400
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/catalog/customizing-charts/
- - /rancher/v2.0-v2.4/en/catalog/custom/creating
- - /rancher/v2.0-v2.4/en/catalog/custom
- - /rancher/v2.0-v2.4/en/catalog/creating-apps
- - /rancher/v2.0-v2.4/en/helm-charts/legacy-catalogs/creating-apps
---
Rancher's catalog service requires any custom catalogs to be structured in a specific format for the catalog service to be able to leverage it in Rancher.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/globaldns.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/globaldns.md
index 83be0590a36..3e396621264 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/globaldns.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/globaldns.md
@@ -1,9 +1,5 @@
---
title: Global DNS
-weight: 5010
-aliases:
- - /rancher/v2.0-v2.4/en/catalog/globaldns
- - /rancher/v2.0-v2.4/en/helm-charts/legacy-catalogs/globaldns
---
_Available as of v2.2.0_
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/launching-apps.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/launching-apps.md
index d37f4918324..1517c1ebd16 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/launching-apps.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/launching-apps.md
@@ -1,9 +1,5 @@
---
title: Launching Catalog Apps
-weight: 700
-aliases:
- - /rancher/v2.0-v2.4/en/catalog/launching-apps
- - /rancher/v2.0-v2.4/en/helm-charts/legacy-catalogs/launching-apps
---
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/managing-apps.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/managing-apps.md
index 1cd619356df..03fd62432ec 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/managing-apps.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/managing-apps.md
@@ -1,9 +1,5 @@
---
title: Managing Catalog Apps
-weight: 500
-aliases:
- - /rancher/v2.0-v2.4/en/catalog/managing-apps
- - /rancher/v2.0-v2.4/en/helm-charts/legacy-catalogs/managing-apps
---
After deploying an application, one of the benefits of using an application versus individual workloads/resources is the ease of being able to manage many workloads/resources applications. Apps can be cloned, upgraded or rolled back.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/multi-cluster-apps.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/multi-cluster-apps.md
index 8e3204fd44c..bfa5096bd65 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/multi-cluster-apps.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/multi-cluster-apps.md
@@ -1,9 +1,5 @@
---
title: Multi-Cluster Apps
-weight: 600
-aliases:
- - /rancher/v2.0-v2.4/en/catalog/multi-cluster-apps
- - /rancher/v2.0-v2.4/en/helm-charts/legacy-catalogs/multi-cluster-apps
---
_Available as of v2.2.0_
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/tutorial.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/tutorial.md
index 4f995fc7958..704b9b01ed4 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/tutorial.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/helm-charts-in-rancher/tutorial.md
@@ -1,9 +1,5 @@
---
title: "Tutorial: Example Custom Chart Creation"
-weight: 800
-aliases:
- - /rancher/v2.0-v2.4/en/catalog/tutorial
- - /rancher/v2.0-v2.4/en/helm-charts/legacy-catalogs/tutorial
---
In this tutorial, you'll learn how to create a Helm chart and deploy it to a repository. The repository can then be used as a source for a custom catalog in Rancher.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md
index 0586afbd701..daf5fd980be 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md
@@ -1,10 +1,5 @@
---
title: Setting up Amazon ELB Network Load Balancer
-weight: 5
-aliases:
- - /rancher/v2.0-v2.4/en/installation/ha/create-nodes-lb/nlb
- - /rancher/v2.0-v2.4/en/installation/k8s-install/create-nodes-lb/nlb
- - /rancher/v2.0-v2.4/en/installation/options/nlb
---
This how-to guide describes how to set up a Network Load Balancer (NLB) in Amazon's EC2 service that will direct traffic to multiple instances on EC2.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
index 9d7d8c8822c..df7751bb03f 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
@@ -1,6 +1,5 @@
---
title: 'Set up Infrastructure for a High Availability K3s Kubernetes Cluster'
-weight: 1
---
This tutorial is intended to help you provision the underlying infrastructure for a Rancher management server.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
index 85ffafb4b42..64e7d5687a2 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
@@ -1,6 +1,5 @@
---
title: 'Set up Infrastructure for a High Availability RKE Kubernetes Cluster'
-weight: 2
---
This tutorial is intended to help you create a high-availability RKE cluster that can be used to install a Rancher server.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md
index c56672ef429..582007e1fc7 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md
@@ -1,8 +1,5 @@
---
title: Setting up a MySQL Database in Amazon RDS
-weight: 4
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/rds
---
This tutorial describes how to set up a MySQL database in Amazon's RDS.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md
index 99c4f267af3..371508a94c3 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md
@@ -1,8 +1,5 @@
---
title: Setting up an NGINX Load Balancer
-weight: 4
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/nginx
---
NGINX will be configured as Layer 4 load balancer (TCP) that forwards connections to one of your Rancher nodes.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md
index 32ceb47c91b..e31e6019e3a 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md
@@ -1,8 +1,5 @@
---
title: Setting up Nodes in Amazon EC2
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/ec2-node
---
In this tutorial, you will learn one way to set up Linux nodes for the Rancher management server. These nodes will fulfill the node requirements for [OS, Docker, hardware, and networking.](../../../pages-for-subheaders/installation-requirements.md)
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md
index 77640ef7f3d..dac6692ad2c 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md
@@ -1,6 +1,5 @@
---
title: About High-availability Installations
-weight: 1
---
We recommend using Helm, a Kubernetes package manager, to install Rancher on a dedicated Kubernetes cluster. This is called a high-availability Kubernetes installation because increased availability is achieved by running Rancher on multiple nodes.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md
index ef6e6daa845..34098280ba5 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md
@@ -1,7 +1,5 @@
---
title: Setting up a High-availability K3s Kubernetes Cluster for Rancher
-shortTitle: Set up K3s for Rancher
-weight: 2
---
This section describes how to install a Kubernetes cluster according to the [best practices for the Rancher server environment.](../../../reference-guides/rancher-manager-architecture/architecture-recommendations.md#environment-for-kubernetes-installations)
@@ -53,7 +51,7 @@ Then you should see two nodes with the master role:
ubuntu@ip-172-31-60-194:~$ sudo k3s kubectl get nodes
NAME STATUS ROLES AGE VERSION
ip-172-31-60-194 Ready master 44m v1.17.2+k3s1
-ip-172-31-63-88 Ready master 6m8s v1.17.2+k3s1
+ip-172-31-63-88 Ready master 6m8s v1.17.2+k3s1
```
Then test the health of the cluster pods:
@@ -67,7 +65,7 @@ sudo k3s kubectl get pods --all-namespaces
When you installed K3s on each Rancher server node, a `kubeconfig` file was created on the node at `/etc/rancher/k3s/k3s.yaml`. This file contains credentials for full access to the cluster, and you should save this file in a secure location.
-To use this `kubeconfig` file,
+To use this `kubeconfig` file,
1. Install [kubectl,](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl) a Kubernetes command-line tool.
2. Copy the file at `/etc/rancher/k3s/k3s.yaml` and save it to the directory `~/.kube/config` on your local machine.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
index 78a943e3a6b..75fab19826f 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
@@ -1,9 +1,5 @@
---
title: Setting up a High-availability RKE Kubernetes Cluster
-shortTitle: Set up RKE Kubernetes
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/installation/k8s-install/kubernetes-rke
---
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md
index 4efca77715d..814fdcc7b8e 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md
@@ -1,15 +1,14 @@
---
title: Recommended Cluster Architecture
-weight: 1
---
-There are three roles that can be assigned to nodes: `etcd`, `controlplane` and `worker`.
+There are three roles that can be assigned to nodes: `etcd`, `controlplane` and `worker`.
## Separating Worker Nodes from Nodes with Other Roles
When designing your cluster(s), you have two options:
-* Use dedicated nodes for each role. This ensures resource availability for the components needed for the specified role. It also strictly isolates network traffic between each of the roles according to the [port requirements](../node-requirements-for-rancher-managed-clusters.md#networking-requirements).
+* Use dedicated nodes for each role. This ensures resource availability for the components needed for the specified role. It also strictly isolates network traffic between each of the roles according to the [port requirements](../node-requirements-for-rancher-managed-clusters.md#networking-requirements).
* Assign the `etcd` and `controlplane` roles to the same nodes. These nodes must meet the hardware requirements for both roles.
In either case, the `worker` role should not be used or added to nodes with the `etcd` or `controlplane` role.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md
index df3b3c3cef5..55daa6129e1 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md
@@ -1,6 +1,5 @@
---
title: Roles for Nodes in Kubernetes
-weight: 1
---
This section describes the roles for etcd nodes, controlplane nodes, and worker nodes in Kubernetes, and how the roles work together in a cluster.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/import-existing-clusters.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/import-existing-clusters.md
index f9a1bf81fd2..2c96956115a 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/import-existing-clusters.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/import-existing-clusters.md
@@ -1,11 +1,6 @@
---
title: Importing Existing Clusters
description: Learn how you can create a cluster in Rancher by importing an existing Kubernetes cluster. Then, you can manage it using Rancher
-metaTitle: 'Kubernetes Cluster Management'
-metaDescription: 'Learn how you can import an existing Kubernetes cluster and then manage it using Rancher'
-weight: 5
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/clusters/import-cluster/
---
_Available as of v2.0.x-v2.4.x_
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
index 6baaaaebb7f..4f98b090321 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
@@ -1,6 +1,5 @@
---
title: Rancher Agents
-weight: 2400
---
There are two different agent resources deployed on Rancher managed clusters:
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
index 3666137155c..72361e4fd6c 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
@@ -1,6 +1,5 @@
---
title: Setting up the Amazon Cloud Provider
-weight: 1
---
When using the `Amazon` cloud provider, you can leverage the following capabilities:
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
index 25884572579..a477edfcdd3 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
@@ -1,6 +1,5 @@
---
title: Setting up the Azure Cloud Provider
-weight: 2
---
When using the `Azure` cloud provider, you can leverage the following capabilities:
@@ -29,7 +28,7 @@ Visit [Azure portal](https://portal.azure.com), login and go to **Azure Active D
If you want to use the Azure CLI, you can run the command `az account show` to get the information.
-### 2. Set up the Azure Client ID and Azure Client Secret
+### 2. Set up the Azure Client ID and Azure Client Secret
Visit [Azure portal](https://portal.azure.com), login and follow the steps below to create an **App Registration** and the corresponding **Azure Client ID** (aadClientId) and **Azure Client Secret** (aadClientSecret).
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
index 548ff88ba96..f7b9809948b 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
@@ -1,13 +1,12 @@
---
title: Setting up the Google Compute Engine Cloud Provider
-weight: 3
---
In this section, you'll learn how to enable the Google Compute Engine (GCE) cloud provider for custom clusters in Rancher. A custom cluster is one in which Rancher installs Kubernetes on existing nodes.
The official Kubernetes documentation for the GCE cloud provider is [here.](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/#gce)
-> **Prerequisites:** The service account of `Identity and API` access on GCE needs the `Computer Admin` permission.
+> **Prerequisites:** The service account of `Identity and API` access on GCE needs the `Computer Admin` permission.
If you are using Calico,
@@ -18,7 +17,7 @@ If you are using Calico,
rancher_kubernetes_engine_config:
cloud_provider:
name: gce
- customCloudProvider: |-
+ customCloudProvider: |-
[Global]
project-id=
network-name=
@@ -26,7 +25,7 @@ If you are using Calico,
node-instance-prefix=
node-tags=
network:
- options:
+ options:
calico_cloud_provider: "gce"
plugin: "calico"
```
@@ -38,17 +37,17 @@ If you are using Canal or Flannel,
```yaml
rancher_kubernetes_engine_config:
- cloud_provider:
+ cloud_provider:
name: gce
- customCloudProvider: |-
+ customCloudProvider: |-
[Global]
project-id=
network-name=
subnetwork-name=
node-instance-prefix=
node-tags=
- services:
- kube_controller:
+ services:
+ kube_controller:
extra_args:
configure-cloud-routes: true # we need to allow the cloud provider configure the routes for the hosts
```
\ No newline at end of file
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/vsphere.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/vsphere.md
index 2a20c6930b2..68286854d9e 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/vsphere.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/vsphere.md
@@ -1,6 +1,5 @@
---
title: Setting up the vSphere Cloud Provider
-weight: 4
---
In this section, you'll learn how to set up the vSphere cloud provider for a Rancher managed RKE Kubernetes cluster in vSphere.
@@ -12,7 +11,7 @@ Follow these steps while creating the vSphere cluster in Rancher:

1. Click on **Edit as YAML**
-1. Insert the following structure to the pre-populated cluster YAML. As of Rancher v2.3+, this structure must be placed under `rancher_kubernetes_engine_config`. In versions before v2.3, it has to be defined as a top-level field. Note that the `name` *must* be set to `vsphere`.
+1. Insert the following structure to the pre-populated cluster YAML. As of Rancher v2.3+, this structure must be placed under `rancher_kubernetes_engine_config`. In versions before v2.3, it has to be defined as a top-level field. Note that the `name` *must* be set to `vsphere`.
```yaml
rancher_kubernetes_engine_config: # Required as of Rancher v2.3+
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
index bb9d59450cb..28adb98b7b7 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
@@ -1,9 +1,5 @@
---
title: Creating a DigitalOcean Cluster
-shortTitle: DigitalOcean
-weight: 2215
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/clusters/creating-a-cluster/create-cluster-digital-ocean/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
index 30833b59cba..19a255bbe8b 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
@@ -1,8 +1,6 @@
---
title: Creating an Amazon EC2 Cluster
-shortTitle: Amazon EC2
description: Learn the prerequisites and steps required in order for you to create an Amazon EC2 cluster using Rancher
-weight: 2210
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
index a9dc25f0887..789775259f6 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
@@ -1,9 +1,5 @@
---
title: Creating an Azure Cluster
-shortTitle: Azure
-weight: 2220
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/clusters/creating-a-cluster/create-cluster-azure/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
index 074e10bab27..9bf57f794cd 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
@@ -1,8 +1,5 @@
---
title: Creating Credentials in the vSphere Console
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/creating-credentials
---
This section describes how to create a vSphere username and password. You will need to provide these vSphere credentials to Rancher, which allows Rancher to provision resources in vSphere.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
index 29640a42ea7..601ebdcd683 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
@@ -1,6 +1,5 @@
---
title: Provisioning Kubernetes Clusters in vSphere
-weight: 1
---
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
index 770ee0d9e77..63342ebabcf 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
@@ -1,6 +1,5 @@
---
title: Configuration for Storage Classes in Azure
-weight: 3
---
If you are using Azure VMs for your nodes, you can use [Azure files](https://docs.microsoft.com/en-us/azure/aks/azure-files-dynamic-pv) as a StorageClass for the cluster.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
index ee075c394de..7a430ad34cf 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
@@ -1,6 +1,5 @@
---
title: Networking Requirements for Host Gateway (L2bridge)
-weight: 1000
---
This section describes how to configure custom Windows clusters that are using *Host Gateway (L2bridge)* mode.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/v2.1-v2.2.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/v2.1-v2.2.md
index 2caa61deb9a..a9a0f680877 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/v2.1-v2.2.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/v2.1-v2.2.md
@@ -1,8 +1,5 @@
---
title: v2.1.x and v2.2.x Windows Documentation (Experimental)
-weight: 9100
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/windows-clusters/docs-for-2.1-and-2.2/
---
_Available from v2.1.0 to v2.1.9 and v2.2.0 to v2.2.3_
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
index bd7e623e129..6c3655df6c1 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
@@ -1,6 +1,5 @@
---
title: Node Requirements for Rancher Managed Clusters
-weight: 1
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md
index a4189bd8669..333162f8867 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md
@@ -1,9 +1,5 @@
---
title: Creating an AKS Cluster
-shortTitle: Azure Kubernetes Service
-weight: 2115
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service/
---
You can use Rancher to create a cluster hosted in Microsoft Azure Kubernetes Service (AKS).
@@ -81,7 +77,7 @@ You can also follow these instructions to set up a service principal and give it
1. Click **Register.**
-1. You should now see the name of your service principal under **Azure Active Directory > App registrations.**
+1. You should now see the name of your service principal under **Azure Active Directory > App registrations.**
1. Click the name of your service principal. Take note of the tenant ID and application ID (also called app ID or client ID) so that you can use it when provisioning your AKS cluster. Then click **Certificates & secrets.**
@@ -89,7 +85,7 @@ You can also follow these instructions to set up a service principal and give it
1. Enter a short description, pick an expiration time, and click **Add.** Take note of the client secret so that you can use it when provisioning the AKS cluster.
-**Result:** You have created a service principal and you should be able to see it listed in the **Azure Active Directory** section under **App registrations.** You still need to give the service principal access to AKS.
+**Result:** You have created a service principal and you should be able to see it listed in the **Azure Active Directory** section under **App registrations.** You still need to give the service principal access to AKS.
To give role-based access to your service principal,
@@ -123,8 +119,8 @@ Use Rancher to set up and configure your Kubernetes cluster.
1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
1. Use your subscription ID, tenant ID, app ID, and client secret to give your cluster access to AKS. If you don't have all of that information, you can retrieve it using these instructions:
- - **App ID and tenant ID:** To get the app ID and tenant ID, you can go to the Azure Portal, then click **Azure Active Directory**, then click **App registrations,** then click the name of the service principal. The app ID and tenant ID are both on the app registration detail page.
- - **Client secret:** If you didn't copy the client secret when creating the service principal, you can get a new one if you go to the app registration detail page, then click **Certificates & secrets**, then click **New client secret.**
+ - **App ID and tenant ID:** To get the app ID and tenant ID, you can go to the Azure Portal, then click **Azure Active Directory**, then click **App registrations,** then click the name of the service principal. The app ID and tenant ID are both on the app registration detail page.
+ - **Client secret:** If you didn't copy the client secret when creating the service principal, you can get a new one if you go to the app registration detail page, then click **Certificates & secrets**, then click **New client secret.**
- **Subscription ID:** You can get the subscription ID is available in the portal from **All services > Subscriptions.**
1. Use **Cluster Options** to choose the version of Kubernetes, what network provider will be used and if you want to enable project network isolation. To see more cluster options, click on **Show advanced options.**
@@ -139,13 +135,13 @@ Use Rancher to set up and configure your Kubernetes cluster.
1. Review your options to confirm they're correct. Then click **Create**.
-**Result:**
+**Result:**
Your cluster is created and assigned a state of **Provisioning.** Rancher is standing up your cluster.
You can access your cluster after its state is updated to **Active.**
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
index 5e862ee9d07..bde64eeed63 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
@@ -1,7 +1,5 @@
---
title: Creating an Aliyun ACK Cluster
-shortTitle: Alibaba Cloud Container Service for Kubernetes
-weight: 2120
---
_Available as of v2.2.0_
@@ -45,13 +43,13 @@ You can use Rancher to create a cluster hosted in Alibaba Cloud Kubernetes (ACK)
1. Review your options to confirm they're correct. Then click **Create**.
-**Result:**
+**Result:**
Your cluster is created and assigned a state of **Provisioning.** Rancher is standing up your cluster.
You can access your cluster after its state is updated to **Active.**
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md
index a667507a6e4..14de60d3ac9 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md
@@ -1,9 +1,5 @@
---
title: Creating a GKE Cluster
-shortTitle: Google Kubernetes Engine
-weight: 2105
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/clusters/creating-a-cluster/create-cluster-gke/
---
## Prerequisites in Google Kubernetes Engine
@@ -17,7 +13,7 @@ The service account requires the following roles:
- **Compute Viewer:** `roles/compute.viewer`
- **Project Viewer:** `roles/viewer`
-- **Kubernetes Engine Admin:** `roles/container.admin`
+- **Kubernetes Engine Admin:** `roles/container.admin`
- **Service Account User:** `roles/iam.serviceAccountUser`
[Google Documentation: Creating and Enabling Service Accounts](https://cloud.google.com/compute/docs/access/create-enable-service-accounts-for-instances)
@@ -44,13 +40,13 @@ Use Rancher to set up and configure your Kubernetes cluster.
8. Select your **Security Options**
9. Review your options to confirm they're correct. Then click **Create**.
-**Result:**
+**Result:**
Your cluster is created and assigned a state of **Provisioning.** Rancher is standing up your cluster.
You can access your cluster after its state is updated to **Active.**
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
index a11ef38a44b..8fb4fd68086 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
@@ -1,7 +1,5 @@
---
title: Creating a Huawei CCE Cluster
-shortTitle: Huawei Cloud Kubernetes Service
-weight: 2130
---
_Available as of v2.2.0_
@@ -31,13 +29,13 @@ Huawei CCE service doesn't support the ability to create clusters with public ac
1. Fill the following node configuration of the cluster. For help filling out the form, refer to [Node Configuration.](#node-configuration)
1. Click **Create** to create the CCE cluster.
-**Result:**
+**Result:**
Your cluster is created and assigned a state of **Provisioning.** Rancher is standing up your cluster.
You can access your cluster after its state is updated to **Active.**
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
index ff8574f687b..e7a1fc5fd9a 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
@@ -1,7 +1,5 @@
---
title: Creating a Tencent TKE Cluster
-shortTitle: Tencent Kubernetes Engine
-weight: 2125
---
_Available as of v2.2.0_
@@ -74,13 +72,13 @@ You can use Rancher to create a cluster hosted in Tencent Kubernetes Engine (TKE
9. Click **Create**.
-**Result:**
+**Result:**
Your cluster is created and assigned a state of **Provisioning.** Rancher is standing up your cluster.
You can access your cluster after its state is updated to **Active.**
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md
index 5cb5b0d80fe..b20161c7323 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md
@@ -1,9 +1,5 @@
---
title: ConfigMaps
-weight: 3061
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/projects/add-configmaps
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/configmaps
---
While most types of Kubernetes secrets store sensitive information, [ConfigMaps](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/) store general configuration information, such as a group of config files. Because ConfigMaps don't store sensitive information, they can be updated automatically, and therefore don't require their containers to be restarted following update (unlike most secret types, which require manual updates and a container restart to take effect).
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md
index 160298df474..c6527027af4 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md
@@ -1,9 +1,5 @@
---
title: Service Discovery
-weight: 3045
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/workloads/add-a-dns-record/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/service-discovery
---
For every workload created, a complementing Service Discovery entry is created. This Service Discovery entry enables DNS resolution for the workload's pods using the following naming convention:
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md
index 7a1118d7630..c0f065fef84 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md
@@ -1,10 +1,6 @@
---
title: Encrypting HTTP Communication
description: Learn how to add an SSL (Secure Sockets Layer) certificate or TLS (Transport Layer Security) certificate to either a project, a namespace, or both, so that you can add it to deployments
-weight: 3060
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/projects/add-ssl-certificates/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/certificates
---
When you create an ingress within Rancher/Kubernetes, you must provide it with a secret that includes a TLS private key and certificate, which are used to encrypt and decrypt communications that come through the ingress. You can make certificates available for ingress use by navigating to its project or namespace, and then uploading the certificate. You can then add the certificate to the ingress deployment.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md
index 502bfd33ebf..689581f99d8 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md
@@ -1,8 +1,5 @@
---
title: Background Information on HPAs
-weight: 3027
-aliases:
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/horizontal-pod-autoscaler/hpa-background
---
The [Horizontal Pod Autoscaler](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) (HPA) is a Kubernetes feature that allows you to configure your cluster to automatically scale the services it's running up or down. This section provides explanation on how HPA works with Kubernetes.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/hpa-for-rancher-before-2.0.7.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/hpa-for-rancher-before-2.0.7.md
index 4a46e27fe95..cad147ef4c9 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/hpa-for-rancher-before-2.0.7.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/hpa-for-rancher-before-2.0.7.md
@@ -1,9 +1,5 @@
---
title: Manual HPA Installation for Clusters Created Before Rancher v2.0.7
-weight: 3050
-aliases:
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/horizontal-pod-autoscaler/hpa-for-rancher-before-2_0_7
- - /rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/hpa-for-rancher-before-2_0_7/
---
This section describes how to manually install HPAs for clusters created with Rancher before v2.0.7. This section also describes how to configure your HPA to scale up or down, and how to assign roles to your HPA.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md
index f3c912ffeb8..099a1b9abba 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md
@@ -1,8 +1,5 @@
---
title: Managing HPAs with kubectl
-weight: 3029
-aliases:
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl
---
This section describes HPA management with `kubectl`. This document has instructions for how to:
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md
index 4f0b1e2ee1f..7fe1eb86e4a 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md
@@ -1,8 +1,5 @@
---
title: Managing HPAs with the Rancher UI
-weight: 3028
-aliases:
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-rancher-ui
---
_Available as of v2.3.0_
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
index 1715c2a5b21..1c753de2cf2 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
@@ -1,9 +1,5 @@
---
title: Testing HPAs with kubectl
-weight: 3031
-
-aliases:
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/horizontal-pod-autoscaler/testing-hpa
---
This document describes how to check the status of your HPAs after scaling them up or down with your load testing tool. For information on how to check the status from the Rancher UI (at least version 2.3.x), refer to [Managing HPAs with the Rancher UI](manage-hpas-with-kubectl.md).
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md
index 335c0fe861d..be16905f3c1 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md
@@ -1,13 +1,9 @@
---
title: Kubernetes Registry and Docker Registry
description: Learn about the Docker registry and Kubernetes registry, their use cases and how to use a private registry with the Rancher UI
-weight: 3063
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/projects/add-registries/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/registries
- - /rancher/v2.0-v2.4/en/k8s-resources/k8s-in-rancher/registries
---
-Registries are Kubernetes secrets containing credentials used to authenticate with [private Docker registries](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/).
+
+Registries are Kubernetes secrets containing credentials used to authenticate with [private Docker registries](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/).
The word "registry" can mean two things, depending on whether it is used to refer to a Docker or Kubernetes registry:
@@ -38,7 +34,7 @@ Currently, deployments pull the private registry credentials automatically only
1. Click **Save**.
-**Result:**
+**Result:**
- Your secret is added to the project or namespace, depending on the scope you chose.
- You can view the secret in the Rancher UI from the **Resources > Registries** view.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md
index 49a163e1306..d1550358ffa 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md
@@ -1,10 +1,6 @@
---
title: Adding Ingresses to Your Project
description: Ingresses can be added for workloads to provide load balancing, SSL termination and host/path-based routing. Learn how to add Rancher ingress to your project
-weight: 3042
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/workloads/add-ingress/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/load-balancers-and-ingress/ingress
---
Ingress can be added for workloads to provide load balancing, SSL termination and host/path based routing. When using ingresses in a project, you can program the ingress hostname to an external DNS by setting up a [Global DNS entry](../../helm-charts-in-rancher/globaldns.md).
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md
index 21c83f40898..7bb4d6550d5 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md
@@ -1,10 +1,6 @@
---
title: "Layer 4 and Layer 7 Load Balancing"
description: "Kubernetes supports load balancing in two ways: Layer-4 Load Balancing and Layer-7 Load Balancing. Learn about the support for each way in different deployments"
-weight: 3041
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/load-balancing/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/load-balancers-and-ingress/load-balancers
---
Kubernetes supports load balancing in two ways: Layer-4 Load Balancing and Layer-7 Load Balancing.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md
index 4ea67ee24b3..d5a4b0eca03 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md
@@ -1,9 +1,5 @@
---
title: Secrets
-weight: 3062
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/projects/add-a-secret
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/secrets
---
[Secrets](https://kubernetes.io/docs/concepts/configuration/secret/#overview-of-secrets) store sensitive data like passwords, tokens, or keys. They may contain one or more key value pairs.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
index 1f4b8d05a3b..04723f9d3db 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
@@ -1,10 +1,7 @@
---
title: Adding a Sidecar
-weight: 3029
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/workloads/add-a-sidecar/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/workloads/add-a-sidecar
---
+
A _sidecar_ is a container that extends or enhances the main container in a pod. The main container and the sidecar share a pod, and therefore share the same network space and storage. You can add sidecars to existing workloads by using the **Add a Sidecar** option.
1. From the **Global** view, open the project running the workload you want to add a sidecar to.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
index e4afb406df0..1b3817ddeba 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
@@ -1,10 +1,6 @@
---
title: Deploying Workloads
description: Read this step by step guide for deploying workloads. Deploy a workload to run an application in one or more containers.
-weight: 3026
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/workloads/deploy-workloads/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/workloads/deploy-workloads
---
Deploy a workload to run an application in one or more containers.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md
index ee532c960ce..fee48c4ff61 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md
@@ -1,9 +1,5 @@
---
title: Rolling Back Workloads
-weight: 3027
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/workloads/rollback-workloads/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/workloads/rollback-workloads
---
Sometimes there is a need to rollback to the previous version of the application, either for debugging purposes or because an upgrade did not go as planned.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
index 471072c0057..e393457d83d 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
@@ -1,10 +1,7 @@
---
title: Upgrading Workloads
-weight: 3028
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/workloads/upgrade-workloads/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/workloads/upgrade-workloads
---
+
When a new version of an application image is released on Docker Hub, you can upgrade any workloads running a previous version of the application to the new one.
1. From the **Global** view, open the project running the workload you want to upgrade.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/discover-services.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/discover-services.md
index 867e6b5f236..61224c6bf0d 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/discover-services.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/discover-services.md
@@ -1,8 +1,5 @@
---
title: "6. Service Discovery"
-weight: 600
-aliases:
- - /rancher/v2.x/en/v1.6-migration/discover-services/
---
Service discovery is one of the core functionalities of any container-based environment. Once you have packaged and launched your application, the next step is making it discoverable to other containers in your environment or the external world. This document will describe how to use the service discovery support provided by Rancher v2.x so that you can find them by name.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/expose-services.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/expose-services.md
index 1b0bcc8e1a6..783822ec4da 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/expose-services.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/expose-services.md
@@ -1,8 +1,5 @@
---
title: "3. Expose Your Services"
-weight: 400
-aliases:
- - /rancher/v2.x/en/v1.6-migration/expose-services/
---
In testing environments, you usually need to route external traffic to your cluster containers by using an unadvertised IP and port number, providing users access to their apps. You can accomplish this goal using port mapping, which exposes a workload (i.e., service) publicly over a specific port, provided you know your node IP address(es). You can either map a port using HostPorts (which exposes a service on a specified port on a single node) or NodePorts (which exposes a service on _all_ nodes on a single port).
@@ -16,7 +13,7 @@ Use this document to correct workloads that list `ports` in `output.txt`. You ca
## What's Different About Exposing Services in Rancher v2.x?
-In Rancher v1.6, we used the term _Port Mapping_ for exposing an IP address and port where your you and your users can access a service.
+In Rancher v1.6, we used the term _Port Mapping_ for exposing an IP address and port where your you and your users can access a service.
In Rancher v2.x, the mechanisms and terms for service exposure have changed and expanded. You now have two port mapping options: _HostPorts_ (which is most synonymous with v1.6 port mapping, allows you to expose your app at a single IP and port) and _NodePorts_ (which allows you to map ports on _all_ of your cluster nodes, not just one).
@@ -24,7 +21,7 @@ Unfortunately, port mapping cannot be parsed by the migration-tools CLI. If the
## HostPort
-A _HostPort_ is a port exposed to the public on a _specific node_ running one or more pod. Traffic to the node and the exposed port (`:`) are routed to the requested container's private port. Using a HostPort for a Kubernetes pod in Rancher v2.x is synonymous with creating a public port mapping for a container in Rancher v1.6.
+A _HostPort_ is a port exposed to the public on a _specific node_ running one or more pod. Traffic to the node and the exposed port (`:`) are routed to the requested container's private port. Using a HostPort for a Kubernetes pod in Rancher v2.x is synonymous with creating a public port mapping for a container in Rancher v1.6.
In the following diagram, a user is trying to access an instance of Nginx, which is running within a pod on port 80. However, the Nginx deployment is assigned a HostPort of 9890. The user can connect to this pod by browsing to its host IP address, followed by the HostPort in use (9890 in case).
@@ -33,8 +30,8 @@ In the following diagram, a user is trying to access an instance of Nginx, which
#### HostPort Pros
-- Any port available on the host can be exposed.
-- Configuration is simple, and the HostPort is set directly in the Kubernetes pod specifications. Unlike NodePort, no other objects need to be created to expose your app.
+- Any port available on the host can be exposed.
+- Configuration is simple, and the HostPort is set directly in the Kubernetes pod specifications. Unlike NodePort, no other objects need to be created to expose your app.
#### HostPort Cons
@@ -47,7 +44,7 @@ In the following diagram, a user is trying to access an instance of Nginx, which
You can set a HostPort for migrated workloads (i.e., services) using the Rancher v2.x UI. To add a HostPort, browse to the project containing your workloads, and edit each workload that you want to expose, as shown below. Map the port that your service container exposes to the HostPort exposed on your target node.
-For example, for the web-deployment.yml file parsed from v1.6 that we've been using as a sample, we would edit its Kubernetes manifest, set the publish the port that the container uses, and then declare a HostPort listening on the port of your choice (`9890`) as shown below. You can then access your workload by clicking the link created in the Rancher UI.
+For example, for the web-deployment.yml file parsed from v1.6 that we've been using as a sample, we would edit its Kubernetes manifest, set the publish the port that the container uses, and then declare a HostPort listening on the port of your choice (`9890`) as shown below. You can then access your workload by clicking the link created in the Rancher UI.
Port Mapping: Setting HostPort
@@ -59,7 +56,7 @@ A _NodePort_ is a port that's open to the public _on each_ of your cluster nodes
NodePorts help you circumvent an IP address shortcoming. Although pods can be reached by their IP addresses, they are disposable by nature. Pods are routinely destroyed and recreated, getting a new IP address with each replication. Therefore, IP addresses are not a reliable way to access your pods. NodePorts help you around this issue by providing a static service where they can always be reached. Even if your pods change their IP addresses, external clients dependent on them can continue accessing them without disruption, all without any knowledge of the pod re-creation occurring on the back end.
-In the following diagram, a user is trying to connect to an instance of Nginx running in a Kubernetes cluster managed by Rancher. Although he knows what NodePort Nginx is operating on (30216 in this case), he does not know the IP address of the specific node that the pod is running on. However, with NodePort enabled, he can connect to the pod using the IP address for _any_ node in the cluster. Kubeproxy will forward the request to the correct node and pod.
+In the following diagram, a user is trying to connect to an instance of Nginx running in a Kubernetes cluster managed by Rancher. Although he knows what NodePort Nginx is operating on (30216 in this case), he does not know the IP address of the specific node that the pod is running on. However, with NodePort enabled, he can connect to the pod using the IP address for _any_ node in the cluster. Kubeproxy will forward the request to the correct node and pod.

@@ -80,9 +77,9 @@ NodePorts are available within your Kubernetes cluster on an internal IP. If you
You can set a NodePort for migrated workloads (i.e., services) using the Rancher v2.x UI. To add a NodePort, browse to the project containing your workloads, and edit each workload that you want to expose, as shown below. Map the port that your service container exposes to a NodePort, which you'll be able to access from each cluster node.
-For example, for the `web-deployment.yml` file parsed from v1.6 that we've been using as a sample, we would edit its Kubernetes manifest, set the publish the port that the container uses, and then declare a NodePort. You can then access your workload by clicking the link created in the Rancher UI.
+For example, for the `web-deployment.yml` file parsed from v1.6 that we've been using as a sample, we would edit its Kubernetes manifest, set the publish the port that the container uses, and then declare a NodePort. You can then access your workload by clicking the link created in the Rancher UI.
->**Note:**
+>**Note:**
>
>- If you set a NodePort without giving it a value, Rancher chooses a port at random from the following range: `30000-32767`.
>- If you manually set a NodePort, you must assign it a value within the `30000-32767` range.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/install-and-configure-rancher.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/install-and-configure-rancher.md
index fddb7f51a25..fd7393862fa 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/install-and-configure-rancher.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/install-and-configure-rancher.md
@@ -1,8 +1,5 @@
---
title: "1. Get Started"
-weight: 25
-aliases:
- - /rancher/v2.x/en/v1.6-migration/get-started/
---
Get started with your migration to Rancher v2.x by installing Rancher and configuring your new Rancher environment.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/kubernetes-introduction.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/kubernetes-introduction.md
index a7d4d7e47a6..42a5c2de202 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/kubernetes-introduction.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/kubernetes-introduction.md
@@ -1,8 +1,5 @@
---
title: Kubernetes Introduction
-weight: 1
-aliases:
- - /rancher/v2.x/en/v1.6-migration/kub-intro/
---
Rancher v2.x is built on the [Kubernetes](https://kubernetes.io/docs/home/?path=users&persona=app-developer&level=foundational) container orchestrator. This shift in underlying technology for v2.x is a large departure from v1.6, which supported several popular container orchestrators. Since Rancher is now based entirely on Kubernetes, it's helpful to learn the Kubernetes basics.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/load-balancing.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/load-balancing.md
index f6d22af159d..4b33b314e1d 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/load-balancing.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/load-balancing.md
@@ -1,8 +1,5 @@
---
title: "7. Load Balancing"
-weight: 700
-aliases:
- - /rancher/v2.x/en/v1.6-migration/load-balancing/
---
If your applications are public-facing and consume significant traffic, you should place a load balancer in front of your cluster so that users can always access their apps without service interruption. Typically, you can fulfill a high volume of service requests by [horizontally scaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) your deployment, which spins up additional application containers as traffic ramps up. However, this technique requires routing that distributes traffic across your nodes efficiently. In cases where you need to accommodate public traffic that scales up and down, you'll need a load balancer.
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/migrate-services.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/migrate-services.md
index b07af309fce..95d6159d312 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/migrate-services.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/migrate-services.md
@@ -1,8 +1,5 @@
---
title: 2. Migrate Your Services
-weight: 100
-aliases:
- - /rancher/v2.x/en/v1.6-migration/run-migration-tool/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/monitor-apps.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/monitor-apps.md
index 935ecce54e1..b863659812c 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/monitor-apps.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/monitor-apps.md
@@ -1,8 +1,5 @@
---
title: "4. Configure Health Checks"
-weight: 400
-aliases:
- - /rancher/v2.x/en/v1.6-migration/monitor-apps/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/schedule-services.md b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/schedule-services.md
index 8529eb78113..12742155b66 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/schedule-services.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/new-user-guides/migrate-from-v1.6-v2.x/schedule-services.md
@@ -1,8 +1,5 @@
---
title: "5. Schedule Your Services"
-weight: 500
-aliases:
- - /rancher/v2.x/en/v1.6-migration/schedule-workloads/
---
In v1.6, objects called _services_ were used to schedule containers to your cluster hosts. Services included the Docker image for an application, along with configuration settings for a desired state.
@@ -212,7 +209,7 @@ To create a daemonset while configuring a workload, choose **Run one pod on each
While creating a service in the Rancher v1.6 UI, you could schedule its containers to hosts based on hardware requirements that you choose. The containers are then scheduled to hosts based on which ones have bandwidth, memory, and CPU capacity.
-In Rancher v2.x, you can still specify the resources required by your pods. However, these options are unavailable in the UI. Instead, you must edit your workload's manifest file to declare these resource constraints.
+In Rancher v2.x, you can still specify the resources required by your pods. However, these options are unavailable in the UI. Instead, you must edit your workload's manifest file to declare these resource constraints.
To declare resource constraints, edit your migrated workloads, editing the **Security & Host** sections.
diff --git a/versioned_docs/version-2.0-2.4/installation/resources/chart-options/chart-options.md b/versioned_docs/version-2.0-2.4/installation/resources/chart-options/chart-options.md
index 0cb9f6d5edb..a3fcb431983 100644
--- a/versioned_docs/version-2.0-2.4/installation/resources/chart-options/chart-options.md
+++ b/versioned_docs/version-2.0-2.4/installation/resources/chart-options/chart-options.md
@@ -1,6 +1,5 @@
---
title: Rancher Helm Chart Options
-weight: 50
---
The Rancher Helm chart options reference moved to [this page.](../../../reference-guides/installation-references/helm-chart-options.md)
\ No newline at end of file
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-authentication.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-authentication.md
index 6c4993b058f..b46c2066720 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-authentication.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-authentication.md
@@ -1,9 +1,5 @@
---
title: Authentication
-weight: 1115
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/global-configuration/authentication/
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/authentication/
---
One of the key features that Rancher adds to Kubernetes is centralized user authentication. This feature allows your users to use one set of credentials to authenticate with any of your Kubernetes clusters.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-provisioning-drivers.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-provisioning-drivers.md
index d9f71e5a3b0..9bee75369b2 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-provisioning-drivers.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-provisioning-drivers.md
@@ -1,6 +1,5 @@
---
title: Provisioning Drivers
-weight: 1140
---
Drivers in Rancher allow you to manage which providers can be used to deploy [hosted Kubernetes clusters](set-up-clusters-from-hosted-kubernetes-providers.md) or [nodes in an infrastructure provider](use-new-nodes-in-an-infra-provider.md) to allow Rancher to deploy and manage Kubernetes.
@@ -14,7 +13,7 @@ There are two types of drivers within Rancher:
* [Cluster Drivers](#cluster-drivers)
* [Node Drivers](#node-drivers)
-### Cluster Drivers
+### Cluster Drivers
_Available as of v2.2.0_
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-rke1-templates.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-rke1-templates.md
index d9a212eb719..5b733409f86 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-rke1-templates.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-rke1-templates.md
@@ -1,6 +1,5 @@
---
title: RKE Templates
-weight: 7010
---
_Available as of Rancher v2.3.0_
@@ -83,7 +82,7 @@ The documents in this section explain the details of RKE template management:
- [Getting permission to create templates](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md)
- [Creating and revising templates](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md)
-- [Enforcing template settings](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md#requiring-new-clusters-to-use-an-rke-template)
+- [Enforcing template settings](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md#requiring-new-clusters-to-use-an-rke-template)
- [Overriding template settings](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md)
- [Sharing templates with cluster creators](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#sharing-templates-with-specific-users-or-groups)
- [Sharing ownership of a template](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#sharing-ownership-of-templates)
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-the-api.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-the-api.md
index 99a8a889c80..3d952998f1e 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-the-api.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/about-the-api.md
@@ -1,6 +1,5 @@
---
title: API
-weight: 24
---
## How to use the API
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/access-clusters.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/access-clusters.md
index ef525703fd1..9bc920a3407 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/access-clusters.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/access-clusters.md
@@ -1,6 +1,5 @@
---
title: Cluster Access
-weight: 1
---
This section is about what tools can be used to access clusters managed by Rancher.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/advanced-options.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/advanced-options.md
index f5e42195535..4e9027dee15 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/advanced-options.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/advanced-options.md
@@ -1,6 +1,5 @@
---
title: Advanced
-weight: 1000
---
The documents in this section contain resources for less common use cases.
\ No newline at end of file
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/air-gap-helm2.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/air-gap-helm2.md
index 48a529576fc..fe0ec4478a0 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/air-gap-helm2.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/air-gap-helm2.md
@@ -1,12 +1,5 @@
---
title: Installing Rancher in an Air Gapped Environment with Helm 2
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/installation/air-gap-installation/
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/
- - /rancher/v2.0-v2.4/en/installation/air-gap-single-node/
- - /rancher/v2.0-v2.4/en/installation/options/air-gap-helm2
- - /rancher/v2.x/en/installation/resources/advanced/air-gap-helm2/
---
> After Helm 3 was released, the Rancher installation instructions were updated to use Helm 3.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/air-gapped-helm-cli-install.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/air-gapped-helm-cli-install.md
index cd5be4553d5..c7713ae4b22 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/air-gapped-helm-cli-install.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/air-gapped-helm-cli-install.md
@@ -1,10 +1,5 @@
---
title: Air Gapped Helm CLI Install
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/installation/air-gap-installation/
- - /rancher/v2.0-v2.4/en/installation/air-gap-high-availability/
- - /rancher/v2.0-v2.4/en/installation/air-gap-single-node/
---
This section is about using the Helm CLI to install the Rancher server in an air gapped environment. An air gapped environment could be where Rancher server will be installed offline, behind a firewall, or behind a proxy.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/authentication-permissions-and-global-configuration.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/authentication-permissions-and-global-configuration.md
index 5ed78c34a03..af2d35bfb53 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/authentication-permissions-and-global-configuration.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/authentication-permissions-and-global-configuration.md
@@ -1,12 +1,5 @@
---
title: Authentication, Permissions and Global Configuration
-weight: 6
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/global-configuration/
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/
- - /rancher/v2.0-v2.4/en/concepts/global-configuration/server-url/
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/server-url/
- - /rancher/v2.0-v2.4/en/admin-settings/log-in/
---
After installation, the [system administrator](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md) should configure Rancher to configure authentication, authorization, security, default settings, security policies, drivers and global DNS entries.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/backup-restore-and-disaster-recovery.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/backup-restore-and-disaster-recovery.md
index de1e1e55206..23d6de6af98 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/backup-restore-and-disaster-recovery.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/backup-restore-and-disaster-recovery.md
@@ -1,6 +1,5 @@
---
title: Backups and Disaster Recovery
-weight: 5
---
This section is devoted to protecting your data in a disaster scenario.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/best-practices.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/best-practices.md
index 4bb14b91783..4a3fa51d285 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/best-practices.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/best-practices.md
@@ -1,8 +1,5 @@
---
title: Best Practices Guide
-weight: 4
-aliases:
- - /rancher/v2.x/en/best-practices/v2.0-v2.4/
---
The purpose of this section is to consolidate best practices for Rancher implementations. This also includes recommendations for related technologies, such as Kubernetes, Docker, containers, and more. The objective is to improve the outcome of a Rancher implementation using the operational experience of Rancher and its customers.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/checklist-for-production-ready-clusters.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/checklist-for-production-ready-clusters.md
index 55cbbc4cbe8..b5a268b7c70 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/checklist-for-production-ready-clusters.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/checklist-for-production-ready-clusters.md
@@ -1,6 +1,5 @@
---
title: Checklist for Production-Ready Clusters
-weight: 2
---
In this section, we recommend best practices for creating the production-ready Kubernetes clusters that will run your apps and services.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/cis-scans.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/cis-scans.md
index ad6c2061698..2db04db6f13 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/cis-scans.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/cis-scans.md
@@ -1,10 +1,5 @@
---
title: CIS Scans
-weight: 18
-aliases:
- - /rancher/v2.0-v2.4/en/cis-scans/legacy
- - /rancher/v2.0-v2.4/en/cis-scans
- - /rancher/v2.x/en/cis-scans/v2.4/
---
_Available as of v2.4.0_
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-alerts.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-alerts.md
index 87186ee0f3d..5447245fc33 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-alerts.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-alerts.md
@@ -1,12 +1,5 @@
---
title: Cluster Alerts
-shortTitle: Alerts
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/alerts
- - /rancher/v2.0-v2.4/en/monitoring-alerting/legacy/alerts/cluster-alerts
- - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-alerts
- - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-alerts/
---
To keep your clusters and applications healthy and driving your organizational productivity forward, you need to stay informed of events occurring in your clusters and projects, both planned and unplanned. When an event occurs, your alert is triggered, and you are sent a notification. You can then, if necessary, follow up with corrective actions.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-configuration.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-configuration.md
index e81fa6d0062..e6838f059cc 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-configuration.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-configuration.md
@@ -1,6 +1,5 @@
---
title: Cluster Configuration
-weight: 2025
---
After you provision a Kubernetes cluster using Rancher, you can still edit options and settings for the cluster.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-logging.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-logging.md
index 20d98a45aea..ac734593563 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-logging.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-logging.md
@@ -1,16 +1,6 @@
---
title: Cluster Logging
-shortTitle: Logging
description: Rancher integrates with popular logging services. Learn the requirements and benefits of integrating with logging services, and enable logging on your cluster.
-metaDescription: "Rancher integrates with popular logging services. Learn the requirements and benefits of integrating with logging services, and enable logging on your cluster."
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/logging/
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/logging
- - /rancher/v2.0-v2.4/en/logging/legacy/cluster-logging
- - /rancher/v2.0-v2.4/en/logging/v2.0.x-v2.4.x/cluster-logging/
- - /rancher/v2.x/en/logging/v2.0.x-v2.4.x/
- - /rancher/v2.x/en/logging/v2.0.x-v2.4.x/cluster-logging/
---
Logging is helpful because it allows you to:
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-monitoring.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-monitoring.md
index 7592cdf4b46..e78dea7d404 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-monitoring.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-monitoring.md
@@ -1,15 +1,6 @@
---
title: Integrating Rancher and Prometheus for Cluster Monitoring
-shortTitle: Monitoring
description: Prometheus lets you view metrics from your different Rancher and Kubernetes objects. Learn about the scope of monitoring and how to enable cluster monitoring
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/project-admin/tools/monitoring
- - /rancher/v2.0-v2.4/en/monitoring-alerting/legacy/monitoring/cluster-monitoring
- - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/monitoring/cluster-monitoring
- - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring
- - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/
- - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/
---
_Available as of v2.2.0_
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-yml.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-yml.md
index bc94bc456f8..62da0e33222 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-yml.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/cluster-yml.md
@@ -1,6 +1,5 @@
---
title: cluster.yml Templates for RKE add-on installs
-weight: 10
---
These templates are intended to be used for RKE add-on installs, which are only supported up to Rancher v2.0.8. Please use the Rancher Helm chart if you are installing a newer Rancher version.
\ No newline at end of file
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
index a2e2372ecfb..d645337d23e 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
@@ -1,6 +1,5 @@
---
title: Configuring Microsoft Active Directory Federation Service (SAML)
-weight: 1205
---
_Available as of v2.0.7_
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/configure-openldap.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/configure-openldap.md
index f51831b2f63..3607bc9d7bf 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/configure-openldap.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/configure-openldap.md
@@ -1,13 +1,10 @@
---
title: Configuring OpenLDAP
-weight: 1113
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/authentication/openldap/
---
_Available as of v2.0.5_
-If your organization uses LDAP for user authentication, you can configure Rancher to communicate with an OpenLDAP server to authenticate users. This allows Rancher admins to control access to clusters and projects based on users and groups managed externally in the organisation's central user repository, while allowing end-users to authenticate with their LDAP credentials when logging in to the Rancher UI.
+If your organization uses LDAP for user authentication, you can configure Rancher to communicate with an OpenLDAP server to authenticate users. This allows Rancher admins to control access to clusters and projects based on users and groups managed externally in the organisation's central user repository, while allowing end-users to authenticate with their LDAP credentials when logging in to the Rancher UI.
## Prerequisites
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/configure-shibboleth-saml.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/configure-shibboleth-saml.md
index 6f6e8bf7a49..7a715831100 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/configure-shibboleth-saml.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/configure-shibboleth-saml.md
@@ -1,6 +1,5 @@
---
title: Configuring Shibboleth (SAML)
-weight: 1210
---
_Available as of v2.4.0_
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/create-kubernetes-persistent-storage.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/create-kubernetes-persistent-storage.md
index 259212e5595..528aeec4f04 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/create-kubernetes-persistent-storage.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/create-kubernetes-persistent-storage.md
@@ -1,12 +1,8 @@
---
title: "Kubernetes Persistent Storage: Volumes and Storage Classes"
description: "Learn about the two ways with which you can create persistent storage in Kubernetes: persistent volumes and storage classes"
-weight: 2031
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/clusters/adding-storage/
- - /rancher/v2.0-v2.4/en/cluster-admin/volumes-and-storage/persistent-volume-claims/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/volumes-and-storage/persistent-volume-claims/
---
+
When deploying an application that needs to retain data, you'll need to create persistent storage. Persistent storage allows you to store application data external from the pod running your application. This storage practice allows you to maintain application data, even if the application's pod fails.
The documents in this section assume that you understand the Kubernetes concepts of persistent volumes, persistent volume claims, and storage classes. For more information, refer to the section on [how storage works.](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md)
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/creating-a-vsphere-cluster.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/creating-a-vsphere-cluster.md
index 30fb906c5f1..caba41ff065 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/creating-a-vsphere-cluster.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/creating-a-vsphere-cluster.md
@@ -1,9 +1,5 @@
---
title: VSphere Node Template Configuration
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/node-template-reference
- - /rancher/v2.0-v2.4/en/cluster-provisionin/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/enabling-uuids
---
The vSphere node templates in Rancher were updated in the following Rancher versions. Refer to the newest configuration reference that is less than or equal to your Rancher version:
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/deploy-rancher-manager.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/deploy-rancher-manager.md
index cc35e1a37fe..051799f2b83 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/deploy-rancher-manager.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/deploy-rancher-manager.md
@@ -1,6 +1,5 @@
---
title: Deploying Rancher Server
-weight: 100
---
Use one of the following guides to deploy and provision Rancher and a Kubernetes cluster in the provider of your choice.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/deploy-rancher-workloads.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/deploy-rancher-workloads.md
index cf89f3341a1..3e86165a071 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/deploy-rancher-workloads.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/deploy-rancher-workloads.md
@@ -1,6 +1,5 @@
---
title: Deploying Workloads
-weight: 200
---
These guides walk you through the deployment of an application, including how to expose the application for use outside of the cluster.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/enable-experimental-features.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/enable-experimental-features.md
index 69bf893addb..7dc222a7bb6 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/enable-experimental-features.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/enable-experimental-features.md
@@ -1,9 +1,5 @@
---
title: Enabling Experimental Features
-weight: 17
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/feature-flags/
- - /rancher/v2.0-v2.4/en/admin-settings/feature-flags/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm-charts-in-rancher.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm-charts-in-rancher.md
index ef7efb0705f..b41b54a2117 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm-charts-in-rancher.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm-charts-in-rancher.md
@@ -1,13 +1,6 @@
---
title: Helm Charts in Rancher
-weight: 12
description: Rancher enables the use of catalogs to repeatedly deploy applications easily. Catalogs are GitHub or Helm Chart repositories filled with deployment-ready apps.
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/global-configuration/catalog/
- - /rancher/v2.0-v2.4/en/concepts/catalogs/
- - /rancher/v2.0-v2.4/en/tasks/global-configuration/catalog/
- - /rancher/v2.0-v2.4/en/catalog
- - /rancher/v2.0-v2.4/en/catalog/apps
---
Rancher provides the ability to use a catalog of Helm charts that make it easy to repeatedly deploy applications.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm-rancher.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm-rancher.md
index 641fc4a10cd..2032a3c6578 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm-rancher.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm-rancher.md
@@ -1,9 +1,5 @@
---
title: "4. Install Rancher"
-weight: 200
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/helm-rancher
- - /rancher/v2.x/en/installation/resources/advanced/helm2/helm-rancher/
---
Rancher installation is managed using the Helm package manager for Kubernetes. Use `helm` to install the prerequisite and charts to install Rancher.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-create-nodes-lb.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-create-nodes-lb.md
index 0bdab7ff776..2ba6b2a6a2e 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-create-nodes-lb.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-create-nodes-lb.md
@@ -1,9 +1,5 @@
---
title: "1. Create Nodes and Load Balancer"
-weight: 185
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/create-nodes-lb
- - /rancher/v2.x/en/installation/resources/advanced/helm2/create-nodes-lb/
---
Use your provider of choice to provision 3 nodes and a Load Balancer endpoint for your RKE install.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-helm-init.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-helm-init.md
index 52c0e4340eb..941afd957ff 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-helm-init.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-helm-init.md
@@ -1,10 +1,6 @@
---
title: "Initialize Helm: Install the Tiller Service"
description: "With Helm, you can create configurable deployments instead of using static files. In order to use Helm, the Tiller service needs to be installed on your cluster."
-weight: 195
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/helm-init
- - /rancher/v2.x/en/installation/resources/advanced/helm2/helm-init/
---
Helm is the package management tool of choice for Kubernetes. Helm "charts" provide templating syntax for Kubernetes YAML manifest documents. With Helm we can create configurable deployments instead of just using static files. For more information about creating your own catalog of deployments, check out the docs at [https://helm.sh/](https://helm.sh/). To be able to use Helm, the server-side component `tiller` needs to be installed on your cluster.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-kubernetes-rke.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-kubernetes-rke.md
index 0f45f33981b..fd1c088c1ff 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-kubernetes-rke.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-kubernetes-rke.md
@@ -1,9 +1,5 @@
---
title: "2. Install Kubernetes with RKE"
-weight: 190
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/kubernetes-rke
- - /rancher/v2.x/en/installation/resources/advanced/helm2/kubernetes-rke/
---
Use RKE to install Kubernetes with a high availability etcd configuration.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on-layer-4-lb.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on-layer-4-lb.md
index a618d5bd3fc..d5a7b177c5f 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on-layer-4-lb.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on-layer-4-lb.md
@@ -1,9 +1,5 @@
---
title: Kubernetes Install with External Load Balancer (TCP/Layer 4)
-weight: 275
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/rke-add-on/layer-4-lb
- - /rancher/v2.x/en/installation/resources/advanced/helm2/rke-add-on/layer-4-lb/
---
import SslFaqHa from '@site/src/components/SslFaqHa'
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on-layer-7-lb.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on-layer-7-lb.md
index 2071820be09..855be7fe2ea 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on-layer-7-lb.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on-layer-7-lb.md
@@ -1,10 +1,5 @@
---
title: Kubernetes Install with External Load Balancer (HTTPS/Layer 7)
-weight: 276
-aliases:
- - /rancher/v2.0-v2.4/en/installation/ha-server-install-external-lb/
- - /rancher/v2.0-v2.4/en/installation/options/helm2/rke-add-on/layer-7-lb
- - /rancher/v2.x/en/installation/resources/advanced/helm2/rke-add-on/layer-7-lb/
---
import SslFaqHa from '@site/src/components/SslFaqHa'
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on-troubleshooting.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on-troubleshooting.md
index b7159ebf950..54b60b9aa16 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on-troubleshooting.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on-troubleshooting.md
@@ -1,11 +1,5 @@
---
title: Troubleshooting HA RKE Add-On Install
-weight: 370
-aliases:
- - /rancher/v2.0-v2.4/en/installation/troubleshooting-ha/
- - /rancher/v2.0-v2.4/en/installation/options/helm2/rke-add-on/troubleshooting
- - /rancher/v2.0-v2.4/en/installation/resources/advanced/helm2/rke-add-on/troubleshooting/404-default-backend/
- - /rancher/v2.x/en/installation/resources/advanced/helm2/rke-add-on/troubleshooting/
---
> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on.md
index e4ebf9848cb..06e1519c959 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2-rke-add-on.md
@@ -1,9 +1,5 @@
---
title: RKE Add-On Install
-weight: 276
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2/rke-add-on
- - /rancher/v2.x/en/installation/resources/advanced/helm2/rke-add-on/
---
> #### **Important: RKE add-on install is only supported up to Rancher v2.0.8**
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2.md
index 9e02a45a215..2335f5055f2 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/helm2.md
@@ -1,9 +1,5 @@
---
title: Kubernetes Installation Using Helm 2
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/helm2
- - /rancher/v2.x/en/installation/resources/advanced/helm2/
---
> After Helm 3 was released, the Rancher installation instructions were updated to use Helm 3.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/horizontal-pod-autoscaler.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/horizontal-pod-autoscaler.md
index 64195f8f1fb..23ff2df8e60 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/horizontal-pod-autoscaler.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/horizontal-pod-autoscaler.md
@@ -1,14 +1,11 @@
---
title: The Horizontal Pod Autoscaler
description: Learn about the horizontal pod autoscaler (HPA). How to manage HPAs and how to test them with a service deployment
-weight: 3026
-aliases:
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/horizontal-pod-autoscaler
---
The [Horizontal Pod Autoscaler](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) (HPA) is a Kubernetes feature that allows you to configure your cluster to automatically scale the services it's running up or down.
-Rancher provides some additional features to help manage HPAs, depending on the version of Rancher.
+Rancher provides some additional features to help manage HPAs, depending on the version of Rancher.
You can create, manage, and delete HPAs using the Rancher UI in Rancher v2.3.0-alpha4 and higher versions. It only supports HPA in the `autoscaling/v2beta2` API.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/infrastructure-setup.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/infrastructure-setup.md
index 081207021e8..f7b834992aa 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/infrastructure-setup.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/infrastructure-setup.md
@@ -1,7 +1,5 @@
---
title: Don't have infrastructure for your Kubernetes cluster? Try one of these tutorials.
-shortTitle: Infrastructure Tutorials
-weight: 5
---
To set up infrastructure for a high-availability K3s Kubernetes cluster with an external DB, refer to [this page.](../how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md)
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/install-cluster-autoscaler.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/install-cluster-autoscaler.md
index 40dafa4b01a..0dcca143dd7 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/install-cluster-autoscaler.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/install-cluster-autoscaler.md
@@ -1,6 +1,5 @@
---
title: Cluster Autoscaler
-weight: 1
---
In this section, you'll learn how to install and use the [Kubernetes cluster-autoscaler](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/) on Rancher custom clusters using AWS EC2 Auto Scaling Groups.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
index cc82308f9e0..36c6e615a6f 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
@@ -1,13 +1,6 @@
---
title: Install Rancher on a Kubernetes Cluster
description: Learn how to install Rancher in development and production environments. Read about single node and high availability installation
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/installation/k8s-install/
- - /rancher/v2.0-v2.4/en/installation/k8s-install/helm-rancher
- - /rancher/v2.0-v2.4/en/installation/k8s-install/kubernetes-rke
- - /rancher/v2.0-v2.4/en/installation/ha-server-install
- - /rancher/v2.0-v2.4/en/installation/install-rancher-on-k8s/install
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/installation-and-upgrade.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/installation-and-upgrade.md
index be59035e25d..d902ed409e7 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/installation-and-upgrade.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/installation-and-upgrade.md
@@ -1,9 +1,6 @@
---
title: Installing/Upgrading Rancher
description: Learn how to install Rancher in development and production environments. Read about single node and high availability installation
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/installation/how-ha-works/
---
This section provides an overview of the architecture options of installing Rancher, describing advantages of each option.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/installation-requirements.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/installation-requirements.md
index 9d8dd10bfcd..1d65bddd95f 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/installation-requirements.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/installation-requirements.md
@@ -1,7 +1,6 @@
---
title: Installation Requirements
description: Learn the node requirements for each node running Rancher server when you’re configuring Rancher to run either in a Docker or Kubernetes setup
-weight: 1
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/istio-setup-guide.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/istio-setup-guide.md
index 850213fe2b2..9d161f71454 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/istio-setup-guide.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/istio-setup-guide.md
@@ -1,11 +1,5 @@
---
title: Setup Guide
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/setup
- - /rancher/v2.0-v2.4/en/istio/legacy/setup
- - /rancher/v2.0-v2.4/en/istio/v2.3.x-v2.4.x/setup
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/setup/
---
This section describes how to enable Istio and start using it in your projects.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/istio.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/istio.md
index ca8bea220fd..7ad799b77b2 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/istio.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/istio.md
@@ -1,14 +1,7 @@
---
title: Istio
-weight: 15
-aliases:
- - /rancher/v2.0-v2.4/en/dashboard/istio
- - /rancher/v2.0-v2.4/en/project-admin/istio/configuring-resource-allocations/
- - /rancher/v2.0-v2.4/en/cluster-admin/tools/istio/
- - /rancher/v2.0-v2.4/en/project-admin/istio
- - /rancher/v2.0-v2.4/en/istio/legacy/cluster-istio
- - /rancher/v2.x/en/istio/v2.3.x-v2.4.x/
---
+
_Available as of v2.3.0_
[Istio](https://istio.io/) is an open-source tool that makes it easier for DevOps teams to observe, control, troubleshoot, and secure the traffic within a complex network of microservices.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-cluster-setup.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-cluster-setup.md
index 1e5b16f7eaa..e8074910cee 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-cluster-setup.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-cluster-setup.md
@@ -1,6 +1,5 @@
---
title: "Don't have a Kubernetes cluster? Try one of these tutorials."
-weight: 4
---
This section contains information on how to install a Kubernetes cluster that the Rancher server can be installed on.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
index 65326865b44..14235e618f8 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
@@ -1,11 +1,6 @@
---
title: Setting up Kubernetes Clusters in Rancher
description: Provisioning Kubernetes Clusters
-weight: 7
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/clusters/
- - /rancher/v2.0-v2.4/en/concepts/clusters/cluster-providers/
- - /rancher/v2.0-v2.4/en/tasks/clusters/
---
Rancher simplifies the creation of clusters by allowing you to create them through the Rancher UI rather than more complex alternatives. Rancher provides multiple options for launching a cluster. Use the option that best fits your use case.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-components.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-components.md
index 4fc8354908f..e93dd6bc8fd 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-components.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-components.md
@@ -1,6 +1,5 @@
---
title: Kubernetes Components
-weight: 100
---
The commands and steps listed in this section apply to the core Kubernetes components on [Rancher Launched Kubernetes](launch-kubernetes-with-rancher.md) clusters.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-resources-setup.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-resources-setup.md
index 37278de68ed..fef89392c66 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-resources-setup.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/kubernetes-resources-setup.md
@@ -1,10 +1,5 @@
---
title: Kubernetes Resources
-weight: 19
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/
- - /rancher/v2.0-v2.4/en/tasks/
- - /rancher/v2.0-v2.4/en/concepts/resources/
---
## Workloads
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/launch-kubernetes-with-rancher.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/launch-kubernetes-with-rancher.md
index dc82002fce9..f198523e3b2 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/launch-kubernetes-with-rancher.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/launch-kubernetes-with-rancher.md
@@ -1,6 +1,5 @@
---
title: Launching Kubernetes with Rancher
-weight: 4
---
You can have Rancher launch a Kubernetes cluster using any nodes you want. When Rancher deploys Kubernetes onto these nodes, it uses [Rancher Kubernetes Engine](https://rancher.com/docs/rke/latest/en/) (RKE), which is Rancher's own lightweight Kubernetes installer. It can launch Kubernetes on any computers, including:
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/load-balancer-and-ingress-controller.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/load-balancer-and-ingress-controller.md
index 09c4a898ac2..f5c26398be5 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/load-balancer-and-ingress-controller.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/load-balancer-and-ingress-controller.md
@@ -1,9 +1,6 @@
---
title: Set Up Load Balancer and Ingress Controller within Rancher
description: Learn how you can set up load balancers and ingress controllers to redirect service requests within Rancher, and learn about the limitations of load balancers
-weight: 3040
-aliases:
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/load-balancers-and-ingress
---
Within Rancher, you can set up load balancers and ingress controllers to redirect service requests.
@@ -42,7 +39,7 @@ As mentioned in the limitations above, the disadvantages of using a load balance
- If you run multiple services in your cluster, you must have a load balancer for each service.
- It can be expensive to have a load balancer for every service.
-In contrast, when an ingress is used as the entrypoint into a cluster, the ingress can route traffic to multiple services with greater flexibility. It can map multiple HTTP requests to services without individual IP addresses for each service.
+In contrast, when an ingress is used as the entrypoint into a cluster, the ingress can route traffic to multiple services with greater flexibility. It can map multiple HTTP requests to services without individual IP addresses for each service.
Therefore, it is useful to have an ingress if you want multiple services to be exposed with the same IP address, the same Layer 7 protocol, or the same privileged node-ports: 80 and 443.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-clusters.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-clusters.md
index 8168179c4cd..9761637dc32 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-clusters.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-clusters.md
@@ -1,6 +1,5 @@
---
title: Cluster Administration
-weight: 8
---
After you provision a cluster in Rancher, you can begin using powerful Kubernetes features to deploy and scale your containerized applications in development, testing, or production environments.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-project-resource-quotas.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-project-resource-quotas.md
index c2c7fed707d..203cc9086ac 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-project-resource-quotas.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-project-resource-quotas.md
@@ -1,8 +1,5 @@
---
title: Project Resource Quotas
-weight: 2515
-aliases:
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/projects-and-namespaces/resource-quotas
---
_Available as of v2.1.0_
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-projects.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-projects.md
index 63bb5b0ac91..69ae566f72a 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-projects.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-projects.md
@@ -1,9 +1,5 @@
---
title: Project Administration
-weight: 9
-aliases:
- - /rancher/v2.0-v2.4/en/project-admin/editing-projects/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/projects-and-namespaces/editing-projects/
---
_Projects_ are objects introduced in Rancher that help organize namespaces in your Kubernetes cluster. You can use projects to create multi-tenant clusters, which allows a group of users to share the same underlying resources without interacting with each other's applications.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-role-based-access-control-rbac.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-role-based-access-control-rbac.md
index c8afca26eba..8d63e7ad740 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-role-based-access-control-rbac.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/manage-role-based-access-control-rbac.md
@@ -1,8 +1,5 @@
---
title: Role-Based Access Control (RBAC)
-weight: 1120
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/global-configuration/users-permissions-roles/
---
Within Rancher, each person authenticates as a _user_, which is a login that grants you access to Rancher. As mentioned in [Authentication](about-authentication.md), users can either be local or external.
@@ -15,7 +12,7 @@ After you configure external authentication, the users that display on the **Use
## Users and Roles
-Once the user logs in to Rancher, their _authorization_, or their access rights within the system, is determined by _global permissions_, and _cluster and project roles_.
+Once the user logs in to Rancher, their _authorization_, or their access rights within the system, is determined by _global permissions_, and _cluster and project roles_.
- [Global Permissions](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md):
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/migrate-from-v1.6-v2.x.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/migrate-from-v1.6-v2.x.md
index be5272d555d..f876720eb7a 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/migrate-from-v1.6-v2.x.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/migrate-from-v1.6-v2.x.md
@@ -1,8 +1,5 @@
---
title: Migrating from v1.6 to v2.x
-weight: 28
-aliases:
- - /rancher/v2.x/en/v1.6-migration/
---
import YouTube from '@site/src/components/YouTube'
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/other-installation-methods.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/other-installation-methods.md
index 979c1de293f..6b0ad0cf9a9 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/other-installation-methods.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/other-installation-methods.md
@@ -1,6 +1,5 @@
---
title: Other Installation Methods
-weight: 3
---
### Air Gapped Installations
@@ -13,7 +12,7 @@ An air gapped environment could be where Rancher server will be installed offlin
The [single-node Docker installation](rancher-on-a-single-node-with-docker.md) is for Rancher users that are wanting to test out Rancher. Instead of running on a Kubernetes cluster using Helm, you install the Rancher server component on a single node using a `docker run` command.
-The Docker installation is for development and testing environments only.
+The Docker installation is for development and testing environments only.
Since there is only one node and a single Docker container, if the node goes down, there is no copy of the etcd data available on other nodes and you will lose all the data of your Rancher server.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/pipelines.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/pipelines.md
index 434869c3d41..4fdac342d40 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/pipelines.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/pipelines.md
@@ -1,8 +1,5 @@
---
title: Pipelines
-weight: 11
-aliases:
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/pipelines
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/project-tools.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/project-tools.md
index 34efe6fec16..3b5a78c1920 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/project-tools.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/project-tools.md
@@ -1,6 +1,5 @@
---
title: Tools for Logging, Monitoring, and More
-weight: 2525
---
Rancher contains a variety of tools that aren't included in Kubernetes to assist in your DevOps operations. Rancher can integrate with external services to help your clusters run more efficiently.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/provisioning-storage-examples.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/provisioning-storage-examples.md
index 1aa159e456b..72d452efcc1 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/provisioning-storage-examples.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/provisioning-storage-examples.md
@@ -1,9 +1,5 @@
---
title: Provisioning Storage Examples
-weight: 3053
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/clusters/adding-storage/provisioning-storage/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/volumes-and-storage/examples/
---
Rancher supports persistent storage with a variety of volume plugins. However, before you use any of these plugins to bind persistent storage to your workloads, you have to configure the storage itself, whether its a cloud-based solution from a service-provider or an on-prem solution that you manage yourself.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/quick-start-guides.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/quick-start-guides.md
index ab4d7ab47a1..7d0b30134d2 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/quick-start-guides.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/quick-start-guides.md
@@ -1,9 +1,7 @@
---
title: Rancher Deployment Quick Start Guides
-metaDescription: Use this section to jump start your Rancher deployment and testing. It contains instructions for a simple Rancher setup and some common use cases.
-short title: Use this section to jump start your Rancher deployment and testing. It contains instructions for a simple Rancher setup and some common use cases.
-weight: 2
---
+
>**Note:** The intent of these guides is to quickly launch a sandbox that you can use to evaluate Rancher. These guides are not intended for production environments. For comprehensive setup instructions, see [Installation](installation-and-upgrade.md).
Howdy buckaroos! Use this section of the docs to jump start your deployment and testing of Rancher 2.x! It contains instructions for a simple Rancher setup and some common use cases. We plan on adding more content to this section in the future.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-behind-an-http-proxy.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-behind-an-http-proxy.md
index a2dc3b1edaf..ef0d4acbe8e 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-behind-an-http-proxy.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-behind-an-http-proxy.md
@@ -1,6 +1,5 @@
---
title: Installing Rancher behind an HTTP Proxy
-weight: 4
---
In a lot of enterprise environments, servers or VMs running on premise do not have direct Internet access, but must connect to external services through a HTTP(S) proxy for security reasons. This tutorial shows step by step how to set up a highly available Rancher installation in such an environment.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-manager-architecture.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-manager-architecture.md
index 252d08a512f..db2e5229a15 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-manager-architecture.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-manager-architecture.md
@@ -1,6 +1,5 @@
---
title: Architecture
-weight: 1
---
This section focuses on the [Rancher server and its components](../reference-guides/rancher-manager-architecture/rancher-server-and-components.md) and how [Rancher communicates with downstream Kubernetes clusters](../reference-guides/rancher-manager-architecture/communicating-with-downstream-user-clusters.md).
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-on-a-single-node-with-docker.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
index c2f89a56b11..de8227bfd01 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
@@ -1,11 +1,6 @@
---
title: Installing Rancher on a Single Node Using Docker
description: For development and testing environments only, use a Docker install. Install Docker on a single Linux host, and deploy Rancher with a single Docker container.
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/installation/single-node-install/
- - /rancher/v2.0-v2.4/en/installation/single-node
- - /rancher/v2.0-v2.4/en/installation/other-installation-methods/single-node
---
Rancher can be installed by running a single Docker container.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-security.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-security.md
index 0edb3962173..5d693cbb46e 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-security.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-security.md
@@ -1,6 +1,5 @@
---
title: Security
-weight: 20
---
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.1-hardening-guides.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.1-hardening-guides.md
index 232d2a371a6..877f93821cc 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.1-hardening-guides.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.1-hardening-guides.md
@@ -1,8 +1,5 @@
---
title: Rancher v2.1
-weight: 5
-aliases:
- - /rancher/v2.x/en/security/rancher-2.1/
---
### Self Assessment Guide
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.2-hardening-guides.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.2-hardening-guides.md
index 1b955de4eb1..6d6ad8c1d33 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.2-hardening-guides.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.2-hardening-guides.md
@@ -1,8 +1,5 @@
---
title: Rancher v2.2
-weight: 4
-aliases:
- - /rancher/v2.x/en/security/rancher-2.2/
---
### Self Assessment Guide
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.3-hardening-guides.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.3-hardening-guides.md
index 9c900ead79a..7004ecdc89a 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.3-hardening-guides.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.3-hardening-guides.md
@@ -1,8 +1,5 @@
---
title: Rancher v2.3.x
-weight: 3
-aliases:
- - /rancher/v2.x/en/security/rancher-2.3.x/
---
The relevant Hardening Guide and Self Assessment guide depends on your Rancher version:
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.4-hardening-guides.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.4-hardening-guides.md
index d15db3271d2..4b4679c8a05 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.4-hardening-guides.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-v2.4-hardening-guides.md
@@ -1,8 +1,5 @@
---
title: Rancher v2.4
-weight: 2
-aliases:
- - /rancher/v2.x/en/security/rancher-2.4/
---
### Self Assessment Guide
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/resources.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/resources.md
index 9a841c2f18e..b596439a73e 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/resources.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/resources.md
@@ -1,8 +1,5 @@
---
title: Resources
-weight: 5
-aliases:
-- /rancher/v2.0-v2.4/en/installation/options
---
### Docker Installations
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/set-up-cloud-providers.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/set-up-cloud-providers.md
index 15fa601180a..903195f9aa7 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/set-up-cloud-providers.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/set-up-cloud-providers.md
@@ -1,10 +1,7 @@
---
title: Setting up Cloud Providers
-weight: 2300
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/clusters/cloud-providers/
- - /rancher/v2.0-v2.4/en/cluster-provisioning/rke-clusters/options/cloud-providers
---
+
A _cloud provider_ is a module in Kubernetes that provides an interface for managing nodes, load balancers, and networking routes. For more information, refer to the [official Kubernetes documentation on cloud providers.](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/)
When a cloud provider is set up in Rancher, the Rancher server can automatically provision new nodes, load balancers or persistent storage devices when launching Kubernetes definitions, if the cloud provider you're using supports such automation.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md
index 033fc28dd0b..36eac035e84 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md
@@ -1,6 +1,5 @@
---
title: Setting up Clusters from Hosted Kubernetes Providers
-weight: 3
---
In this scenario, Rancher does not provision Kubernetes because it is installed by providers such as Google Kubernetes Engine (GKE), Amazon Elastic Container Service for Kubernetes, or Azure Kubernetes Service.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/upgrades.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/upgrades.md
index 4fedc2fbd23..cd5eff2b4ed 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/upgrades.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/upgrades.md
@@ -1,20 +1,5 @@
---
title: Upgrades
-weight: 2
-aliases:
- - /rancher/v2.0-v2.4/en/upgrades/upgrades
- - /rancher/v2.0-v2.4/en/installation/upgrades-rollbacks/upgrades
- - /rancher/v2.0-v2.4/en/upgrades/upgrades/ha-server-upgrade-helm-airgap
- - /rancher/v2.0-v2.4/en/upgrades/air-gap-upgrade/
- - /rancher/v2.0-v2.4/en/upgrades/upgrades/ha
- - /rancher/v2.0-v2.4/en/installation/install-rancher-on-k8s/upgrades/upgrades/ha
- - /rancher/v2.0-v2.4/en/installation/upgrades-rollbacks/upgrades/
- - /rancher/v2.0-v2.4/en/upgrades/upgrades/ha-server-upgrade-helm/
- - /rancher/v2.0-v2.4/en/installation/upgrades-rollbacks/upgrades/ha
- - /rancher/v2.0-v2.4/en/installation/install-rancher-on-k8s/upgrades-rollbacks/upgrades
- - /rancher/v2.0-v2.4/en/installation/install-rancher-on-k8s/upgrades-rollbacks/upgrades/ha
- - /rancher/v2.0-v2.4/en/installation/upgrades-rollbacks/
- - /rancher/v2.0-v2.4/en/upgrades/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/use-existing-nodes.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/use-existing-nodes.md
index da647553f4d..a4a1f25b3f4 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/use-existing-nodes.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/use-existing-nodes.md
@@ -1,11 +1,6 @@
---
title: Launching Kubernetes on Existing Custom Nodes
description: To create a cluster with custom nodes, you’ll need to access servers in your cluster and provision them according to Rancher requirements
-metaDescription: "To create a cluster with custom nodes, you’ll need to access servers in your cluster and provision them according to Rancher requirements"
-weight: 2225
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/clusters/creating-a-cluster/create-cluster-custom/
- - /rancher/v2.0-v2.4/en/cluster-provisioning/custom-clusters/
---
When you create a custom cluster, Rancher uses RKE (the Rancher Kubernetes Engine) to create a Kubernetes cluster in on-prem bare-metal servers, on-prem virtual machines, or in any node hosted by an infrastructure provider.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md
index b605b066635..3f9e1612be4 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md
@@ -1,8 +1,5 @@
---
title: Launching Kubernetes on New Nodes in an Infrastructure Provider
-weight: 2205
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/global-configuration/node-templates/
---
Using Rancher, you can create pools of nodes based on a [node template](use-new-nodes-in-an-infra-provider.md#node-templates). This node template defines the parameters you want to use to launch nodes in your infrastructure providers or cloud providers.
@@ -45,13 +42,13 @@ To access all node templates, an administrator will need to do the following:
# Node Pools
-Using Rancher, you can create pools of nodes based on a [node template](#node-templates).
+Using Rancher, you can create pools of nodes based on a [node template](#node-templates).
A node template defines the configuration of a node, like what operating system to use, number of CPUs and amount of memory.
The benefit of using a node pool is that if a node is destroyed or deleted, you can increase the number of live nodes to compensate for the node that was lost. The node pool helps you ensure that the count of the node pool is as expected.
-Each node pool must have one or more nodes roles assigned.
+Each node pool must have one or more nodes roles assigned.
Each node role (i.e. etcd, control plane, and worker) should be assigned to a distinct node pool. Although it is possible to assign multiple node roles to a node pool, this should not be done for production clusters.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/use-windows-clusters.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/use-windows-clusters.md
index 11432f16517..9119acf2e4b 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/use-windows-clusters.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/use-windows-clusters.md
@@ -1,6 +1,5 @@
---
title: Launching Kubernetes on Windows Clusters
-weight: 2240
---
_Available as of v2.3.0_
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/user-settings.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/user-settings.md
index bf76a7e591c..2fa5a811b6f 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/user-settings.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/user-settings.md
@@ -1,8 +1,5 @@
---
title: User Settings
-weight: 23
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/user-settings/
---
Within Rancher, each user has a number of settings associated with their login: personal preferences, API keys, etc. You can configure these settings by choosing from the **User Settings** menu. You can open this menu by clicking your avatar, located within the main menu.
@@ -12,7 +9,7 @@ Within Rancher, each user has a number of settings associated with their login:
The available user settings are:
- [API & Keys](../reference-guides/user-settings/api-keys.md): If you want to interact with Rancher programmatically, you need an API key. Follow the directions in this section to obtain a key.
-- [Cloud Credentials](../reference-guides/user-settings/manage-cloud-credentials.md): Manage cloud credentials [used by node templates](use-new-nodes-in-an-infra-provider.md#node-templates) to [provision nodes for clusters](launch-kubernetes-with-rancher.md). Note: Available as of v2.2.0.
+- [Cloud Credentials](../reference-guides/user-settings/manage-cloud-credentials.md): Manage cloud credentials [used by node templates](use-new-nodes-in-an-infra-provider.md#node-templates) to [provision nodes for clusters](launch-kubernetes-with-rancher.md). Note: Available as of v2.2.0.
- [Node Templates](../reference-guides/user-settings/manage-node-templates.md): Manage templates [used by Rancher to provision nodes for clusters](launch-kubernetes-with-rancher.md).
- [Preferences](../reference-guides/user-settings/user-preferences.md): Sets superficial preferences for the Rancher UI.
- Log Out: Ends your user session.
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/vsphere.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/vsphere.md
index 2e85aa6a6fe..5e10df413d7 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/vsphere.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/vsphere.md
@@ -1,11 +1,6 @@
---
title: Creating a vSphere Cluster
-shortTitle: vSphere
description: Use Rancher to create a vSphere cluster. It may consist of groups of VMs with distinct properties which allow for fine-grained control over the sizing of nodes.
-metaDescription: Use Rancher to create a vSphere cluster. It may consist of groups of VMs with distinct properties which allow for fine-grained control over the sizing of nodes.
-weight: 2225
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/
---
import YouTube from '@site/src/components/YouTube'
diff --git a/versioned_docs/version-2.0-2.4/pages-for-subheaders/workloads-and-pods.md b/versioned_docs/version-2.0-2.4/pages-for-subheaders/workloads-and-pods.md
index b1916615b1f..94ac0881d6d 100644
--- a/versioned_docs/version-2.0-2.4/pages-for-subheaders/workloads-and-pods.md
+++ b/versioned_docs/version-2.0-2.4/pages-for-subheaders/workloads-and-pods.md
@@ -1,11 +1,6 @@
---
title: "Kubernetes Workloads and Pods"
description: "Learn about the two constructs with which you can build any complex containerized application in Kubernetes: Kubernetes workloads and pods"
-weight: 3025
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/workloads/
- - /rancher/v2.0-v2.4/en/tasks/workloads/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/workloads
---
You can build any complex containerized application in Kubernetes using two basic constructs: pods and workloads. Once you build an application, you can expose it for access either within the same cluster or on the Internet using a third construct: services.
diff --git a/versioned_docs/version-2.0-2.4/rancher-manager.md b/versioned_docs/version-2.0-2.4/rancher-manager.md
index f3b9282072d..2e65a444a6b 100644
--- a/versioned_docs/version-2.0-2.4/rancher-manager.md
+++ b/versioned_docs/version-2.0-2.4/rancher-manager.md
@@ -1,12 +1,6 @@
---
title: "Rancher 2.0-2.4"
-shortTitle: "Rancher 2.0-2.4"
description: "Rancher adds significant value on top of Kubernetes: managing hundreds of clusters from one interface, centralizing RBAC, enabling monitoring and alerting. Read more."
-metaTitle: "Rancher 2.0-2.4 Docs: What is New?"
-metaDescription: "Rancher 2 adds significant value on top of Kubernetes: managing hundreds of clusters from one interface, centralizing RBAC, enabling monitoring and alerting. Read more."
-insertOneSix: true
-weight: 1
-ctaBanner: 0
slug: /
---
Rancher was originally built to work with multiple orchestrators, and it included its own orchestrator called Cattle. With the rise of Kubernetes in the marketplace, Rancher 2.x exclusively deploys and manages Kubernetes clusters running anywhere, on any provider.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/about-the-api/api-tokens.md b/versioned_docs/version-2.0-2.4/reference-guides/about-the-api/api-tokens.md
index bf7b32a519c..6ef43e2a59c 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/about-the-api/api-tokens.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/about-the-api/api-tokens.md
@@ -1,8 +1,5 @@
---
title: API Tokens
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/cluster-admin/api/api-tokens/
---
By default, some cluster-level API tokens are generated with infinite time-to-live (`ttl=0`). In other words, API tokens with `ttl=0` never expire unless you invalidate them. Tokens are not invalidated by changing a password.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/best-practices/containers.md b/versioned_docs/version-2.0-2.4/reference-guides/best-practices/containers.md
index e92222db81f..d79f226ab64 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/best-practices/containers.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/best-practices/containers.md
@@ -1,10 +1,5 @@
---
title: Tips for Setting Up Containers
-weight: 100
-aliases:
- - /rancher/v2.0-v2.4/en/best-practices/containers
- - /rancher/v2.0-v2.4/en/best-practices/v2.0-v2.4/containers
- - /rancher/v2.x/en/best-practices/v2.0-v2.4/containers/
---
Running well-built containers can greatly impact the overall performance and security of your environment.
@@ -15,14 +10,14 @@ For a more detailed discussion of security for containers, you can also refer to
### Use a Common Container OS
-When possible, you should try to standardize on a common container base OS.
+When possible, you should try to standardize on a common container base OS.
Smaller distributions such as Alpine and BusyBox reduce container image size and generally have a smaller attack/vulnerability surface.
Popular distributions such as Ubuntu, Fedora, and CentOS are more field-tested and offer more functionality.
### Start with a FROM scratch container
-If your microservice is a standalone static binary, you should use a FROM scratch container.
+If your microservice is a standalone static binary, you should use a FROM scratch container.
The FROM scratch container is an [official Docker image](https://hub.docker.com/_/scratch) that is empty so that you can use it to design minimal images.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/best-practices/deployment-strategies.md b/versioned_docs/version-2.0-2.4/reference-guides/best-practices/deployment-strategies.md
index 950fc01a4f1..6fbf11b1836 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/best-practices/deployment-strategies.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/best-practices/deployment-strategies.md
@@ -1,10 +1,5 @@
---
title: Rancher Deployment Strategies
-weight: 100
-aliases:
- - /rancher/v2.0-v2.4/en/best-practices/deployment-strategies
- - /rancher/v2.0-v2.4/en/best-practices/v2.0-v2.4/deployment-strategies
- - /rancher/v2.x/en/best-practices/v2.0-v2.4/deployment-strategies/
---
There are two recommended deployment strategies. Each one has its own pros and cons. Read more about which one would fit best for your use case:
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/best-practices/deployment-types.md b/versioned_docs/version-2.0-2.4/reference-guides/best-practices/deployment-types.md
index 1245053576b..a162a574d38 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/best-practices/deployment-types.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/best-practices/deployment-types.md
@@ -1,10 +1,5 @@
---
title: Tips for Running Rancher
-weight: 100
-aliases:
- - /rancher/v2.0-v2.4/en/best-practices/deployment-types
- - /rancher/v2.0-v2.4/en/best-practices/v2.0-v2.4/deployment-types
- - /rancher/v2.x/en/best-practices/v2.0-v2.4/deployment-types/
---
A high-availability Kubernetes installation, defined as an installation of Rancher on a Kubernetes cluster with at least three nodes, should be used in any production installation of Rancher, as well as any installation deemed "important." Multiple Rancher instances running on multiple nodes ensure high availability that cannot be accomplished with a single node environment.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/best-practices/management.md b/versioned_docs/version-2.0-2.4/reference-guides/best-practices/management.md
index 6f355d88356..7ca1e045c19 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/best-practices/management.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/best-practices/management.md
@@ -1,11 +1,5 @@
---
title: Tips for Scaling, Security and Reliability
-weight: 101
-aliases:
- - /rancher/v2.0-v2.4/en/best-practices/management
- - /rancher/v2.0-v2.4/en/best-practices/v2.0-v2.4/management
- - /rancher/v2.x/en/best-practices/management/
- - /rancher/v2.x/en/best-practices/v2.0-v2.4/management/
---
Rancher allows you to set up numerous combinations of configurations. Some configurations are more appropriate for development and testing, while there are other best practices for production environments for maximum availability and fault tolerance. The following best practices should be followed for production.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/cli-with-rancher/rancher-cli.md b/versioned_docs/version-2.0-2.4/reference-guides/cli-with-rancher/rancher-cli.md
index 2ee88c3145d..f304e718cad 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/cli-with-rancher/rancher-cli.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/cli-with-rancher/rancher-cli.md
@@ -1,7 +1,6 @@
---
title: Rancher CLI
description: Interact with Rancher using command line interface (CLI) tools from your workstation.
-weight: 21
---
The Rancher CLI (Command Line Interface) is a unified tool that you can use to interact with Rancher. With this tool, you can operate Rancher using a command line rather than the GUI.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
index b9c906663b3..870dbf8347c 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
@@ -1,6 +1,5 @@
---
title: EC2 Node Template Configuration
-weight: 1
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md
index e4551ddaf8c..333c46964aa 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md
@@ -1,6 +1,5 @@
---
title: Azure Node Template Configuration
-weight: 1
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md
index ceafb97a9a1..8d4c04d486d 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md
@@ -1,6 +1,5 @@
---
title: DigitalOcean Node Template Configuration
-weight: 1
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/prior-to-v2.0.4.md b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/prior-to-v2.0.4.md
index ff78b02de48..ef992cdfb25 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/prior-to-v2.0.4.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/prior-to-v2.0.4.md
@@ -1,9 +1,5 @@
---
title: vSphere Node Template Configuration in Rancher before v2.0.4
-shortTitle: Before v2.0.4
-weight: 5
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/vsphere-node-template-config/prior-to-2.0.4/
---
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.0.4.md b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.0.4.md
index 6e0bdfcbf42..f8f18b67d30 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.0.4.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.0.4.md
@@ -1,9 +1,5 @@
---
title: vSphere Node Template Configuration in Rancher v2.0.4
-shortTitle: v2.0.4
-weight: 4
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/vsphere-node-template-config/v2.0.4/
---
@@ -19,7 +15,7 @@ In the **Account Access** section, enter the vCenter FQDN or IP address and the
## Scheduling
-Choose what hypervisor the virtual machine will be scheduled to.
+Choose what hypervisor the virtual machine will be scheduled to.
| Parameter | Required | Description |
|:------------------------|:--------:|:------------------------------------------------------------|
@@ -56,7 +52,7 @@ Optionally, you can:
- Assign labels to the VMs that can be used as a base for scheduling rules in the cluster.
- Customize the configuration of the Docker daemon on the VMs that will be created.
-> **Note:** Custom attributes are a legacy feature that will eventually be removed from vSphere.
+> **Note:** Custom attributes are a legacy feature that will eventually be removed from vSphere.
## Cloud Init
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.2.0.md b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.2.0.md
index 7372f695040..94536e886b6 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.2.0.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.2.0.md
@@ -1,9 +1,5 @@
---
title: vSphere Node Template Configuration in Rancher v2.2.0
-shortTitle: v2.2.0
-weight: 3
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/vsphere-node-template-config/v2.2.0/
---
@@ -22,7 +18,7 @@ Your cloud credential has these fields:
| Username and password | Enter your vSphere login username and password. |
## Scheduling
-Choose what hypervisor the virtual machine will be scheduled to.
+Choose what hypervisor the virtual machine will be scheduled to.
| Parameter | Required | Description |
|:------------------------|:--------:|:------------------------------------------------------------|
@@ -60,7 +56,7 @@ Optionally, you can:
- Assign labels to the VMs that can be used as a base for scheduling rules in the cluster.
- Customize the configuration of the Docker daemon on the VMs that will be created.
-> **Note:** Custom attributes are a legacy feature that will eventually be removed from vSphere.
+> **Note:** Custom attributes are a legacy feature that will eventually be removed from vSphere.
## Cloud Init
[Cloud-init](https://cloudinit.readthedocs.io/en/latest/) allows you to initialize your nodes by applying configuration on the first boot. This may involve things such as creating users, authorizing SSH keys or setting up the network.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.3.0.md b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.3.0.md
index 723579cf366..eca45797783 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.3.0.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.3.0.md
@@ -1,9 +1,5 @@
---
title: vSphere Node Template Configuration in Rancher v2.3.0
-shortTitle: v2.3.0
-weight: 2
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/vsphere-node-template-config/v2.3.0/
---
## Account Access
@@ -21,9 +17,9 @@ Your cloud credential has these fields:
| Username and password | Enter your vSphere login username and password. |
## Scheduling
-Choose what hypervisor the virtual machine will be scheduled to.
+Choose what hypervisor the virtual machine will be scheduled to.
-In the **Scheduling** section, enter:
+In the **Scheduling** section, enter:
- The name/path of the **Data Center** to create the VMs in
- The name of the **VM Network** to attach to
@@ -66,7 +62,7 @@ Optionally, you can:
- Assign labels to the VMs that can be used as a base for scheduling rules in the cluster.
- Customize the configuration of the Docker daemon on the VMs that will be created.
-> **Note:** Custom attributes are a legacy feature that will eventually be removed from vSphere.
+> **Note:** Custom attributes are a legacy feature that will eventually be removed from vSphere.
## Cloud Init
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.3.3.md b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.3.3.md
index 24912c78d8a..9076bd9a873 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.3.3.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere/v2.3.3.md
@@ -1,9 +1,5 @@
---
title: vSphere Node Template Configuration in Rancher v2.3.3
-shortTitle: v2.3.3
-weight: 1
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/vsphere-node-template-config/v2.3.3/
---
@@ -23,7 +19,7 @@ Your cloud credential has these fields:
## Scheduling
-Choose what hypervisor the virtual machine will be scheduled to.
+Choose what hypervisor the virtual machine will be scheduled to.
The fields in the **Scheduling** section should auto-populate with the data center and other scheduling options that are available to you in vSphere.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
index b2de3fa8d7f..dc65b97fc6d 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
@@ -1,6 +1,5 @@
---
title: RKE Cluster Configuration Reference
-weight: 2250
---
When Rancher installs Kubernetes, it uses [RKE](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) as the Kubernetes distribution.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md
index 0675c6ea9f5..39e33306ea9 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md
@@ -1,9 +1,5 @@
---
title: Rancher Agent Options
-weight: 2500
-aliases:
- - /rancher/v2.0-v2.4/en/admin-settings/agent-options/
- - /rancher/v2.0-v2.4/en/cluster-provisioning/custom-clusters/agent-options
---
Rancher deploys an agent on each node to communicate with the node. This pages describes the options that can be passed to the agent. To use these options, you will need to [create a cluster with custom nodes](../../../../pages-for-subheaders/use-existing-nodes.md) and add the options to the generated `docker run` command when adding a node.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/configure-openldap/openldap-config-reference.md b/versioned_docs/version-2.0-2.4/reference-guides/configure-openldap/openldap-config-reference.md
index 9efc94d203d..9e0b5ce1ad8 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/configure-openldap/openldap-config-reference.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/configure-openldap/openldap-config-reference.md
@@ -1,6 +1,5 @@
---
title: OpenLDAP Configuration Reference
-weight: 2
---
This section is intended to be used as a reference when setting up an OpenLDAP authentication provider in Rancher.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/installation-references/amazon-eks-permissions.md b/versioned_docs/version-2.0-2.4/reference-guides/installation-references/amazon-eks-permissions.md
index babdc2f9870..81f0e0dafac 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/installation-references/amazon-eks-permissions.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/installation-references/amazon-eks-permissions.md
@@ -1,9 +1,5 @@
---
title: Creating an EKS Cluster
-shortTitle: Amazon EKS
-weight: 2110
-aliases:
- - /rancher/v2.0-v2.4/en/tasks/clusters/creating-a-cluster/create-cluster-eks/
---
Amazon EKS provides a managed control plane for your Kubernetes cluster. Amazon EKS runs the Kubernetes control plane instances across multiple Availability Zones to ensure high availability. Rancher provides an intuitive user interface for managing and deploying the Kubernetes clusters you run in Amazon EKS. With this guide, you will use Rancher to quickly and easily launch an Amazon EKS Kubernetes cluster in your AWS account. For more information on Amazon EKS, see this [documentation](https://docs.aws.amazon.com/eks/latest/userguide/what-is-eks.html).
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/installation-references/helm-chart-options.md b/versioned_docs/version-2.0-2.4/reference-guides/installation-references/helm-chart-options.md
index 4f44df77932..1e0c1683ffe 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/installation-references/helm-chart-options.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/installation-references/helm-chart-options.md
@@ -1,11 +1,5 @@
---
title: Rancher Helm Chart Options
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/
- - /rancher/v2.0-v2.4/en/installation/options/chart-options/
- - /rancher/v2.0-v2.4/en/installation/options/helm2/helm-rancher/chart-options/
- - /rancher/v2.0-v2.4/en/installation/resources/chart-options
---
This page is a configuration reference for the Rancher Helm chart.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/installation-references/tls-settings.md b/versioned_docs/version-2.0-2.4/reference-guides/installation-references/tls-settings.md
index 7b076dfc821..5e2195a6d83 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/installation-references/tls-settings.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/installation-references/tls-settings.md
@@ -1,10 +1,5 @@
---
title: TLS Settings
-weight: 3
-aliases:
- - /rancher/v2.0-v2.4/en/installation/options/tls-settings/
- - /rancher/v2.0-v2.4/en/admin-settings/tls-settings
- - /rancher/v2.0-v2.4/en/installation/resources/encryption/tls-settings
---
In Rancher v2.1.7, the default TLS configuration changed to only accept TLS 1.2 and secure TLS cipher suites. TLS 1.3 and TLS 1.3 exclusive cipher suites are not supported.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/kubernetes-concepts.md b/versioned_docs/version-2.0-2.4/reference-guides/kubernetes-concepts.md
index 91766c781dd..c2918cc6de7 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/kubernetes-concepts.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/kubernetes-concepts.md
@@ -1,6 +1,5 @@
---
title: Kubernetes Concepts
-weight: 4
---
This page explains concepts related to Kubernetes that are important for understanding how Rancher works. The descriptions below provide a simplified interview of Kubernetes components. For more details, refer to the [official documentation on Kubernetes components.](https://kubernetes.io/docs/concepts/overview/components/)
@@ -34,7 +33,7 @@ Rancher uses etcd as a data store in both single node and high-availability inst
The state of a Kubernetes cluster is maintained in [etcd.](https://kubernetes.io/docs/concepts/overview/components/#etcd) The etcd nodes run the etcd database.
-The etcd database component is a distributed key-value store used as Kubernetes storage for all cluster data, such as cluster coordination and state management. It is recommended to run etcd on multiple nodes so that there's always a backup available for failover.
+The etcd database component is a distributed key-value store used as Kubernetes storage for all cluster data, such as cluster coordination and state management. It is recommended to run etcd on multiple nodes so that there's always a backup available for failover.
Although you can run etcd on just one node, etcd requires a majority of nodes, a quorum, to agree on updates to the cluster state. The cluster should always contain enough healthy etcd nodes to form a quorum. For a cluster with n members, a quorum is (n/2)+1. For any odd-sized cluster, adding one node will always increase the number of nodes necessary for a quorum.
@@ -45,7 +44,7 @@ Three etcd nodes is generally sufficient for smaller clusters and five etcd node
Controlplane nodes run the Kubernetes API server, scheduler, and controller manager. These nodes take care of routine tasks to ensure that your cluster maintains your configuration. Because all cluster data is stored on your etcd nodes, control plane nodes are stateless. You can run control plane on a single node, although three or more nodes are recommended for redundancy. Additionally, a single node can share the control plane and etcd roles.
### Worker Nodes
-
+
Each [worker node](https://kubernetes.io/docs/concepts/architecture/nodes/) runs the following:
- **Kubelets:** An agent that monitors the state of the node, ensuring your containers are healthy.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/pipelines/concepts.md b/versioned_docs/version-2.0-2.4/reference-guides/pipelines/concepts.md
index e12ac4a056a..f3df3cdc9d8 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/pipelines/concepts.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/pipelines/concepts.md
@@ -1,8 +1,5 @@
---
title: Concepts
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/pipelines/concepts
---
The purpose of this page is to explain common concepts and terminology related to pipelines.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/pipelines/configure-persistent-data.md b/versioned_docs/version-2.0-2.4/reference-guides/pipelines/configure-persistent-data.md
index 13dd3a0cfde..5432e755c48 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/pipelines/configure-persistent-data.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/pipelines/configure-persistent-data.md
@@ -1,8 +1,5 @@
---
title: Configuring Persistent Data for Pipeline Components
-weight: 600
-aliases:
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/pipelines/storage
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/pipelines/example-repositories.md b/versioned_docs/version-2.0-2.4/reference-guides/pipelines/example-repositories.md
index 8321430b7a8..c7caa3660fc 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/pipelines/example-repositories.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/pipelines/example-repositories.md
@@ -1,9 +1,5 @@
---
title: Example Repositories
-weight: 500
-aliases:
- - /rancher/v2.0-v2.4/en/tools/pipelines/quick-start-guide/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/pipelines/example-repos
---
Rancher ships with several example repositories that you can use to familiarize yourself with pipelines. We recommend configuring and testing the example repository that most resembles your environment before using pipelines with your own repositories in a production environment. Use this example repository as a sandbox for repo configuration, build demonstration, etc. Rancher includes example repositories for:
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/pipelines/example-yaml.md b/versioned_docs/version-2.0-2.4/reference-guides/pipelines/example-yaml.md
index 932e44f5bb8..e51edf244f3 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/pipelines/example-yaml.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/pipelines/example-yaml.md
@@ -1,9 +1,5 @@
---
title: Example YAML File
-weight: 501
-aliases:
- - /rancher/v2.0-v2.4/en/tools/pipelines/reference/
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/pipelines/example
---
Pipelines can be configured either through the UI or using a yaml file in the repository, i.e. `.rancher-pipeline.yml` or `.rancher-pipeline.yaml`.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/pipelines/pipeline-configuration.md b/versioned_docs/version-2.0-2.4/reference-guides/pipelines/pipeline-configuration.md
index 609598d27fc..08a6a8d4104 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/pipelines/pipeline-configuration.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/pipelines/pipeline-configuration.md
@@ -1,8 +1,5 @@
---
title: Pipeline Configuration Reference
-weight: 1
-aliases:
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/pipelines/config
---
In this section, you'll learn how to configure pipelines.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/pipelines/v2.0.x.md b/versioned_docs/version-2.0-2.4/reference-guides/pipelines/v2.0.x.md
index 737e55448f8..3c062207b9a 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/pipelines/v2.0.x.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/pipelines/v2.0.x.md
@@ -1,11 +1,5 @@
---
title: v2.0.x Pipeline Documentation
-weight: 9000
-aliases:
- - /rancher/v2.0-v2.4/en/project-admin/tools/pipelines/docs-for-v2.0.x
- - /rancher/v2.0-v2.4/en/project-admin/pipelines/docs-for-v2.0.x
- - /rancher/v2.0-v2.4/en/k8s-in-rancher/pipelines/docs-for-v2.0.x
- - /rancher/v2.x/en/pipelines/docs-for-v2.0.x/
---
>**Note:** This section describes the pipeline feature as implemented in Rancher v2.0.x. If you are using Rancher v2.1 or later, where pipelines have been significantly improved, please refer to the new documentation for [v2.1 or later](../../pages-for-subheaders/pipelines.md).
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-cluster-tools.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-cluster-tools.md
index 97727f725f6..1f02f912841 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-cluster-tools.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-cluster-tools.md
@@ -1,8 +1,5 @@
---
title: Tools for Logging, Monitoring, and More
-weight: 2033
-aliases:
- - /rancher/v2.0-v2.4/en/toolcluster-admin/tools/notifiers-and-alerts/
---
Rancher contains a variety of tools that aren't included in Kubernetes to assist in your DevOps operations. Rancher can integrate with external services to help your clusters run more efficiently.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-manager-architecture/architecture-recommendations.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-manager-architecture/architecture-recommendations.md
index ee6c0e24fbe..5a2d28689de 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-manager-architecture/architecture-recommendations.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-manager-architecture/architecture-recommendations.md
@@ -1,6 +1,5 @@
---
title: Architecture Recommendations
-weight: 3
---
Kubernetes cluster. If you are installing Rancher on a single node, the main architecture recommendation that applies to your installation is that the cluster running Rancher should be [separate from downstream clusters.](#separation-of-rancher-and-user-clusters)
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-project-tools/project-alerts.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-project-tools/project-alerts.md
index 16ebcb2ecad..7221e3b522b 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-project-tools/project-alerts.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-project-tools/project-alerts.md
@@ -1,11 +1,5 @@
---
title: Project Alerts
-weight: 2526
-aliases:
- - /rancher/v2.0-v2.4/en/project-admin/tools/alerts
- - /rancher/v2.0-v2.4/en/monitoring-alerting/legacy/alerts/project-alerts
- - /rancher/v2.0-v2.4/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-alerts/project-alerts
- - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-alerts/project-alerts/
---
To keep your clusters and applications healthy and driving your organizational productivity forward, you need to stay informed of events occurring in your clusters and projects, both planned and unplanned. When an event occurs, your alert is triggered, and you are sent a notification. You can then, if necessary, follow up with corrective actions.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-project-tools/project-logging.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-project-tools/project-logging.md
index c56b67568fa..0a2b5aec5a1 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-project-tools/project-logging.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-project-tools/project-logging.md
@@ -1,13 +1,5 @@
---
title: Project Logging
-shortTitle: Project Logging
-weight: 2527
-aliases:
- - /rancher/v2.0-v2.4/en/project-admin/tools/logging
- - /rancher/v2.0-v2.4/en/logging/legacy/project-logging
- - /rancher/v2.0-v2.4/en/logging/v2.0.x-v2.4.x/project-logging
- - /rancher/v2.x/en/logging/v2.0.x-v2.4.x/project-logging/
- - /rancher/v2.x/en/monitoring-alerting/v2.0.x-v2.4.x/cluster-monitoring/project-monitoring/
---
Rancher can integrate with a variety of popular logging services and tools that exist outside of your Kubernetes clusters.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.1-hardening-guides/hardening-guide-with-cis-v1.3-benchmark.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.1-hardening-guides/hardening-guide-with-cis-v1.3-benchmark.md
index 6c39212d353..b6d3931eb21 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.1-hardening-guides/hardening-guide-with-cis-v1.3-benchmark.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.1-hardening-guides/hardening-guide-with-cis-v1.3-benchmark.md
@@ -1,9 +1,5 @@
---
title: Hardening Guide v2.1
-weight: 104
-aliases:
- - /rancher/v2.0-v2.4/en/security/hardening-2.1
- - /rancher/v2.x/en/security/rancher-2.1/hardening-2.1/
---
This document provides prescriptive guidance for hardening a production installation of Rancher v2.1.x. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS).
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.1-hardening-guides/self-assessment-guide-with-cis-v1.3-benchmark.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.1-hardening-guides/self-assessment-guide-with-cis-v1.3-benchmark.md
index 15b400c431f..6c2975db6f8 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.1-hardening-guides/self-assessment-guide-with-cis-v1.3-benchmark.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.1-hardening-guides/self-assessment-guide-with-cis-v1.3-benchmark.md
@@ -1,9 +1,5 @@
---
title: CIS Benchmark Rancher Self-Assessment Guide v2.1
-weight: 209
-aliases:
- - /rancher/v2.0-v2.4/en/security/benchmark-2.1
- - /rancher/v2.x/en/security/rancher-2.1/benchmark-2.1/
---
This document is a companion to the Rancher v2.1 security hardening guide. The hardening guide provides prescriptive guidance for hardening a production installation of Rancher, and this benchmark guide is meant to help you evaluate the level of security of the hardened cluster against each control in the benchmark.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.2-hardening-guides/hardening-guide-with-cis-v1.4-benchmark.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.2-hardening-guides/hardening-guide-with-cis-v1.4-benchmark.md
index 7477a4cbaca..63bbded7242 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.2-hardening-guides/hardening-guide-with-cis-v1.4-benchmark.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.2-hardening-guides/hardening-guide-with-cis-v1.4-benchmark.md
@@ -1,9 +1,5 @@
---
title: Hardening Guide v2.2
-weight: 103
-aliases:
- - /rancher/v2.0-v2.4/en/security/hardening-2.2
- - /rancher/v2.x/en/security/rancher-2.2/hardening-2.2/
---
This document provides prescriptive guidance for hardening a production installation of Rancher v2.2.x. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS).
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.2-hardening-guides/self-assessment-guide-with-cis-v1.4-benchmark.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.2-hardening-guides/self-assessment-guide-with-cis-v1.4-benchmark.md
index 7d719a872dc..0e58dc87ea2 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.2-hardening-guides/self-assessment-guide-with-cis-v1.4-benchmark.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.2-hardening-guides/self-assessment-guide-with-cis-v1.4-benchmark.md
@@ -1,9 +1,5 @@
---
title: CIS Benchmark Rancher Self-Assessment Guide v2.2
-weight: 208
-aliases:
- - /rancher/v2.0-v2.4/en/security/benchmark-2.2
- - /rancher/v2.x/en/security/rancher-2.2/benchmark-2.2/
---
This document is a companion to the Rancher v2.2 security hardening guide. The hardening guide provides prescriptive guidance for hardening a production installation of Rancher, and this benchmark guide is meant to help you evaluate the level of security of the hardened cluster against each control in the benchmark.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.0-hardening-guide-with-cis-v1.4.1-benchmark.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.0-hardening-guide-with-cis-v1.4.1-benchmark.md
index 304185b014d..bf4d306a56f 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.0-hardening-guide-with-cis-v1.4.1-benchmark.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.0-hardening-guide-with-cis-v1.4.1-benchmark.md
@@ -1,10 +1,7 @@
---
title: Hardening Guide v2.3
-weight: 102
-aliases:
- - /rancher/v2.0-v2.4/en/security/hardening-2.3
- - /rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.0/hardening-2.3/
---
+
This document provides prescriptive guidance for hardening a production installation of Rancher v2.3.0-v2.3.2. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS).
> This hardening guide describes how to secure the nodes in your cluster, and it is recommended to follow this guide before installing Kubernetes.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.0-self-assessment-guide-with-cis-v1.4.1-benchmark.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.0-self-assessment-guide-with-cis-v1.4.1-benchmark.md
index 6c0fbc2b9ff..7bb086ce1c9 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.0-self-assessment-guide-with-cis-v1.4.1-benchmark.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.0-self-assessment-guide-with-cis-v1.4.1-benchmark.md
@@ -1,9 +1,5 @@
---
title: CIS Benchmark Rancher Self-Assessment Guide v2.3
-weight: 207
-aliases:
- - /rancher/v2.0-v2.4/en/security/benchmark-2.3
- - /rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.0/benchmark-2.3/
---
This document is a companion to the Rancher v2.3 security hardening guide. The hardening guide provides prescriptive guidance for hardening a production installation of Rancher, and this benchmark guide is meant to help you evaluate the level of security of the hardened cluster against each control in the benchmark.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.3-hardening-guide-with-cis-v1.4.1-benchmark.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.3-hardening-guide-with-cis-v1.4.1-benchmark.md
index 423a7fba412..ea822e1b3d1 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.3-hardening-guide-with-cis-v1.4.1-benchmark.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.3-hardening-guide-with-cis-v1.4.1-benchmark.md
@@ -1,9 +1,5 @@
---
title: Hardening Guide v2.3.3
-weight: 101
-aliases:
- - /rancher/v2.0-v2.4/en/security/hardening-2.3.3
- - /rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.3/hardening-2.3.3/
---
This document provides prescriptive guidance for hardening a production installation of Rancher v2.3.3. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS).
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.3-self-assessment-guide-with-cis-v1.4.1-benchmark.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.3-self-assessment-guide-with-cis-v1.4.1-benchmark.md
index ae53043ca3e..f00bcafbaeb 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.3-self-assessment-guide-with-cis-v1.4.1-benchmark.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.3-self-assessment-guide-with-cis-v1.4.1-benchmark.md
@@ -1,9 +1,5 @@
---
title: CIS Benchmark Rancher Self-Assessment Guide - Rancher v2.3.3
-weight: 206
-aliases:
- - /rancher/v2.0-v2.4/en/security/benchmark-2.3.3
- - /rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.3/benchmark-2.3.3/
---
This document is a companion to the Rancher v2.3.3 security hardening guide. The hardening guide provides prescriptive guidance for hardening a production installation of Rancher, and this benchmark guide is meant to help you evaluate the level of security of the hardened cluster against each control in the benchmark.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.5-hardening-guide-with-cis-v1.5-benchmark.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.5-hardening-guide-with-cis-v1.5-benchmark.md
index 0861c254004..b40effdb2f5 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.5-hardening-guide-with-cis-v1.5-benchmark.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.5-hardening-guide-with-cis-v1.5-benchmark.md
@@ -1,9 +1,5 @@
---
title: Hardening Guide v2.3.5
-weight: 100
-aliases:
- - /rancher/v2.0-v2.4/en/security/hardening-2.3.5
- - /rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.5/hardening-2.3.5/
---
This document provides prescriptive guidance for hardening a production installation of Rancher v2.3.5. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS).
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.5-self-assessment-guide-with-cis-v1.5-benchmark.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.5-self-assessment-guide-with-cis-v1.5-benchmark.md
index f6331e1176e..84a5b1a2991 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.5-self-assessment-guide-with-cis-v1.5-benchmark.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.3-hardening-guides/rancher-v2.3.5-self-assessment-guide-with-cis-v1.5-benchmark.md
@@ -1,9 +1,5 @@
---
title: CIS Benchmark Rancher Self-Assessment Guide - v2.3.5
-weight: 205
-aliases:
- - /rancher/v2.0-v2.4/en/security/benchmark-2.3.5
- - /rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.5/benchmark-2.3.5/
---
### CIS Kubernetes Benchmark v1.5 - Rancher v2.3.5 with Kubernetes v1.15
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.4-hardening-guides/hardening-guide-with-cis-v1.5-benchmark.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.4-hardening-guides/hardening-guide-with-cis-v1.5-benchmark.md
index 159ea25d420..b79cf332d87 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.4-hardening-guides/hardening-guide-with-cis-v1.5-benchmark.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.4-hardening-guides/hardening-guide-with-cis-v1.5-benchmark.md
@@ -1,9 +1,5 @@
---
title: Hardening Guide v2.4
-weight: 99
-aliases:
- - /rancher/v2.0-v2.4/en/security/hardening-2.4
- - /rancher/v2.x/en/security/rancher-2.4/hardening-2.4/
---
This document provides prescriptive guidance for hardening a production installation of Rancher v2.4. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS).
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.4-hardening-guides/self-assessment-guide-with-cis-v1.5-benchmark.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.4-hardening-guides/self-assessment-guide-with-cis-v1.5-benchmark.md
index 6c9debdaf14..77a6625e127 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.4-hardening-guides/self-assessment-guide-with-cis-v1.5-benchmark.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/rancher-v2.4-hardening-guides/self-assessment-guide-with-cis-v1.5-benchmark.md
@@ -1,9 +1,5 @@
---
title: CIS Benchmark Rancher Self-Assessment Guide - v2.4
-weight: 204
-aliases:
- - /rancher/v2.0-v2.4/en/security/benchmark-2.4
- - /rancher/v2.x/en/security/rancher-2.4/benchmark-2.4/
---
### CIS Kubernetes Benchmark v1.5 - Rancher v2.4 with Kubernetes v1.15
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/security-advisories-and-cves.md b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/security-advisories-and-cves.md
index d81b0ca31a2..84381237884 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/security-advisories-and-cves.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rancher-security/security-advisories-and-cves.md
@@ -1,6 +1,5 @@
---
title: Rancher CVEs and Resolutions
-weight: 300
---
Rancher is committed to informing the community of security issues in our products. Rancher will publish CVEs (Common Vulnerabilities and Exposures) for issues we have resolved.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/rke1-template-example-yaml.md b/versioned_docs/version-2.0-2.4/reference-guides/rke1-template-example-yaml.md
index 2be8946bfb7..d14e3863ff9 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/rke1-template-example-yaml.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/rke1-template-example-yaml.md
@@ -1,6 +1,5 @@
---
title: RKE1 Example YAML
-weight: 60
---
Below is an example RKE template configuration file for reference.
@@ -8,9 +7,9 @@ Below is an example RKE template configuration file for reference.
The YAML in the RKE template uses the same customization that is used when you create an RKE cluster. However, since the YAML is within the context of a Rancher provisioned RKE cluster, the customization from the RKE docs needs to be nested under the `rancher_kubernetes_engine` directive.
```yaml
-#
+#
# Cluster Config
-#
+#
docker_root_dir: /var/lib/docker
enable_cluster_alerting: false
@@ -20,7 +19,7 @@ enable_cluster_alerting: false
# but end users could still turn alerting
# on or off.
-enable_cluster_monitoring: true
+enable_cluster_monitoring: true
# This setting is not enforced. Clusters
# created with this sample template
# would have monitoring turned on
@@ -30,54 +29,54 @@ enable_cluster_monitoring: true
enable_network_policy: false
local_cluster_auth_endpoint:
enabled: true
-#
+#
# Rancher Config
-#
+#
rancher_kubernetes_engine_config: # Your RKE template config goes here.
addon_job_timeout: 30
authentication:
strategy: x509
ignore_docker_version: true
-#
+#
# # Currently only nginx ingress provider is supported.
# # To disable ingress controller, set `provider: none`
# # To enable ingress on specific nodes, use the node_selector, eg:
# provider: nginx
# node_selector:
# app: ingress
-#
+#
ingress:
provider: nginx
kubernetes_version: v1.15.3-rancher3-1
monitoring:
provider: metrics-server
-#
+#
# If you are using calico on AWS
-#
+#
# network:
# plugin: calico
# calico_network_provider:
# cloud_provider: aws
-#
+#
# # To specify flannel interface
-#
+#
# network:
# plugin: flannel
# flannel_network_provider:
# iface: eth1
-#
+#
# # To specify flannel interface for canal plugin
-#
+#
# network:
# plugin: canal
# canal_network_provider:
# iface: eth1
-#
+#
network:
options:
flannel_backend_type: vxlan
plugin: canal
-#
+#
# services:
# kube-api:
# service_cluster_ip_range: 10.43.0.0/16
@@ -87,7 +86,7 @@ rancher_kubernetes_engine_config: # Your RKE template config goes here.
# kubelet:
# cluster_domain: cluster.local
# cluster_dns_server: 10.43.0.10
-#
+#
services:
etcd:
backup_config:
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/single-node-rancher-in-docker/advanced-options.md b/versioned_docs/version-2.0-2.4/reference-guides/single-node-rancher-in-docker/advanced-options.md
index 0e4b32a8e1a..1aade691477 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/single-node-rancher-in-docker/advanced-options.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/single-node-rancher-in-docker/advanced-options.md
@@ -1,6 +1,5 @@
---
title: Advanced Options for Docker Installs
-weight: 5
---
When installing Rancher, there are several [advanced options](../../pages-for-subheaders/resources.md) that can be enabled:
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md b/versioned_docs/version-2.0-2.4/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md
index 060a4315992..cadf7494611 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md
@@ -1,9 +1,5 @@
---
title: HTTP Proxy Configuration
-weight: 251
-aliases:
- - /rancher/v2.0-v2.4/en/installation/proxy-configuration/
- - /rancher/v2.0-v2.4/en/installation/single-node/proxy
---
If you operate Rancher behind a proxy and you want to access services through the proxy (such as retrieving catalogs), you must provide Rancher information about your proxy. As Rancher is written in Go, it uses the common proxy environment variables as shown below.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/system-tools.md b/versioned_docs/version-2.0-2.4/reference-guides/system-tools.md
index 6c2692b8438..7af40f196e4 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/system-tools.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/system-tools.md
@@ -1,6 +1,5 @@
---
title: System Tools
-weight: 22
---
System Tools is a tool to perform operational tasks on [Rancher Launched Kubernetes](../pages-for-subheaders/launch-kubernetes-with-rancher.md) clusters or [installations of Rancher on an RKE cluster.](../pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md) The tasks include:
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/user-settings/api-keys.md b/versioned_docs/version-2.0-2.4/reference-guides/user-settings/api-keys.md
index 258d0488163..b0901b48f99 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/user-settings/api-keys.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/user-settings/api-keys.md
@@ -1,9 +1,5 @@
---
title: API Keys
-weight: 7005
-aliases:
- - /rancher/v2.0-v2.4/en/concepts/api-keys/
- - /rancher/v2.0-v2.4/en/tasks/user-settings/api-keys/
---
## API Keys and User Authentication
@@ -31,7 +27,7 @@ API Keys are composed of four components:
_Available as of v2.4.6_
Expiration period will be bound by `v3/settings/auth-token-max-ttl-minutes`. If it exceeds the max-ttl, API key will be created with max-ttl as the expiration period.
-
+
A scope will limit the API key so that it will only work against the Kubernetes API of the specified cluster. If the cluster is configured with an Authorized Cluster Endpoint, you will be able to use a scoped token directly against the cluster's API without proxying through the Rancher server. See [Authorized Cluster Endpoints](../../pages-for-subheaders/rancher-manager-architecture.md#4-authorized-cluster-endpoint) for more information.
4. Click **Create**.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/user-settings/manage-cloud-credentials.md b/versioned_docs/version-2.0-2.4/reference-guides/user-settings/manage-cloud-credentials.md
index f57e6397cc0..eef38414326 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/user-settings/manage-cloud-credentials.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/user-settings/manage-cloud-credentials.md
@@ -1,6 +1,5 @@
---
title: Managing Cloud Credentials
-weight: 7011
---
_Available as of v2.2.0_
@@ -31,7 +30,7 @@ All cloud credentials are bound to the user profile of who created it. They **ca
## Updating a Cloud Credential
-When access credentials are changed or compromised, updating a cloud credential allows you to rotate those credentials while keeping the same node template.
+When access credentials are changed or compromised, updating a cloud credential allows you to rotate those credentials while keeping the same node template.
1. From your user settings, select **User Avatar > Cloud Credentials**.
1. Choose the cloud credential you want to edit and click the **⋮ > Edit**.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/user-settings/manage-node-templates.md b/versioned_docs/version-2.0-2.4/reference-guides/user-settings/manage-node-templates.md
index ccce8609c42..d9da39eea9f 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/user-settings/manage-node-templates.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/user-settings/manage-node-templates.md
@@ -1,6 +1,5 @@
---
title: Managing Node Templates
-weight: 7010
---
When you provision a cluster [hosted by an infrastructure provider](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md), [node templates](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) are used to provision the cluster nodes. These templates use Docker Machine configuration options to define an operating system image and settings/parameters for the node. You can create node templates in two contexts:
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/user-settings/user-preferences.md b/versioned_docs/version-2.0-2.4/reference-guides/user-settings/user-preferences.md
index fc2fe8c1f2b..9521d13557c 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/user-settings/user-preferences.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/user-settings/user-preferences.md
@@ -1,6 +1,5 @@
---
title: User Preferences
-weight: 7012
---
Each user can choose preferences to personalize their Rancher experience. To change preference settings, open the **User Settings** menu and then select **Preferences**.
diff --git a/versioned_docs/version-2.0-2.4/reference-guides/v1.6-migration/migration-tools-cli-reference.md b/versioned_docs/version-2.0-2.4/reference-guides/v1.6-migration/migration-tools-cli-reference.md
index 6f5a6f8dfbd..7dad807768a 100644
--- a/versioned_docs/version-2.0-2.4/reference-guides/v1.6-migration/migration-tools-cli-reference.md
+++ b/versioned_docs/version-2.0-2.4/reference-guides/v1.6-migration/migration-tools-cli-reference.md
@@ -1,8 +1,5 @@
---
title: Migration Tools CLI Reference
-weight: 100
-aliases:
- - /rancher/v2.x/en/v1.6-migration/run-migration-tool/migration-tools-ref/
---
The migration-tools CLI includes multiple commands and options to assist your migration from Rancher v1.6 to Rancher v2.x.
@@ -84,4 +81,4 @@ migration-tools parse --docker-file --rancher-fil
>**Note:** If you omit the `--docker-file` and `--rancher-file` options from your command, the migration-tools CLI checks its home directory for these Compose files.
-**Result:** The migration-tools CLI parses your Compose files and outputs Kubernetes manifest specs as well as an `output.txt` file. For each service in the stack, a Kubernetes manifest is created and named the same as your service. The `output.txt` file lists all constructs for each service in `docker-compose.yml` that requires special handling to be successfully migrated to Rancher v2.x. Each construct links to the relevant blog articles on how to implement it in Rancher v2.x.
+**Result:** The migration-tools CLI parses your Compose files and outputs Kubernetes manifest specs as well as an `output.txt` file. For each service in the stack, a Kubernetes manifest is created and named the same as your service. The `output.txt` file lists all constructs for each service in `docker-compose.yml` that requires special handling to be successfully migrated to Rancher v2.x. Each construct links to the relevant blog articles on how to implement it in Rancher v2.x.
diff --git a/versioned_docs/version-2.0-2.4/security/rancher-2.3.x/rancher-v2.3.0/rancher-v2.3.0.md b/versioned_docs/version-2.0-2.4/security/rancher-2.3.x/rancher-v2.3.0/rancher-v2.3.0.md
index 93db3d94148..a5d9ae8ec66 100644
--- a/versioned_docs/version-2.0-2.4/security/rancher-2.3.x/rancher-v2.3.0/rancher-v2.3.0.md
+++ b/versioned_docs/version-2.0-2.4/security/rancher-2.3.x/rancher-v2.3.0/rancher-v2.3.0.md
@@ -1,8 +1,5 @@
---
title: Rancher v2.3.0
-weight: 3
-aliases:
- - /rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.0/
---
### Self Assessment Guide
diff --git a/versioned_docs/version-2.0-2.4/security/rancher-2.3.x/rancher-v2.3.3/rancher-v2.3.3.md b/versioned_docs/version-2.0-2.4/security/rancher-2.3.x/rancher-v2.3.3/rancher-v2.3.3.md
index 8eb00861b0d..c353c8a9a99 100644
--- a/versioned_docs/version-2.0-2.4/security/rancher-2.3.x/rancher-v2.3.3/rancher-v2.3.3.md
+++ b/versioned_docs/version-2.0-2.4/security/rancher-2.3.x/rancher-v2.3.3/rancher-v2.3.3.md
@@ -1,8 +1,5 @@
---
title: Rancher v2.3.3
-weight: 2
-aliases:
- - /rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.3/
---
### Self Assessment Guide
diff --git a/versioned_docs/version-2.0-2.4/security/rancher-2.3.x/rancher-v2.3.5/rancher-v2.3.5.md b/versioned_docs/version-2.0-2.4/security/rancher-2.3.x/rancher-v2.3.5/rancher-v2.3.5.md
index b0351ac0549..cf519162c6c 100644
--- a/versioned_docs/version-2.0-2.4/security/rancher-2.3.x/rancher-v2.3.5/rancher-v2.3.5.md
+++ b/versioned_docs/version-2.0-2.4/security/rancher-2.3.x/rancher-v2.3.5/rancher-v2.3.5.md
@@ -1,8 +1,5 @@
---
title: Rancher v2.3.5
-weight: 1
-aliases:
- - /rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.5/
---
### Self Assessment Guide
diff --git a/versioned_docs/version-2.0-2.4/security/security-scan/security-scan.md b/versioned_docs/version-2.0-2.4/security/security-scan/security-scan.md
index d709c5be32d..f9af3528bb5 100644
--- a/versioned_docs/version-2.0-2.4/security/security-scan/security-scan.md
+++ b/versioned_docs/version-2.0-2.4/security/security-scan/security-scan.md
@@ -1,8 +1,5 @@
---
title: Security Scans
-weight: 299
-aliases:
- - /rancher/v2.x/en/security/security-scan/
---
The documentation about CIS security scans has moved [here.](cis-scans)
diff --git a/versioned_docs/version-2.0-2.4/troubleshooting.md b/versioned_docs/version-2.0-2.4/troubleshooting.md
index 269c396b2ee..07ae43668ac 100644
--- a/versioned_docs/version-2.0-2.4/troubleshooting.md
+++ b/versioned_docs/version-2.0-2.4/troubleshooting.md
@@ -1,6 +1,5 @@
---
title: Troubleshooting
-weight: 26
---
This section contains information to help you troubleshoot issues when using Rancher.
diff --git a/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md b/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md
index 5fc74e0aae7..6f45a7a5b86 100644
--- a/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md
+++ b/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md
@@ -1,6 +1,5 @@
---
title: Troubleshooting Controlplane Nodes
-weight: 2
---
This section applies to nodes with the `controlplane` role.
diff --git a/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md b/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md
index 6f39f307282..aaf9fcc493d 100644
--- a/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md
+++ b/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md
@@ -1,6 +1,5 @@
---
title: Troubleshooting etcd Nodes
-weight: 1
---
This section contains commands and tips for troubleshooting nodes with the `etcd` role.
diff --git a/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md b/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md
index 70505e96280..d7cde4f794e 100644
--- a/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md
+++ b/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md
@@ -1,6 +1,5 @@
---
title: Troubleshooting nginx-proxy
-weight: 3
---
The `nginx-proxy` container is deployed on every node that does not have the `controlplane` role. It provides access to all the nodes with the `controlplane` role by dynamically generating the NGINX configuration based on available nodes with the `controlplane` role.
@@ -42,11 +41,11 @@ events {
stream {
upstream kube_apiserver {
-
+
server ip_of_controlplane_node1:6443;
-
+
server ip_of_controlplane_node2:6443;
-
+
}
server {
diff --git a/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md b/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md
index 28ee4499bb4..6d3a8bd7fcd 100644
--- a/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md
+++ b/versioned_docs/version-2.0-2.4/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md
@@ -1,6 +1,5 @@
---
title: Troubleshooting Worker Nodes and Generic Components
-weight: 4
---
This section applies to every node as it includes components that run on nodes with any role.
diff --git a/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/dns.md b/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/dns.md
index 8a91d3cba4c..643c7db59db 100644
--- a/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/dns.md
+++ b/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/dns.md
@@ -1,6 +1,5 @@
---
title: DNS
-weight: 103
---
The commands/steps listed on this page can be used to check name resolution issues in your cluster.
diff --git a/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md b/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md
index 5ca8cff1038..cbc265b8b20 100644
--- a/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md
+++ b/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md
@@ -1,6 +1,5 @@
---
title: Kubernetes resources
-weight: 101
---
The commands/steps listed on this page can be used to check the most important Kubernetes resources and apply to [Rancher Launched Kubernetes](../../pages-for-subheaders/launch-kubernetes-with-rancher.md) clusters.
diff --git a/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/logging.md b/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/logging.md
index 0c038f81ec4..9ac12aa1356 100644
--- a/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/logging.md
+++ b/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/logging.md
@@ -1,6 +1,5 @@
---
title: Logging
-weight: 110
---
The following log levels are used in Rancher:
diff --git a/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/networking.md b/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/networking.md
index ec55af18f04..5e9656d09bb 100644
--- a/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/networking.md
+++ b/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/networking.md
@@ -1,6 +1,5 @@
---
title: Networking
-weight: 102
---
The commands/steps listed on this page can be used to check networking related issues in your cluster.
diff --git a/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/rancher-ha.md b/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/rancher-ha.md
index a30b664c9e2..f1db2d95329 100644
--- a/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/rancher-ha.md
+++ b/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/rancher-ha.md
@@ -1,6 +1,5 @@
---
title: Rancher HA
-weight: 104
---
The commands/steps listed on this page can be used to check your Rancher Kubernetes Installation.
@@ -26,7 +25,7 @@ rancher-7dbd7875f7-qbj5k 1/1 Running 0 8m x.x.x.x x.x.x.
rancher-7dbd7875f7-qw7wb 1/1 Running 0 8m x.x.x.x x.x.x.x
```
-If a pod is unable to run (Status is not **Running**, Ready status is not showing `1/1` or you see a high count of Restarts), check the pod details, logs and namespace events.
+If a pod is unable to run (Status is not **Running**, Ready status is not showing `1/1` or you see a high count of Restarts), check the pod details, logs and namespace events.
#### Pod details
diff --git a/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/registered-clusters.md b/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/registered-clusters.md
index 14434b1fab3..063c35a38b6 100644
--- a/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/registered-clusters.md
+++ b/versioned_docs/version-2.0-2.4/troubleshooting/other-troubleshooting-tips/registered-clusters.md
@@ -1,6 +1,5 @@
---
title: Imported clusters
-weight: 105
---
The commands/steps listed on this page can be used to check clusters that you are importing or that are imported in Rancher.
@@ -11,7 +10,7 @@ Make sure you configured the correct kubeconfig (for example, `export KUBECONFIG
Communication to the cluster (Kubernetes API via cattle-cluster-agent) and communication to the nodes is done through Rancher agents.
-If the cattle-cluster-agent cannot connect to the configured `server-url`, the cluster will remain in **Pending** state, showing `Waiting for full cluster configuration`.
+If the cattle-cluster-agent cannot connect to the configured `server-url`, the cluster will remain in **Pending** state, showing `Waiting for full cluster configuration`.
#### cattle-node-agent
diff --git a/versioned_docs/version-2.5/backups/docker-installs/docker-installs.md b/versioned_docs/version-2.5/backups/docker-installs/docker-installs.md
index dde7afc9152..cc211cee5e0 100644
--- a/versioned_docs/version-2.5/backups/docker-installs/docker-installs.md
+++ b/versioned_docs/version-2.5/backups/docker-installs/docker-installs.md
@@ -1,11 +1,5 @@
---
title: Backup and Restore for Rancher Installed with Docker
-shortTitle: Docker Installs
-weight: 10
-aliases:
- - /rancher/v2.5/en/installation/backups-and-restoration/single-node-backup-and-restoration/
- - /rancher/v2.5/en/backups/v2.5/docker-installs
- - /rancher/v2.x/en/backups/v2.5/docker-installs/
---
- [Backups](../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md)
diff --git a/versioned_docs/version-2.5/cluster-provisioning/rke-clusters/options/options.md b/versioned_docs/version-2.5/cluster-provisioning/rke-clusters/options/options.md
index 0337111c18a..df00c9d57fe 100644
--- a/versioned_docs/version-2.5/cluster-provisioning/rke-clusters/options/options.md
+++ b/versioned_docs/version-2.5/cluster-provisioning/rke-clusters/options/options.md
@@ -1,8 +1,5 @@
---
title: RKE Cluster Configuration Reference
-weight: 2250
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/options/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/contribute-to-rancher.md b/versioned_docs/version-2.5/contribute-to-rancher.md
index 97c9313beb1..ef2b2d48497 100644
--- a/versioned_docs/version-2.5/contribute-to-rancher.md
+++ b/versioned_docs/version-2.5/contribute-to-rancher.md
@@ -1,9 +1,5 @@
---
title: Contributing to Rancher
-weight: 27
-aliases:
- - /rancher/v2.5/en/faq/contributing/
- - /rancher/v2.x/en/contributing/
---
This section explains the repositories used for Rancher, how to build the repositories, and what information to include when you file an issue.
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/configuration-reference.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/configuration-reference.md
index e69ffd0928a..df1ca5c2d00 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/configuration-reference.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/configuration-reference.md
@@ -1,9 +1,5 @@
---
title: Configuration
-weight: 3
-aliases:
- - /rancher/v2.5/en/cis-scans/v2.5/configuration
- - /rancher/v2.x/en/cis-scans/v2.5/configuration/
---
This configuration reference is intended to help you manage the custom resources created by the `rancher-cis-benchmark` application. These resources are used for performing CIS scans on a cluster, skipping tests, setting the test profile that will be used during a scan, and other customization.
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md
index 2a2d01225ca..97a39d1a611 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md
@@ -1,21 +1,17 @@
---
title: Creating a Custom Benchmark Version for Running a Cluster Scan
-weight: 4
-aliases:
- - /rancher/v2.5/en/cis-scans/v2.5/custom-benchmark
- - /rancher/v2.x/en/cis-scans/v2.5/custom-benchmark/
---
_Available as of v2.5.4_
Each Benchmark Version defines a set of test configuration files that define the CIS tests to be run by the kube-bench tool.
The `rancher-cis-benchmark` application installs a few default Benchmark Versions which are listed under CIS Benchmark application menu.
-
+
But there could be some Kubernetes cluster setups that require custom configurations of the Benchmark tests. For example, the path to the Kubernetes config files or certs might be different than the standard location where the upstream CIS Benchmarks look for them.
It is now possible to create a custom Benchmark Version for running a cluster scan using the `rancher-cis-benchmark` application.
-When a cluster scan is run, you need to select a Profile which points to a specific Benchmark Version.
+When a cluster scan is run, you need to select a Profile which points to a specific Benchmark Version.
Follow all the steps below to add a custom Benchmark Version and run a scan using it.
@@ -26,7 +22,7 @@ To create a custom benchmark version, first you need to create a ConfigMap conta
To prepare a custom benchmark version ConfigMap, suppose we want to add a custom Benchmark Version named `foo`.
1. Create a directory named `foo` and inside this directory, place all the config YAML files that the kube-bench tool looks for. For example, here are the config YAML files for a Generic CIS 1.5 Benchmark Version https://github.com/aquasecurity/kube-bench/tree/master/cfg/cis-1.5
-1. Place the complete `config.yaml` file, which includes all the components that should be tested.
+1. Place the complete `config.yaml` file, which includes all the components that should be tested.
1. Add the Benchmark version name to the `target_mapping` section of the `config.yaml`:
```yaml
@@ -46,7 +42,7 @@ To prepare a custom benchmark version ConfigMap, suppose we want to add a custom
### 2. Add a Custom Benchmark Version to a Cluster
-1. Once the ConfigMap has been created in your cluster, navigate to the **Cluster Explorer** in the Rancher UI.
+1. Once the ConfigMap has been created in your cluster, navigate to the **Cluster Explorer** in the Rancher UI.
1. In the top left dropdown menu, click **Cluster Explorer > CIS Benchmark.**
1. In the **Benchmark Versions** section, click **Create.**
1. Enter the **Name** and a description for your custom benchmark version.
@@ -59,7 +55,7 @@ To prepare a custom benchmark version ConfigMap, suppose we want to add a custom
To run a scan using your custom benchmark version, you need to add a new Profile pointing to this benchmark version.
-1. Once the custom benchmark version has been created in your cluster, navigate to the **Cluster Explorer** in the Rancher UI.
+1. Once the custom benchmark version has been created in your cluster, navigate to the **Cluster Explorer** in the Rancher UI.
1. In the top left dropdown menu, click **Cluster Explorer > CIS Benchmark.**
1. In the **Profiles** section, click **Create.**
1. Provide a **Name** and description. In this example, we name it `foo-profile`.
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
index dc158048ef1..8a88240d963 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
@@ -1,11 +1,5 @@
---
title: Roles-based Access Control
-shortTitle: RBAC
-weight: 3
-aliases:
- - /rancher/v2.5/en/cis-scans/rbac
- - /rancher/v2.5/en/cis-scans/v2.5/rbac
- - /rancher/v2.x/en/cis-scans/v2.5/rbac/
---
This section describes the permissions required to use the rancher-cis-benchmark App.
@@ -17,7 +11,7 @@ However, the `rancher-cis-benchmark` chart installs these two default `ClusterRo
- cis-admin
- cis-view
-In Rancher, only cluster owners and global administrators have `cis-admin` access by default.
+In Rancher, only cluster owners and global administrators have `cis-admin` access by default.
Note: If you were using the `cis-edit` role added in Rancher v2.5 setup, it has now been removed since
Rancher v2.5.2 because it essentially is same as `cis-admin`. If you happen to create any clusterrolebindings
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
index 47211e6c724..b11887c76c1 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
@@ -1,10 +1,5 @@
---
title: Skipped and Not Applicable Tests
-weight: 3
-aliases:
- - /rancher/v2.5/en/cis-scans/skipped-tests
- - /rancher/v2.5/en/cis-scans/v2.5/skipped-tests
- - /rancher/v2.x/en/cis-scans/v2.5/skipped-tests/
---
This section lists the tests that are skipped in the permissive test profile for RKE.
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
index f7725ddddde..f012a3a9921 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
@@ -1,6 +1,5 @@
---
title: Architecture
-weight: 1
---
Fleet can manage deployments from git of raw Kubernetes YAML, Helm charts, or Kustomize or any combination of the three. Regardless of the source, all resources are dynamically turned into Helm charts, and Helm is used as the engine to deploy everything in the cluster. This gives you a high degree of control, consistency, and auditability. Fleet focuses not only on the ability to scale, but to give one a high degree of control and visibility to exactly what is installed on the cluster.
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
index d0b777f262e..cf50340b7c7 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
@@ -1,6 +1,5 @@
---
title: Using Fleet Behind a Proxy
-weight: 3
---
_Available as of v2.5.8_
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
index a2cb842fc0b..edb26fffd7f 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
@@ -1,6 +1,5 @@
---
title: Windows Support
-weight: 2
---
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
index 6e97f32ed76..24b9be34781 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
@@ -1,9 +1,5 @@
---
title: Additional Steps for Installing Istio on an RKE2 Cluster
-weight: 3
-aliases:
- - /rancher/v2.5/en/istio/v2.5/configuration-reference/rke2
- - /rancher/v2.x/en/istio/v2.5/configuration-reference/rke2/
---
Through the **Cluster Explorer,** when installing or upgrading Istio through **Apps & Marketplace,**
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
index 5e23dc36e47..2bdf4b869ab 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
@@ -1,12 +1,5 @@
---
title: Enable Istio with Pod Security Policies
-weight: 1
-aliases:
- - /rancher/v2.5/en/istio/setup/enable-istio-in-cluster/enable-istio-with-psp
- - /rancher/v2.5/en/istio/legacy/setup/enable-istio-in-cluster/enable-istio-with-psp
- - /rancher/v2.5/en/istio/v2.5/setup/enable-istio-in-cluster/enable-istio-with-psp
- - /rancher/v2.5/en/istio/v2.5/configuration-reference/enable-istio-with-psp
- - /rancher/v2.x/en/istio/v2.5/configuration-reference/enable-istio-with-psp/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
index 7dd221cb4fa..16fde314183 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
@@ -1,9 +1,5 @@
---
title: Additional Steps for Project Network Isolation
-weight: 4
-aliases:
- - /rancher/v2.5/en/istio/v2.5/configuration-reference/canal-and-project-network
- - /rancher/v2.x/en/istio/v2.5/configuration-reference/canal-and-project-network/
---
In clusters where:
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
index f6ab646cedb..c4ee390f09a 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
@@ -1,25 +1,20 @@
---
title: Selectors and Scrape Configs
-weight: 2
-aliases:
- - /rancher/v2.5/en/istio/v2.5/configuration-reference/selectors-and-scrape
- - /rancher/v2.5/en/istio/setup/node-selectors
- - /rancher/v2.x/en/istio/v2.5/configuration-reference/selectors-and-scrape/
---
The Monitoring app sets `prometheus.prometheusSpec.ignoreNamespaceSelectors=false`, which enables monitoring across all namespaces by default.
-This ensures you can view traffic, metrics and graphs for resources deployed in a namespace with `istio-injection=enabled` label.
+This ensures you can view traffic, metrics and graphs for resources deployed in a namespace with `istio-injection=enabled` label.
If you would like to limit Prometheus to specific namespaces, set `prometheus.prometheusSpec.ignoreNamespaceSelectors=true`. Once you do this, you will need to add additional configuration to continue to monitor your resources.
### Limiting Monitoring to Specific Namespaces by Setting ignoreNamespaceSelectors to True
-This limits monitoring to specific namespaces.
+This limits monitoring to specific namespaces.
-1. From the **Cluster Explorer**, navigate to **Installed Apps** if Monitoring is already installed, or **Charts** in **Apps & Marketplace**
-1. If starting a new install, **Click** the **rancher-monitoring** chart, then in **Chart Options** click **Edit as Yaml**.
-1. If updating an existing installation, click on **Upgrade**, then in **Chart Options** click **Edit as Yaml**.
+1. From the **Cluster Explorer**, navigate to **Installed Apps** if Monitoring is already installed, or **Charts** in **Apps & Marketplace**
+1. If starting a new install, **Click** the **rancher-monitoring** chart, then in **Chart Options** click **Edit as Yaml**.
+1. If updating an existing installation, click on **Upgrade**, then in **Chart Options** click **Edit as Yaml**.
1. Set`prometheus.prometheusSpec.ignoreNamespaceSelectors=true`
1. Complete install or upgrade
@@ -27,26 +22,26 @@ This limits monitoring to specific namespaces.
### Enabling Prometheus to Detect Resources in Other Namespaces
-There are two different ways to enable Prometheus to detect resources in other namespaces when `prometheus.prometheusSpec.ignoreNamespaceSelectors=true`:
+There are two different ways to enable Prometheus to detect resources in other namespaces when `prometheus.prometheusSpec.ignoreNamespaceSelectors=true`:
- **Monitoring specific namespaces:** Add a Service Monitor or Pod Monitor in the namespace with the targets you want to scrape.
- **Monitoring across namespaces:** Add an `additionalScrapeConfig` to your rancher-monitoring instance to scrape all targets in all namespaces.
### Monitoring Specific Namespaces: Create a Service Monitor or Pod Monitor
-This option allows you to define which specific services or pods you would like monitored in a specific namespace.
+This option allows you to define which specific services or pods you would like monitored in a specific namespace.
The usability tradeoff is that you have to create the service monitor or pod monitor per namespace since you cannot monitor across namespaces.
-> **Prerequisite:** Define a ServiceMonitor or PodMonitor for ``. An example ServiceMonitor is provided below.
+> **Prerequisite:** Define a ServiceMonitor or PodMonitor for ``. An example ServiceMonitor is provided below.
1. From the **Cluster Explorer**, open the kubectl shell
-1. Run `kubectl create -f .yaml` if the file is stored locally in your cluster.
-1. Or run `cat<< EOF | kubectl apply -f -`, paste the file contents into the terminal, then run `EOF` to complete the command.
-1. If starting a new install, **Click** the **rancher-monitoring** chart and scroll down to **Preview Yaml**.
+1. Run `kubectl create -f .yaml` if the file is stored locally in your cluster.
+1. Or run `cat<< EOF | kubectl apply -f -`, paste the file contents into the terminal, then run `EOF` to complete the command.
+1. If starting a new install, **Click** the **rancher-monitoring** chart and scroll down to **Preview Yaml**.
1. Run `kubectl label namespace istio-injection=enabled` to enable the envoy sidecar injection
-**Result:** `` can be scraped by prometheus.
+**Result:** `` can be scraped by prometheus.
Example Service Monitor for Istio Proxies
@@ -85,14 +80,14 @@ spec:
### Monitoring across namespaces: Set ignoreNamespaceSelectors to False
-This enables monitoring across namespaces by giving Prometheus additional scrape configurations.
+This enables monitoring across namespaces by giving Prometheus additional scrape configurations.
-The usability tradeoff is that all of Prometheus' `additionalScrapeConfigs` are maintained in a single Secret. This could make upgrading difficult if monitoring is already deployed with additionalScrapeConfigs before installing Istio.
+The usability tradeoff is that all of Prometheus' `additionalScrapeConfigs` are maintained in a single Secret. This could make upgrading difficult if monitoring is already deployed with additionalScrapeConfigs before installing Istio.
-1. If starting a new install, **Click** the **rancher-monitoring** chart, then in **Chart Options** click **Edit as Yaml**.
-1. If updating an existing installation, click on **Upgrade**, then in **Chart Options** click **Edit as Yaml**.
+1. If starting a new install, **Click** the **rancher-monitoring** chart, then in **Chart Options** click **Edit as Yaml**.
+1. If updating an existing installation, click on **Upgrade**, then in **Chart Options** click **Edit as Yaml**.
1. If updating an existing installation, click on **Upgrade** and then **Preview Yaml**.
-1. Set`prometheus.prometheusSpec.additionalScrapeConfigs` array to the **Additional Scrape Config** provided below.
+1. Set`prometheus.prometheusSpec.additionalScrapeConfigs` array to the **Additional Scrape Config** provided below.
1. Complete install or upgrade
**Result:** All namespaces with the `istio-injection=enabled` label will be scraped by prometheus.
@@ -122,4 +117,4 @@ The usability tradeoff is that all of Prometheus' `additionalScrapeConfigs` are
- source_labels: [__meta_kubernetes_pod_name]
action: replace
target_label: pod_name
-```
+```
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
index aa1be72a604..b985fdd8c44 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
@@ -1,12 +1,5 @@
---
title: CPU and Memory Allocations
-weight: 1
-aliases:
- - /rancher/v2.5/en/project-admin/istio/configuring-resource-allocations/
- - /rancher/v2.5/en/project-admin/istio/config/
- - /rancher/v2.5/en/istio/resources
- - /rancher/v2.5/en/istio/v2.5/resources
- - /rancher/v2.x/en/istio/v2.5/resources/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/disable-istio.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/disable-istio.md
index d258d8827c2..3e883940070 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/disable-istio.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/disable-istio.md
@@ -1,9 +1,5 @@
---
title: Disabling Istio
-weight: 4
-aliases:
- - /rancher/v2.5/en/istio/v2.5/disabling-istio
- - /rancher/v2.x/en/istio/v2.5/disabling-istio/
---
This section describes how to uninstall Istio in a cluster or disable a namespace, or workload.
@@ -16,7 +12,7 @@ To uninstall Istio,
1. Select `rancher-istio` in the `istio-system namespace and click **Delete**
1. After `rancher-istio` is deleted, you can then select all the remaining apps in the `istio-system` namespace and click **Delete**
-**Result:** The `rancher-istio` app in the cluster gets removed. The Istio sidecar cannot be deployed on any workloads in the cluster.
+**Result:** The `rancher-istio` app in the cluster gets removed. The Istio sidecar cannot be deployed on any workloads in the cluster.
**Note:** You can no longer disable and re-enable your Istio installation. If you would like to save your settings for a future install, view and save individual YAMLs to refer back to / reuse for future installations.
@@ -28,7 +24,7 @@ This could mean a few things. You either selected all the apps in the `istio-sys
## Disable Istio in a Namespace
-1. From the **Cluster Explorer** view, use the side-nav to select **Namespaces** page
+1. From the **Cluster Explorer** view, use the side-nav to select **Namespaces** page
1. On the **Namespace** page, you will see a list of namespaces. Go to the namespace where you want to disable and click the select **Edit as Form** or **Edit as Yaml**
1. Remove the `istio-injection=enabled` label from the namespace
1. Click **Save**
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/rbac-for-istio.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/rbac-for-istio.md
index 2ef832f277d..e33bdb72540 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/rbac-for-istio.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/istio/rbac-for-istio.md
@@ -1,10 +1,5 @@
---
title: Role-based Access Control
-weight: 3
-aliases:
- - /rancher/v2.5/en/istio/rbac
- - /rancher/v2.5/en/istio/v2.5/rbac
- - /rancher/v2.x/en/istio/v2.5/rbac/
---
This section describes the permissions required to access Istio features.
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
index b6c8755a798..dee41b03ba4 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
@@ -1,6 +1,5 @@
---
title: Flows and ClusterFlows
-weight: 1
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
index 8fa7b835653..88ccb108608 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
@@ -1,6 +1,5 @@
---
title: Outputs and ClusterOutputs
-weight: 2
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/logging-architecture.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/logging-architecture.md
index 657cedd67ee..9bacb0dad6e 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/logging-architecture.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/logging-architecture.md
@@ -1,6 +1,5 @@
---
title: Architecture
-weight: 1
---
This section summarizes the architecture of the Rancher logging application.
@@ -20,15 +19,15 @@ The following changes were introduced to logging in Rancher v2.5:
### How the Banzai Cloud Logging Operator Works
-The Logging operator automates the deployment and configuration of a Kubernetes logging pipeline. It deploys and configures a Fluent Bit DaemonSet on every node to collect container and application logs from the node file system.
+The Logging operator automates the deployment and configuration of a Kubernetes logging pipeline. It deploys and configures a Fluent Bit DaemonSet on every node to collect container and application logs from the node file system.
Fluent Bit queries the Kubernetes API and enriches the logs with metadata about the pods, and transfers both the logs and the metadata to Fluentd. Fluentd receives, filters, and transfers logs to multiple `Outputs`.
-The following custom resources are used to define how logs are filtered and sent to their `Outputs`:
+The following custom resources are used to define how logs are filtered and sent to their `Outputs`:
-- A `Flow` is a namespaced custom resource that uses filters and selectors to route log messages to the appropriate `Outputs`.
+- A `Flow` is a namespaced custom resource that uses filters and selectors to route log messages to the appropriate `Outputs`.
- A `ClusterFlow` is used to route cluster-level log messages.
-- An `Output` is a namespaced resource that defines where the log messages are sent.
+- An `Output` is a namespaced resource that defines where the log messages are sent.
- A `ClusterOutput` defines an `Output` that is available from all `Flows` and `ClusterFlows`.
Each `Flow` must reference an `Output`, and each `ClusterFlow` must reference a `ClusterOutput`.
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md
index 585fb6c9404..2b005453b9e 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md
@@ -1,7 +1,5 @@
---
title: rancher-logging Helm Chart Options
-shortTitle: Helm Chart Options
-weight: 4
---
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
index 8a53b44c63e..b0552cbf350 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
@@ -1,13 +1,10 @@
---
title: Migrating to Rancher v2.5 Logging
-weight: 2
-aliases:
- - /rancher/v2.5/en/logging/v2.5/migrating
- - /rancher/v2.x/en/logging/v2.5/migrating/
---
+
Starting in v2.5, the logging feature available within Rancher has been completely overhauled. The [logging operator](https://github.com/banzaicloud/logging-operator) from Banzai Cloud has been adopted; Rancher configures this tooling for use when deploying logging.
-Among the many features and changes in the new logging functionality is the removal of project-specific logging configurations. Instead, one now configures logging at the namespace level. Cluster-level logging remains available, but configuration options differ.
+Among the many features and changes in the new logging functionality is the removal of project-specific logging configurations. Instead, one now configures logging at the namespace level. Cluster-level logging remains available, but configuration options differ.
> Note: The pre-v2.5 user interface is now referred to as the _Cluster Manager_. The v2.5+ dashboard is referred to as the _Cluster Explorer_.
@@ -18,23 +15,23 @@ To install logging in Rancher v2.5+, refer to the [installation instructions](..
### Terminology
-In v2.5, logging configuration is centralized under a _Logging_ menu option available in the _Cluster Explorer_. It is from this menu option that logging for both cluster and namespace is configured.
+In v2.5, logging configuration is centralized under a _Logging_ menu option available in the _Cluster Explorer_. It is from this menu option that logging for both cluster and namespace is configured.
-> Note: Logging is installed on a per-cluster basis. You will need to navigate between clusters to configure logging for each cluster.
+> Note: Logging is installed on a per-cluster basis. You will need to navigate between clusters to configure logging for each cluster.
There are four key concepts to understand for v2.5+ logging:
1. Outputs
-
+
`Outputs` are a configuration resource that determine a destination for collected logs. This is where settings for aggregators such as ElasticSearch, Kafka, etc. are stored. `Outputs` are namespaced resources.
2. Flows
- `Flows` are a configuration resource that determine collection, filtering, and destination rules for logs. It is within a flow that one will configure what logs to collect, how to mutate or filter them, and which `Outputs` to send the logs to. `Flows` are namespaced resources, and can connect either to an `Output` in the same namespace, or a `ClusterOutput`.
+ `Flows` are a configuration resource that determine collection, filtering, and destination rules for logs. It is within a flow that one will configure what logs to collect, how to mutate or filter them, and which `Outputs` to send the logs to. `Flows` are namespaced resources, and can connect either to an `Output` in the same namespace, or a `ClusterOutput`.
3. ClusterOutputs
- `ClusterOutputs` serve the same functionality as `Outputs`, except they are a cluster-scoped resource. `ClusterOutputs` are necessary when collecting logs cluster-wide, or if you wish to provide an `Output` to all namespaces in your cluster.
+ `ClusterOutputs` serve the same functionality as `Outputs`, except they are a cluster-scoped resource. `ClusterOutputs` are necessary when collecting logs cluster-wide, or if you wish to provide an `Output` to all namespaces in your cluster.
4. ClusterFlows
@@ -42,9 +39,9 @@ There are four key concepts to understand for v2.5+ logging:
## Cluster Logging
-To configure cluster-wide logging for v2.5+ logging, one needs to set up a `ClusterFlow`. This object defines the source of logs, any transformations or filters to be applied, and finally the `Output` (or `Outputs`) for the logs.
+To configure cluster-wide logging for v2.5+ logging, one needs to set up a `ClusterFlow`. This object defines the source of logs, any transformations or filters to be applied, and finally the `Output` (or `Outputs`) for the logs.
-> Important: `ClusterFlows` must be defined within the `cattle-logging-system` namespace. `ClusterFlows` will not work if defined in any other namespace.
+> Important: `ClusterFlows` must be defined within the `cattle-logging-system` namespace. `ClusterFlows` will not work if defined in any other namespace.
In legacy logging, in order to collect logs from across the entire cluster, one only needed to enable cluster-level logging and define the desired `Output`. This basic approach remains in v2.5+ logging. To replicate legacy cluster-level logging, follow these steps:
@@ -54,26 +51,26 @@ In legacy logging, in order to collect logs from across the entire cluster, one
2. You do not need to configure any filters if you do not wish - default behavior does not require their creation
3. Define your cluster `Output` or `Outputs`
-This will result in logs from all sources in the cluster (all pods, and all system components) being collected and sent to the `Output` or `Outputs` you defined in the `ClusterFlow`.
+This will result in logs from all sources in the cluster (all pods, and all system components) being collected and sent to the `Output` or `Outputs` you defined in the `ClusterFlow`.
## Project Logging
-Logging in v2.5+ is not project-aware. This means that in order to collect logs from pods running in project namespaces, you will need to define `Flows` for those namespaces.
+Logging in v2.5+ is not project-aware. This means that in order to collect logs from pods running in project namespaces, you will need to define `Flows` for those namespaces.
To collect logs from a specific namespace, follow these steps:
1. Define an `Output` or `ClusterOutput` according to the instructions found under [Output Configuration](#output-configuration)
2. Create a `Flow`, ensuring that it is set to be created in the namespace in which you want to gather logs.
- 1. If you wish to define _Include_ or _Exclude_ rules, you may do so. Otherwise, removal of all rules will result in all pods in the target namespace having their logs collected.
+ 1. If you wish to define _Include_ or _Exclude_ rules, you may do so. Otherwise, removal of all rules will result in all pods in the target namespace having their logs collected.
2. You do not need to configure any filters if you do not wish - default behavior does not require their creation
3. Define your outputs - these can be either `ClusterOutput` or `Output` objects.
This will result in logs from all sources in the namespace (pods) being collected and sent to the `Output` (or `Outputs`) you defined in your `Flow`.
-> To collect logs from a project, repeat the above steps for every namespace within the project. Alternatively, you can label your project workloads with a common label (e.g. `project=my-project`) and use a `ClusterFlow` to collect logs from all pods matching this label.
+> To collect logs from a project, repeat the above steps for every namespace within the project. Alternatively, you can label your project workloads with a common label (e.g. `project=my-project`) and use a `ClusterFlow` to collect logs from all pods matching this label.
## Output Configuration
-In legacy logging, there are five logging destinations to choose from: Elasticsearch, Splunk, Kafka, Fluentd, and Syslog. With the exception of Syslog, all of these destinations are available in logging v2.5+.
+In legacy logging, there are five logging destinations to choose from: Elasticsearch, Splunk, Kafka, Fluentd, and Syslog. With the exception of Syslog, all of these destinations are available in logging v2.5+.
### Elasticsearch
@@ -158,7 +155,7 @@ _(1) These values are to be specified as paths to files. Those files must be mou
### Syslog
-As of v2.5.2, syslog is not currently supported for `Outputs` using v2.5+ logging.
+As of v2.5.2, syslog is not currently supported for `Outputs` using v2.5+ logging.
## Custom Log Fields
@@ -179,5 +176,5 @@ spec:
In legacy logging, collecting logs from system components was accomplished by checking a box labeled "Include System Log" when setting up cluster logging. In v2.5+ logging, system logs are gathered in one of two ways:
-1. Gather all cluster logs, not specifying any match or exclusion rules. This results in all container logs from the cluster being collected, which includes system logs.
-2. Specifically target system logs by adding match rules for system components. Specific match rules depend on the component being collected.
\ No newline at end of file
+1. Gather all cluster logs, not specifying any match or exclusion rules. This results in all container logs from the cluster being collected, which includes system logs.
+2. Specifically target system logs by adding match rules for system components. Specific match rules depend on the component being collected.
\ No newline at end of file
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/rbac-for-logging.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/rbac-for-logging.md
index 063d09d6bf0..53bad86389f 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/rbac-for-logging.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/rbac-for-logging.md
@@ -1,7 +1,5 @@
---
-shortTitle: Role-based Access Control
title: Role-based Access Control for Logging
-weight: 3
---
Rancher logging has two roles, `logging-admin` and `logging-view`.
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/taints-and-tolerations.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/taints-and-tolerations.md
index fa8a057657b..6bc14ebd8dc 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/taints-and-tolerations.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/taints-and-tolerations.md
@@ -1,6 +1,5 @@
---
title: Working with Taints and Tolerations
-weight: 6
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/longhorn.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/longhorn.md
index 9a47f027b86..560756a7ac9 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/longhorn.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/longhorn.md
@@ -1,9 +1,5 @@
---
title: Longhorn - Cloud native distributed block storage for Kubernetes
-shortTitle: Longhorn Storage
-weight: 19
-aliases:
- - /rancher/v2.x/en/longhorn/
---
[Longhorn](https://longhorn.io/) is a lightweight, reliable and easy-to-use distributed block storage system for Kubernetes.
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
index 20443286d53..850c72f7105 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
@@ -1,6 +1,5 @@
---
title: Built-in Dashboards
-weight: 3
---
## Grafana UI
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
index 5f9cd11cf73..7cee8c0f35e 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
@@ -1,6 +1,5 @@
---
title: How Monitoring Works
-weight: 1
---
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
index 5850793ed2d..e301620d92a 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
@@ -1,13 +1,5 @@
---
title: PromQL Expression Reference
-weight: 6
-aliases:
- - /rancher/v2.5/en/project-admin/tools/monitoring/expression
- - /rancher/v2.5/en/cluster-admin/tools/monitoring/expression
- - /rancher/v2.5/en/monitoring-alerting/expression
- - /rancher/v2.5/en/monitoring-alerting/configuration/expression
- - /rancher/v2.5/en/monitoring/alerting/configuration/expression
- - /rancher/v2.x/en/monitoring-alerting/v2.5/configuration/expression/
---
The PromQL expressions in this doc can be used to configure alerts.
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
index 0277107fc67..6d7b14a4d3b 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
@@ -1,13 +1,7 @@
---
title: Role-based Access Control
-shortTitle: RBAC
-weight: 2
-aliases:
- - /rancher/v2.5/en/cluster-admin/tools/monitoring/rbac
- - /rancher/v2.5/en/monitoring-alerting/rbac
- - /rancher/v2.5/en/monitoring-alerting/grafana
- - /rancher/v2.x/en/monitoring-alerting/v2.5/rbac/
---
+
This section describes the expectations for RBAC for Rancher Monitoring.
## Cluster Admins
@@ -81,10 +75,10 @@ Monitoring also creates additional `ClusterRoles` that are not assigned to users
### Assigning Roles and ClusterRoles with kubectl
-An alternative method to using Rancher to attach a `Role` or `ClusterRole` to a user or group is by defining bindings in YAML files that you create. You must first configure the `RoleBinding` with the YAML file, then you apply the config changes by running the `kubectl apply` command.
+An alternative method to using Rancher to attach a `Role` or `ClusterRole` to a user or group is by defining bindings in YAML files that you create. You must first configure the `RoleBinding` with the YAML file, then you apply the config changes by running the `kubectl apply` command.
-* **Roles**: Below is an example of a YAML file to help you configure `RoleBindings` in Kubernetes to attach to a user. You will need to fill in the name below, and name is case-sensitive.
+* **Roles**: Below is an example of a YAML file to help you configure `RoleBindings` in Kubernetes to attach to a user. You will need to fill in the name below, and name is case-sensitive.
```yaml
# monitoring-config-view-role-binding.yaml
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md
index 9549b841f1b..62c9aa53e0d 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md
@@ -1,7 +1,5 @@
---
title: Windows Cluster Support for Monitoring V2
-shortTitle: Windows Support
-weight: 5
---
_Available as of v2.5.8_
@@ -35,15 +33,15 @@ To facilitate this upgrade, Rancher 2.5.8 has released a brand new Helm chart ca
1. Deploy `rancher-wins-upgrader` with the following override:
```yaml
# Masquerading bootstraps the wins-upgrader installation via
- # a previously whitelisted process path since the normal install path,
- # c:\etc\rancher\wins\wins-upgrade.exe is not normally whitelisted.
- # In this case, we are using the previously whitelisted process
+ # a previously whitelisted process path since the normal install path,
+ # c:\etc\rancher\wins\wins-upgrade.exe is not normally whitelisted.
+ # In this case, we are using the previously whitelisted process
# path used by Monitoring V1.
masquerade:
enabled: true
as: c:\\etc\wmi-exporter\wmi-exporter.exe
```
- > **Note for Non-Default Windows Prefix Path:** If you set up the RKE cluster with a `cluster.yml` that has a non-default `win_prefix_path`, you will need to update the `masquerade.as` field with your prefix path in place of `c:\\`.
+ > **Note for Non-Default Windows Prefix Path:** If you set up the RKE cluster with a `cluster.yml` that has a non-default `win_prefix_path`, you will need to update the `masquerade.as` field with your prefix path in place of `c:\\`.
>
> For example, if you have `win_prefix_path: 'c:\host\opt\'`, then you will need to set `as: c:\host\opt\etc\wmi-exporter\wmi-exporter.exe`.
2. Once all your hosts have been successfully upgraded, please ensure that you deploy the Helm chart once again with default values to avoid conflicts with the following settings:
diff --git a/versioned_docs/version-2.5/explanations/integrations-in-rancher/opa-gatekeeper.md b/versioned_docs/version-2.5/explanations/integrations-in-rancher/opa-gatekeeper.md
index 25244ffa96f..f952b80bf3e 100644
--- a/versioned_docs/version-2.5/explanations/integrations-in-rancher/opa-gatekeeper.md
+++ b/versioned_docs/version-2.5/explanations/integrations-in-rancher/opa-gatekeeper.md
@@ -1,13 +1,8 @@
---
title: OPA Gatekeeper
-weight: 16
-aliases:
- - /rancher/v2.5/en/cluster-admin/tools/opa-gatekeeper
- - /rancher/v2.5/en/opa-gatekeeper/Open%20Policy%20Agent
- - /rancher/v2.x/en/opa-gatekeper/
---
-To ensure consistency and compliance, every organization needs the ability to define and enforce policies in its environment in an automated way. [OPA (Open Policy Agent)](https://www.openpolicyagent.org/) is a policy engine that facilitates policy-based control for cloud native environments. Rancher provides the ability to enable OPA Gatekeeper in Kubernetes clusters, and also installs a couple of built-in policy definitions, which are also called constraint templates.
+To ensure consistency and compliance, every organization needs the ability to define and enforce policies in its environment in an automated way. [OPA (Open Policy Agent)](https://www.openpolicyagent.org/) is a policy engine that facilitates policy-based control for cloud native environments. Rancher provides the ability to enable OPA Gatekeeper in Kubernetes clusters, and also installs a couple of built-in policy definitions, which are also called constraint templates.
OPA provides a high-level declarative language that lets you specify policy as code and ability to extend simple APIs to offload policy decision-making.
@@ -61,7 +56,7 @@ When OPA Gatekeeper is enabled, Rancher installs some templates by default.
To list the constraint templates installed in the cluster, go to the left side menu under OPA Gatekeeper and click on **Templates.**
Rancher also provides the ability to create your own constraint templates by importing YAML definitions.
-
+
## Creating and Configuring Constraints
[Constraints](https://github.com/open-policy-agent/gatekeeper#constraints) are Kubernetes custom resources that define the scope of objects to which a specific constraint template applies to. The complete policy is defined by constraint templates and constraints together.
@@ -83,14 +78,14 @@ When a constraint is created, ensure that it does not apply to any Rancher or Ku
To limit the scope of the constraint only to user namespaces, always specify these namespaces under the **Match** field of the constraint.
Also, the constraint may interfere with other Rancher functionality and deny system workloads from being deployed. To avoid this, exclude all Rancher-specific namespaces from your constraints.
-
+
## Enforcing Constraints in your Cluster
When the **Enforcement Action** is **Deny,** the constraint is immediately enabled and will deny any requests that violate the policy defined. By default, the enforcement value is **Deny.**
When the **Enforcement Action** is **Dryrun,** then any resources that violate the policy are only recorded under the constraint's status field.
-To enforce constraints, create a constraint using the form. In the **Enforcement Action** field, choose **Deny.**
+To enforce constraints, create a constraint using the form. In the **Enforcement Action** field, choose **Deny.**
## Audit and Violations in your Cluster
diff --git a/versioned_docs/version-2.5/faq.md b/versioned_docs/version-2.5/faq.md
index ef1603c1803..3f778a9e7fd 100644
--- a/versioned_docs/version-2.5/faq.md
+++ b/versioned_docs/version-2.5/faq.md
@@ -1,9 +1,5 @@
---
title: FAQ
-weight: 25
-aliases:
- - /rancher/v2.5/en/about/
- - /rancher/v2.x/en/faq/
---
This FAQ is a work in progress designed to answer the questions our users most frequently ask about Rancher v2.x.
diff --git a/versioned_docs/version-2.5/faq/container-network-interface-providers.md b/versioned_docs/version-2.5/faq/container-network-interface-providers.md
index 41e9e7b78dd..0b9c8a56f6f 100644
--- a/versioned_docs/version-2.5/faq/container-network-interface-providers.md
+++ b/versioned_docs/version-2.5/faq/container-network-interface-providers.md
@@ -1,9 +1,6 @@
---
title: Container Network Interface (CNI) Providers
description: Learn about Container Network Interface (CNI), the CNI providers Rancher provides, the features they offer, and how to choose a provider for you
-weight: 2300
-aliases:
- - /rancher/v2.x/en/faq/networking/cni-providers/
---
## What is CNI?
diff --git a/versioned_docs/version-2.5/faq/deprecated-features-in-v2.5.md b/versioned_docs/version-2.5/faq/deprecated-features-in-v2.5.md
index e13380c31f2..7f15d979814 100644
--- a/versioned_docs/version-2.5/faq/deprecated-features-in-v2.5.md
+++ b/versioned_docs/version-2.5/faq/deprecated-features-in-v2.5.md
@@ -1,8 +1,5 @@
---
title: Deprecated Features in Rancher v2.5
-weight: 100
-aliases:
- - /rancher/v2.x/en/faq/deprecated-features-25x/
---
### What is Rancher's Deprecation policy?
diff --git a/versioned_docs/version-2.5/faq/install-and-configure-kubectl.md b/versioned_docs/version-2.5/faq/install-and-configure-kubectl.md
index ad0c7764cbe..6d1a86cae76 100644
--- a/versioned_docs/version-2.5/faq/install-and-configure-kubectl.md
+++ b/versioned_docs/version-2.5/faq/install-and-configure-kubectl.md
@@ -1,8 +1,5 @@
---
title: Installing and Configuring kubectl
-weight: 100
-aliases:
- - /rancher/v2.x/en/faq/kubectl/
---
`kubectl` is a CLI utility for running commands against Kubernetes clusters. It's required for many maintenance and administrative tasks in Rancher 2.x.
diff --git a/versioned_docs/version-2.5/faq/networking/networking.md b/versioned_docs/version-2.5/faq/networking/networking.md
index 4bd3345e501..1626e70c264 100644
--- a/versioned_docs/version-2.5/faq/networking/networking.md
+++ b/versioned_docs/version-2.5/faq/networking/networking.md
@@ -1,8 +1,5 @@
---
title: Networking
-weight: 8005
-aliases:
- - /rancher/v2.x/en/faq/networking/
---
Networking FAQ's
diff --git a/versioned_docs/version-2.5/faq/rancher-is-no-longer-needed.md b/versioned_docs/version-2.5/faq/rancher-is-no-longer-needed.md
index 99431449ced..6b7adf75edb 100644
--- a/versioned_docs/version-2.5/faq/rancher-is-no-longer-needed.md
+++ b/versioned_docs/version-2.5/faq/rancher-is-no-longer-needed.md
@@ -1,12 +1,5 @@
---
title: Rancher is No Longer Needed
-weight: 8010
-aliases:
- - /rancher/v2.5/en/installation/removing-rancher/cleaning-cluster-nodes/
- - /rancher/v2.5/en/installation/removing-rancher/
- - /rancher/v2.5/en/admin-settings/removing-rancher/
- - /rancher/v2.5/en/admin-settings/removing-rancher/rancher-cluster-nodes/
- - /rancher/v2.x/en/faq/removing-rancher/
---
This page is intended to answer questions about what happens if you don't want Rancher anymore, if you don't want a cluster to be managed by Rancher anymore, or if the Rancher server is deleted.
@@ -22,7 +15,7 @@ The capability to access a downstream cluster without Rancher depends on the typ
- **Registered clusters:** The cluster will be unaffected and you can access the cluster using the same methods that you did before the cluster was registered into Rancher.
- **Hosted Kubernetes clusters:** If you created the cluster in a cloud-hosted Kubernetes provider such as EKS, GKE, or AKS, you can continue to manage the cluster using your provider's cloud credentials.
-- **RKE clusters:** Please note that you will no longer be able to manage the individual Kubernetes components or perform any upgrades on them after the deletion of the Rancher server. However, you can still access the cluster to manage your workloads. To access an [RKE cluster,](../pages-for-subheaders/launch-kubernetes-with-rancher.md) the cluster must have the [authorized cluster endpoint](../pages-for-subheaders/rancher-manager-architecture.md#4-authorized-cluster-endpoint) enabled, and you must have already downloaded the cluster's kubeconfig file from the Rancher UI. (The authorized cluster endpoint is enabled by default for RKE clusters.) With this endpoint, you can access your cluster with kubectl directly instead of communicating through the Rancher server's [authentication proxy.](../pages-for-subheaders/rancher-manager-architecture.md#1-the-authentication-proxy) For instructions on how to configure kubectl to use the authorized cluster endpoint, refer to the section about directly accessing clusters with [kubectl and the kubeconfig file.](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) These clusters will use a snapshot of the authentication as it was configured when Rancher was removed.
+- **RKE clusters:** Please note that you will no longer be able to manage the individual Kubernetes components or perform any upgrades on them after the deletion of the Rancher server. However, you can still access the cluster to manage your workloads. To access an [RKE cluster,](../pages-for-subheaders/launch-kubernetes-with-rancher.md) the cluster must have the [authorized cluster endpoint](../pages-for-subheaders/rancher-manager-architecture.md#4-authorized-cluster-endpoint) enabled, and you must have already downloaded the cluster's kubeconfig file from the Rancher UI. (The authorized cluster endpoint is enabled by default for RKE clusters.) With this endpoint, you can access your cluster with kubectl directly instead of communicating through the Rancher server's [authentication proxy.](../pages-for-subheaders/rancher-manager-architecture.md#1-the-authentication-proxy) For instructions on how to configure kubectl to use the authorized cluster endpoint, refer to the section about directly accessing clusters with [kubectl and the kubeconfig file.](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) These clusters will use a snapshot of the authentication as it was configured when Rancher was removed.
### What if I don't want Rancher anymore?
diff --git a/versioned_docs/version-2.5/faq/security.md b/versioned_docs/version-2.5/faq/security.md
index bcba5f07422..e86c8023672 100644
--- a/versioned_docs/version-2.5/faq/security.md
+++ b/versioned_docs/version-2.5/faq/security.md
@@ -1,8 +1,5 @@
---
title: Security
-weight: 8007
-aliases:
- - /rancher/v2.x/en/faq/security/
---
**Is there a Hardening Guide?**
diff --git a/versioned_docs/version-2.5/faq/technical-items.md b/versioned_docs/version-2.5/faq/technical-items.md
index 127f32bdcfd..6e908e7571a 100644
--- a/versioned_docs/version-2.5/faq/technical-items.md
+++ b/versioned_docs/version-2.5/faq/technical-items.md
@@ -1,8 +1,5 @@
---
title: Technical
-weight: 8006
-aliases:
- - /rancher/v2.x/en/faq/technical/
---
### How can I reset the administrator password?
diff --git a/versioned_docs/version-2.5/faq/telemetry.md b/versioned_docs/version-2.5/faq/telemetry.md
index 2aaccbdd5a3..f0866ac2b55 100644
--- a/versioned_docs/version-2.5/faq/telemetry.md
+++ b/versioned_docs/version-2.5/faq/telemetry.md
@@ -1,8 +1,5 @@
---
title: Telemetry
-weight: 8008
-aliases:
- - /rancher/v2.x/en/faq/telemetry/
---
### What is Telemetry?
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
index 64d17ebc1af..1eea1f324eb 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
@@ -1,12 +1,5 @@
---
title: Docker Install with TLS Termination at Layer-7 NGINX Load Balancer
-weight: 252
-aliases:
- - /rancher/v2.5/en/installation/single-node/single-node-install-external-lb/
- - /rancher/v2.5/en/installation/other-installation-methods/single-node-docker/single-node-install-external-lb
- - /rancher/v2.5/en/installation/options/single-node-install-external-lb
- - /rancher/v2.5/en/installation/single-node-install-external-lb
- - /rancher/v2.x/en/installation/resources/advanced/single-node-install-external-lb/
---
For development and testing environments that have a special requirement to terminate TLS/SSL at a load balancer instead of your Rancher Server container, deploy Rancher and configure a load balancer to work with it conjunction.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
index 75ec9ecf15d..2c164ba96dc 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
@@ -1,10 +1,5 @@
---
title: Enabling the API Audit Log to Record System Events
-weight: 4
-aliases:
- - /rancher/v2.5/en/installation/options/api-audit-log/
- - /rancher/v2.5/en/installation/api-auditing
- - /rancher/v2.x/en/installation/resources/advanced/api-audit-log/
---
You can enable the API audit log to record the sequence of system events initiated by individual users. You can know what happened, when it happened, who initiated it, and what cluster it affected. When you enable this feature, all requests to the Rancher API and all responses from it are written to a log.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
index 341e9cb37b0..f2b9c80842c 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
@@ -1,8 +1,5 @@
---
title: Opening Ports with firewalld
-weight: 1
-aliases:
- - /rancher/v2.x/en/installation/resources/advanced/firewall/
---
> We recommend disabling firewalld. For Kubernetes 1.19.x and higher, firewalld must be turned off.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
index e7ef875a2ba..28ba391c403 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
@@ -1,9 +1,5 @@
---
title: Tuning etcd for Large Installations
-weight: 2
-aliases:
- - /rancher/v2.5/en/installation/options/etcd
- - /rancher/v2.x/en/installation/resources/advanced/etcd/
---
When running larger Rancher installations with 15 or more clusters it is recommended to increase the default keyspace for etcd from the default 2GB. The maximum setting is 8GB and the host should have enough RAM to keep the entire dataset in memory. When increasing this value you should also increase the size of the host. The keyspace size can also be adjusted in smaller installations if you anticipate a high rate of change of pods during the garbage collection interval.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
index 88806b2edd4..8f3b09de600 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
@@ -1,9 +1,5 @@
---
title: UI for Istio Virtual Services and Destination Rules
-weight: 2
-aliases:
- - /rancher/v2.5/en/installation/options/feature-flags/istio-virtual-service-ui
- - /rancher/v2.x/en/installation/resources/feature-flags/istio-virtual-service-ui/
---
This feature enables a UI that lets you create, read, update and delete virtual services and destination rules, which are traffic management features of Istio.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
index c88587392d9..640f7721f41 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
@@ -1,9 +1,5 @@
---
title: "Running on ARM64 (Experimental)"
-weight: 3
-aliases:
- - /rancher/v2.5/en/installation/options/arm64-platform
- - /rancher/v2.x/en/installation/resources/advanced/arm64-platform/
---
> **Important:**
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
index 6a2157abc90..f4023795ba1 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
@@ -1,9 +1,5 @@
---
title: Allow Unsupported Storage Drivers
-weight: 1
-aliases:
- - /rancher/v2.5/en/installation/options/feature-flags/enable-not-default-storage-drivers/
- - /rancher/v2.x/en/installation/resources/feature-flags/enable-not-default-storage-drivers/
---
This feature allows you to use types for storage providers and provisioners that are not enabled by default.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md
index 203f5cbe85f..84bfcb55b70 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md
@@ -1,7 +1,5 @@
---
title: Rendering the Helm Template in an Air Gapped Environment
-shortTitle: Air Gap Upgrade
-weight: 1
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks.md
index 938f3931a32..f937060f426 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks.md
@@ -1,7 +1,5 @@
---
title: Installing Rancher on Azure Kubernetes Service
-shortTitle: AKS
-weight: 4
---
This page covers how to install Rancher on Microsoft's Azure Kubernetes Service (AKS).
@@ -96,9 +94,9 @@ kubectl get service ingress-nginx-controller --namespace=ingress-nginx
The result should look similar to the following:
```
-NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S)
+NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S)
AGE
-ingress-nginx-controller LoadBalancer 10.0.116.18 40.31.180.83 80:31229/TCP,443:31050/TCP
+ingress-nginx-controller LoadBalancer 10.0.116.18 40.31.180.83 80:31229/TCP,443:31050/TCP
67s
```
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md
index 08e925796a4..c1cdff17b5d 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md
@@ -1,9 +1,5 @@
---
title: Installing Rancher on Amazon EKS
-shortTitle: Amazon EKS
-weight: 4
-aliases:
- - /rancher/v2.x/en/installation/install-rancher-on-k8s/amazon-eks/
---
This page covers two ways to install Rancher on EKS.
@@ -143,9 +139,9 @@ kubectl get service ingress-nginx-controller --namespace=ingress-nginx
The result should look similar to the following:
```
-NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S)
+NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S)
AGE
-ingress-nginx-controller LoadBalancer 10.100.90.18 a904a952c73bf4f668a17c46ac7c56ab-962521486.us-west-2.elb.amazonaws.com 80:31229/TCP,443:31050/TCP
+ingress-nginx-controller LoadBalancer 10.100.90.18 a904a952c73bf4f668a17c46ac7c56ab-962521486.us-west-2.elb.amazonaws.com 80:31229/TCP,443:31050/TCP
27m
```
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-gke.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-gke.md
index baef9e9bca3..635e96538dc 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-gke.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-gke.md
@@ -1,7 +1,5 @@
---
title: Installing Rancher on a Google Kubernetes Engine Cluster
-shortTitle: GKE
-weight: 5
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md
index c914f756b01..1c563222f41 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md
@@ -1,14 +1,5 @@
---
title: Rollbacks
-weight: 3
-aliases:
- - /rancher/v2.x/en/upgrades/rollbacks
- - /rancher/v2.x/en/installation/upgrades-rollbacks/rollbacks
- - /rancher/v2.x/en/upgrades/ha-server-rollbacks
- - /rancher/v2.x/en/upgrades/rollbacks/ha-server-rollbacks
- - /rancher/v2.x/en/installation/upgrades-rollbacks/rollbacks/ha-server-rollbacks
- - /rancher/v2.x/en/installation/install-rancher-on-k8s/upgrades-rollbacks/rollbacks
- - /rancher/v2.x/en/installation/install-rancher-on-k8s/rollbacks/
---
- [Rolling Back to Rancher v2.5.0+](#rolling-back-to-rancher-v2-5-0)
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md
index 15d88d00f5d..d800fe345ae 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/troubleshooting.md
@@ -1,12 +1,5 @@
---
title: Troubleshooting the Rancher Server Kubernetes Cluster
-weight: 276
-aliases:
- - /rancher/v2.5/en/installation/k8s-install/helm-rancher/troubleshooting
- - /rancher/v2.5/en/installation/ha/kubernetes-rke/troubleshooting
- - /rancher/v2.5/en/installation/k8s-install/kubernetes-rke/troubleshooting
- - /rancher/v2.5/en/installation/options/troubleshooting
- - /rancher/v2.x/en/installation/resources/troubleshooting/
---
This section describes how to troubleshoot an installation of Rancher on a Kubernetes cluster.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
index fa7893ea80d..85db55591a8 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
@@ -1,22 +1,7 @@
---
title: Upgrades
-weight: 2
-aliases:
- - /rancher/v2.5/en/upgrades/upgrades
- - /rancher/v2.5/en/installation/upgrades-rollbacks/upgrades
- - /rancher/v2.5/en/upgrades/upgrades/ha-server-upgrade-helm-airgap
- - /rancher/v2.5/en/upgradeinstallation/install-rancher-on-k8s/upgrades/air-gap-upgrade/
- - /rancher/v2.5/en/upgrades/upgrades/ha
- - /rancher/v2.5/en/installation/install-rancher-on-k8s/upgrades/upgrades/ha
- - /rancher/v2.5/en/installation/upgrades-rollbacks/upgrades/
- - /rancher/v2.5/en/upgrades/upgrades/ha-server-upgrade-helm/
- - /rancher/v2.5/en/installation/upgrades-rollbacks/upgrades/ha
- - /rancher/v2.5/en/installation/install-rancher-on-k8s/upgrades-rollbacks/upgrades
- - /rancher/v2.5/en/installation/install-rancher-on-k8s/upgrades-rollbacks/upgrades/ha
- - /rancher/v2.5/en/installation/upgrades-rollbacks/
- - /rancher/v2.5/en/upgrades/
- - /rancher/v2.x/en/installation/install-rancher-on-k8s/upgrades/
---
+
The following instructions will guide you through upgrading a Rancher server that was installed on a Kubernetes cluster with Helm. These steps also apply to air gap installs with Helm.
For the instructions to upgrade Rancher installed on Kubernetes with RancherD, refer to [this page.](../other-installation-methods/install-rancher-on-linux/upgrade-rancherd.md)
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/installation-requirements/install-docker.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
index 8b16d157505..6708944238a 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
@@ -1,6 +1,5 @@
---
title: Installing Docker
-weight: 1
---
Docker is required to be installed on nodes where the Rancher server will be installed with Helm or Docker.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
index f8f34b5a633..598aa1ce669 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
@@ -1,9 +1,6 @@
---
title: Port Requirements
description: Read about port requirements needed in order for Rancher to operate properly, both for Rancher nodes and downstream Kubernetes cluster nodes
-weight: 300
-aliases:
- - /rancher/v2.x/en/installation/requirements/ports/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
index 602f6e56a6b..b35ef4f968e 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
@@ -1,6 +1,5 @@
---
title: Docker Install Commands
-weight: 1
---
The Docker installation is for Rancher users who want to test out Rancher.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
index 0cf723c91b5..0e301da637a 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
@@ -1,9 +1,5 @@
---
title: '1. Set up Infrastructure and Private Registry'
-weight: 100
-aliases:
- - /rancher/v2.5/en/installation/air-gap-single-node/provision-host
- - /rancher/v2.x/en/installation/other-installation-methods/air-gap/prepare-nodes/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
index 7eb961d7691..ec7192df075 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
@@ -1,9 +1,5 @@
---
title: '3. Install Kubernetes (Skip for Docker Installs)'
-weight: 300
-aliases:
- - /rancher/v2.5/en/installation/air-gap-high-availability/install-kube
- - /rancher/v2.x/en/installation/other-installation-methods/air-gap/launch-kubernetes/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
index 8bf799278bb..e91930eb77f 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
@@ -1,14 +1,5 @@
---
title: 4. Install Rancher
-weight: 400
-aliases:
- - /rancher/v2.5/en/installation/air-gap-high-availability/config-rancher-system-charts/
- - /rancher/v2.5/en/installation/air-gap-high-availability/config-rancher-for-private-reg/
- - /rancher/v2.5/en/installation/air-gap-single-node/install-rancher
- - /rancher/v2.5/en/installation/air-gap/install-rancher
- - /rancher/v2.5/en/installation/air-gap-installation/install-rancher/
- - /rancher/v2.5/en/installation/air-gap-high-availability/install-rancher/
- - /rancher/v2.x/en/installation/other-installation-methods/air-gap/install-rancher/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md
index 3ce77fe99b5..43e2e8c8612 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/publish-images.md
@@ -1,13 +1,5 @@
---
title: '2. Collect and Publish Images to your Private Registry'
-weight: 200
-aliases:
- - /rancher/v2.5/en/installation/air-gap-high-availability/prepare-private-registry/
- - /rancher/v2.5/en/installation/air-gap-single-node/prepare-private-registry/
- - /rancher/v2.5/en/installation/air-gap-single-node/config-rancher-for-private-reg/
- - /rancher/v2.5/en/installation/air-gap-high-availability/config-rancher-for-private-reg/
- - /rancher/v2.5/en/installation/air-gap-installation/prepare-private-reg/
- - /rancher/v2.x/en/installation/other-installation-methods/air-gap/populate-private-registry/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/install-rancher-on-linux/roll-back-rancherd.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/install-rancher-on-linux/roll-back-rancherd.md
index 01ade576014..cc6cc9484b5 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/install-rancher-on-linux/roll-back-rancherd.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/install-rancher-on-linux/roll-back-rancherd.md
@@ -1,9 +1,5 @@
---
title: Rollbacks
-weight: 3
-aliases:
- - /rancher/v2.5/en/installation/install-rancher-on-linux/rollbacks
- - /rancher/v2.x/en/installation/install-rancher-on-linux/rollbacks/
---
> **Note:** RancherD was an experimental feature available as part of Rancher v2.5.4 through v2.5.10 but is now deprecated and not available for recent releases.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/install-rancher-on-linux/upgrade-rancherd.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/install-rancher-on-linux/upgrade-rancherd.md
index 6d720b7f351..3d32fff306c 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/install-rancher-on-linux/upgrade-rancherd.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/install-rancher-on-linux/upgrade-rancherd.md
@@ -1,9 +1,5 @@
---
title: Upgrades
-weight: 2
-aliases:
- - /rancher/v2.5/en/installation/install-rancher-on-linux/upgrades
- - /rancher/v2.x/en/installation/install-rancher-on-linux/upgrades/
---
> **Note:** RancherD was an experimental feature available as part of Rancher v2.5.4 through v2.5.10 but is now deprecated and not available for recent releases.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md
index 0545e17e8b1..c57aa250c9b 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-kubernetes.md
@@ -1,8 +1,5 @@
---
title: '2. Install Kubernetes'
-weight: 200
-aliases:
- - /rancher/v2.x/en/installation/other-installation-methods/behind-proxy/launch-kubernetes/
---
Once the infrastructure is ready, you can continue with setting up an RKE cluster to install Rancher in.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
index a0497f7f81e..073d2cbd267 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
@@ -1,8 +1,5 @@
---
title: 3. Install Rancher
-weight: 300
-aliases:
- - /rancher/v2.x/en/installation/other-installation-methods/behind-proxy/install-rancher/
---
Now that you have a running RKE cluster, you can install Rancher in it. For security reasons all traffic to Rancher must be encrypted with TLS. For this tutorial you are going to automatically issue a self-signed certificate through [cert-manager](https://cert-manager.io/). In a real-world use-case you will likely use Let's Encrypt or provide your own certificate.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
index 61ead2609b7..50100000b1f 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
@@ -1,8 +1,5 @@
---
title: '1. Set up Infrastructure'
-weight: 100
-aliases:
- - /rancher/v2.x/en/installation/other-installation-methods/behind-proxy/prepare-nodes/
---
In this section, you will provision the underlying infrastructure for your Rancher management server with internete access through a HTTP proxy.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md
index b2af48b9858..ab36035c7fb 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md
@@ -1,9 +1,7 @@
---
title: Certificate Troubleshooting
-weight: 4
-aliases:
- - /rancher/v2.x/en/installation/other-installation-methods/single-node-docker/troubleshooting/
---
+
### How Do I Know if My Certificates are in PEM Format?
You can recognize the PEM format by the following traits:
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md
index 1b6294300af..332b35e3ace 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/roll-back-docker-installed-rancher.md
@@ -1,10 +1,5 @@
---
title: Rolling Back Rancher Installed with Docker
-weight: 1015
-aliases:
- - /rancher/v2.5/en/upgrades/single-node-rollbacks
- - /rancher/v2.5/en/upgrades/rollbacks/single-node-rollbacks
- - /rancher/v2.x/en/installation/other-installation-methods/single-node-docker/single-node-rollbacks/
---
If a Rancher upgrade does not complete successfully, you'll have to roll back to your Rancher setup that you were using before [Docker Upgrade](upgrade-docker-installed-rancher.md). Rolling back restores:
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
index d690305a85a..8a87aef578f 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
@@ -1,13 +1,5 @@
---
title: Upgrading Rancher Installed with Docker
-weight: 1010
-aliases:
- - /rancher/v2.5/en/upgrades/single-node-upgrade/
- - /rancher/v2.5/en/upgrades/upgrades/single-node-air-gap-upgrade
- - /rancher/v2.5/en/upgrades/upgrades/single-node
- - /rancher/v2.5/en/upgrades/upgrades/single-node-upgrade/
- - /rancher/v2.5/en/installation/install-rancher-on-k8s/upgrades/upgrades/single-node/
- - /rancher/v2.x/en/installation/other-installation-methods/single-node-docker/single-node-upgrades/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/add-tls-secrets.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/add-tls-secrets.md
index 6ad8401f013..6c31231b0db 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/add-tls-secrets.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/add-tls-secrets.md
@@ -1,16 +1,12 @@
---
title: Adding TLS Secrets
-weight: 2
-aliases:
- - /rancher/v2.5/en/installation/resources/encryption/tls-secrets/
- - /rancher/v2.x/en/installation/resources/tls-secrets/
---
Kubernetes will create all the objects and services for Rancher, but it will not become available until we populate the `tls-rancher-ingress` secret in the `cattle-system` namespace with the certificate and key.
Combine the server certificate followed by any intermediate certificate(s) needed into a file named `tls.crt`. Copy your certificate key into a file named `tls.key`.
-For example, [acme.sh](https://acme.sh) provides server certificate and CA chains in `fullchain.cer` file.
+For example, [acme.sh](https://acme.sh) provides server certificate and CA chains in `fullchain.cer` file.
This `fullchain.cer` should be renamed to `tls.crt` & certificate key file as `tls.key`.
Use `kubectl` with the `tls` secret type to create the secrets.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md
index 8bb88546633..4c7b2d33f2e 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md
@@ -1,9 +1,5 @@
---
title: Choosing a Rancher Version
-weight: 1
-aliases:
- - /rancher/v2.5/en/installation/options/server-tags
- - /rancher/v2.x/en/installation/resources/choosing-version/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
index 97dde2142f4..5d5dee35d7c 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
@@ -1,10 +1,5 @@
---
title: About Custom CA Root Certificates
-weight: 1
-aliases:
- - /rancher/v2.5/en/installation/options/custom-ca-root-certificate/
- - /rancher/v2.5/en/installation/resources/choosing-version/encryption/custom-ca-root-certificate
- - /rancher/v2.x/en/installation/resources/custom-ca-root-certificate/
---
If you're using Rancher in an internal production environment where you aren't exposing apps publicly, use a certificate from a private certificate authority (CA).
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/helm-version-requirements.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/helm-version-requirements.md
index 2dc112c0766..0862d67af68 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/helm-version-requirements.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/helm-version-requirements.md
@@ -1,12 +1,5 @@
---
title: Helm Version Requirements
-weight: 3
-aliases:
- - /rancher/v2.5/en/installation/options/helm-version
- - /rancher/v2.5/en/installation/options/helm2
- - /rancher/v2.5/en/installation/options/helm2/helm-init
- - /rancher/v2.5/en/installation/options/helm2/helm-rancher
- - /rancher/v2.x/en/installation/resources/helm-version/
---
This section contains the requirements for Helm, which is the tool used to install Rancher on a high-availability Kubernetes cluster.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/local-system-charts.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/local-system-charts.md
index 2d83e11cef5..bc758c0bb22 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/local-system-charts.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/local-system-charts.md
@@ -1,12 +1,5 @@
---
title: Setting up Local System Charts for Air Gapped Installations
-weight: 120
-aliases:
- - /rancher/v2.5/en/installation/air-gap-single-node/config-rancher-system-charts/_index.md
- - /rancher/v2.5/en/installation/air-gap-high-availability/config-rancher-system-charts/_index.md
- - /rancher/v2.5/en/installation/options/local-system-charts
- - /rancher/v2.x/en/installation/resources/local-system-charts/
- - /rancher/v2.x/en/installation/options/local-system-charts/
---
The [System Charts](https://github.com/rancher/system-charts) repository contains all the catalog items required for features such as monitoring, logging, alerting and global DNS.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md
index cb90a9a4e00..40c4792277a 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/update-rancher-certificate.md
@@ -1,8 +1,5 @@
---
title: Updating the Rancher Certificate
-weight: 10
-aliases:
- - /rancher/v2.x/en/installation/resources/update-ca-cert/
---
# Updating a Private CA Certificate
@@ -79,7 +76,7 @@ Also get the version string of the currently deployed Rancher chart:
$ helm ls -A
```
-Upgrade the Helm application instance using the original configuration values and making sure to specify `ingress.tls.source=secret` as well as the current chart version to prevent an application upgrade.
+Upgrade the Helm application instance using the original configuration values and making sure to specify `ingress.tls.source=secret` as well as the current chart version to prevent an application upgrade.
If the certificate was signed by a private CA, add the `set privateCA=true` argument as well. Also make sure to read the documentation describing the initial installation using custom certificates.
@@ -219,7 +216,7 @@ Also get the version string of the currently deployed Rancher chart:
$ helm ls -A
```
-Upgrade the Helm application instance using the original configuration values and making sure to specify the current chart version to prevent an application upgrade.
+Upgrade the Helm application instance using the original configuration values and making sure to specify the current chart version to prevent an application upgrade.
Also make sure to read the documentation describing the initial installation using custom certificates.
@@ -231,9 +228,9 @@ helm upgrade rancher rancher-stable/rancher \
--set ...
```
-On upgrade, you can either
+On upgrade, you can either
-- remove `--set ingress.tls.source=secret \` from the Helm upgrade command, as shown above, or
+- remove `--set ingress.tls.source=secret \` from the Helm upgrade command, as shown above, or
- remove the `privateCA` parameter or set it to `false` because the CA is valid:
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/upgrade-cert-manager-helm-2.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/upgrade-cert-manager-helm-2.md
index 68571d736bb..2bb34ccba50 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/upgrade-cert-manager-helm-2.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/upgrade-cert-manager-helm-2.md
@@ -1,9 +1,5 @@
---
title: Upgrading Cert-Manager with Helm 2
-weight: 2040
-aliases:
- - /rancher/v2.5/en/installation/options/upgrading-cert-manager/helm-2-instructions
- - /rancher/v2.5/en/installation/resources/choosing-version/encryption/upgrading-cert-manager/helm-2-instructions
---
Rancher uses cert-manager to automatically generate and renew TLS certificates for HA deployments of Rancher. As of Fall 2019, three important changes to cert-manager are set to occur that you need to take action on if you have an HA deployment of Rancher:
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md
index c863c19bcc3..8114cc656bc 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/resources/upgrade-cert-manager.md
@@ -1,11 +1,5 @@
---
title: Upgrading Cert-Manager
-weight: 4
-aliases:
- - /rancher/v2.5/en/installation/options/upgrading-cert-manager
- - /rancher/v2.5/en/installation/options/upgrading-cert-manager/helm-2-instructions
- - /rancher/v2.5/en/installation/resources/encryption/upgrading-cert-manager
- - /rancher/v2.x/en/installation/resources/upgrading-cert-manager/
---
Rancher uses cert-manager to automatically generate and renew TLS certificates for HA deployments of Rancher. As of Fall 2019, three important changes to cert-manager are set to occur that you need to take action on if you have an HA deployment of Rancher:
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
index a26aa6d8b8a..8bf01f5ed4e 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
@@ -1,8 +1,5 @@
---
title: Upgrading and Rolling Back Kubernetes
-weight: 70
-aliases:
- - /rancher/v2.x/en/cluster-admin/upgrading-kubernetes/
---
Following an upgrade to the latest version of Rancher, downstream Kubernetes clusters can be upgraded to use the latest supported version of Kubernetes.
diff --git a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
index d3f8ac144e9..5eb7e986d73 100644
--- a/versioned_docs/version-2.5/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
+++ b/versioned_docs/version-2.5/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
@@ -1,8 +1,5 @@
---
title: Upgrading Kubernetes without Upgrading Rancher
-weight: 1120
-aliases:
- - /rancher/v2.x/en/admin-settings/k8s-metadata/
---
The RKE metadata feature allows you to provision clusters with new versions of Kubernetes as soon as they are released, without upgrading Rancher. This feature is useful for taking advantage of patch versions of Kubernetes, for example, if you want to upgrade to Kubernetes v1.14.7 when your Rancher server originally supported v1.14.6.
@@ -11,7 +8,7 @@ The RKE metadata feature allows you to provision clusters with new versions of K
Rancher's Kubernetes metadata contains information specific to the Kubernetes version that Rancher uses to provision [RKE clusters](../../pages-for-subheaders/launch-kubernetes-with-rancher.md). Rancher syncs the data periodically and creates custom resource definitions (CRDs) for **system images,** **service options** and **addon templates.** Consequently, when a new Kubernetes version is compatible with the Rancher server version, the Kubernetes metadata makes the new version available to Rancher for provisioning clusters. The metadata gives you an overview of the information that the [Rancher Kubernetes Engine](https://rancher.com/docs/rke/latest/en/) (RKE) uses for deploying various Kubernetes versions.
-This table below describes the CRDs that are affected by the periodic data sync.
+This table below describes the CRDs that are affected by the periodic data sync.
> **Note:** Only administrators can edit metadata CRDs. It is recommended not to update existing objects unless explicitly advised.
@@ -31,7 +28,7 @@ Administrators might configure the RKE metadata settings to do the following:
The option to refresh the Kubernetes metadata is available for administrators by default, or for any user who has the **Manage Cluster Drivers** [global role.](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)
-To force Rancher to refresh the Kubernetes metadata, a manual refresh action is available under **Tools > Drivers > Refresh Kubernetes Metadata** on the right side corner.
+To force Rancher to refresh the Kubernetes metadata, a manual refresh action is available under **Tools > Drivers > Refresh Kubernetes Metadata** on the right side corner.
You can configure Rancher to only refresh metadata when desired by setting `refresh-interval-minutes` to `0` (see below) and using this button to perform the metadata refresh manually when desired.
diff --git a/versioned_docs/version-2.5/getting-started/introduction/overview.md b/versioned_docs/version-2.5/getting-started/introduction/overview.md
index ec0007dee1c..22aa55bd068 100644
--- a/versioned_docs/version-2.5/getting-started/introduction/overview.md
+++ b/versioned_docs/version-2.5/getting-started/introduction/overview.md
@@ -1,9 +1,7 @@
---
title: Overview
-weight: 1
-aliases:
- - /rancher/v2.x/en/overview/
---
+
Rancher is a container management platform built for organizations that deploy containers in production. Rancher makes it easy to run Kubernetes everywhere, meet IT requirements, and empower DevOps teams.
# Run Kubernetes Everywhere
diff --git a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/aws.md b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/aws.md
index 1ceeb43287a..ffed6be5b9f 100644
--- a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/aws.md
+++ b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/aws.md
@@ -1,7 +1,6 @@
---
title: Rancher AWS Quick Start Guide
description: Read this step by step Rancher AWS guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached.
-weight: 100
---
The following steps will quickly deploy a Rancher server on AWS in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached.
diff --git a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/azure.md b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/azure.md
index e8391436845..62f8b5c442f 100644
--- a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/azure.md
+++ b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/azure.md
@@ -1,7 +1,6 @@
---
title: Rancher Azure Quick Start Guide
description: Read this step by step Rancher Azure guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached.
-weight: 100
---
The following steps will quickly deploy a Rancher server on Azure in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached.
diff --git a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md
index cc15a69bbdd..a90433ddbb7 100644
--- a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md
+++ b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md
@@ -1,7 +1,6 @@
---
title: Rancher DigitalOcean Quick Start Guide
description: Read this step by step Rancher DigitalOcean guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached.
-weight: 100
---
The following steps will quickly deploy a Rancher server on DigitalOcean in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached.
diff --git a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md
index 1fc8fedb5c7..968db395388 100644
--- a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md
+++ b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/gcp.md
@@ -1,7 +1,6 @@
---
title: Rancher GCP Quick Start Guide
description: Read this step by step Rancher GCP guide to quickly deploy a Rancher server with a single-node downstream Kubernetes cluster attached.
-weight: 100
---
The following steps will quickly deploy a Rancher server on GCP in a single-node K3s Kubernetes cluster, with a single-node downstream Kubernetes cluster attached.
diff --git a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md
index 6d44e8f8259..34ebf9320e0 100644
--- a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md
+++ b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/helm-cli.md
@@ -1,9 +1,7 @@
---
title: Manual Quick Start
-weight: 300
-aliases:
- - /rancher/v2.x/en/quick-start-guide/deployment/quickstart-manual-setup/
---
+
Howdy Partner! This tutorial walks you through:
- Installation of Rancher 2.x
diff --git a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md
index 6cc41fcbe62..a95447e7a5a 100644
--- a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md
+++ b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-rancher-manager/vagrant.md
@@ -1,9 +1,7 @@
---
title: Vagrant Quick Start
-weight: 200
-aliases:
- - /rancher/v2.x/en/quick-start-guide/deployment/quickstart-vagrant/
---
+
The following steps quickly deploy a Rancher Server with a single node cluster attached.
>**Note:** The intent of these guides is to quickly launch a sandbox that you can use to evaluate Rancher. These guides are not intended for production environments. For comprehensive setup instructions, see [Installation](../../../pages-for-subheaders/installation-and-upgrade.md).
diff --git a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-workloads/nodeports.md b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-workloads/nodeports.md
index 7ffe4b39e5d..6804c497d38 100644
--- a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-workloads/nodeports.md
+++ b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-workloads/nodeports.md
@@ -1,8 +1,5 @@
---
title: Workload with NodePort Quick Start
-weight: 200
-aliases:
- - /rancher/v2.x/en/quick-start-guide/workload/quickstart-deploy-workload-nodeport/
---
### Prerequisite
diff --git a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md
index f3d01b79a62..99e6c51b65d 100644
--- a/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md
+++ b/versioned_docs/version-2.5/getting-started/quick-start-guides/deploy-workloads/workload-ingress.md
@@ -1,8 +1,5 @@
---
title: Workload with Ingress Quick Start
-weight: 100
-aliases:
- - /rancher/v2.x/en/quick-start-guide/workload/quickstart-deploy-workload-ingress/
---
### Prerequisite
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
index 9891b5a6352..45c11e5d045 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
@@ -1,9 +1,5 @@
---
title: Configuring Active Directory (AD)
-weight: 1112
-aliases:
- - /rancher/v2.5/en/tasks/global-configuration/authentication/active-directory/
- - /rancher/v2.x/en/admin-settings/authentication/ad/
---
If your organization uses Microsoft Active Directory as central user repository, you can configure Rancher to communicate with an Active Directory server to authenticate users. This allows Rancher admins to control access to clusters and projects based on users and groups managed externally in the Active Directory, while allowing end-users to authenticate with their AD credentials when logging in to the Rancher UI.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
index 62c5118a853..7972c57fc40 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
@@ -1,6 +1,5 @@
---
title: Configuring Azure AD
-weight: 1115
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
index 60d8cf408f1..26adc68139d 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
@@ -1,9 +1,5 @@
---
title: Configuring FreeIPA
-weight: 1114
-aliases:
- - /rancher/v2.5/en/tasks/global-configuration/authentication/freeipa/
- - /rancher/v2.x/en/admin-settings/authentication/freeipa/
---
If your organization uses FreeIPA for user authentication, you can configure Rancher to allow your users to login using their FreeIPA credentials.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
index a86e2db028c..21bc57f3a2b 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
@@ -1,9 +1,5 @@
---
title: Configuring GitHub
-weight: 1116
-aliases:
- - /rancher/v2.5/en/tasks/global-configuration/authentication/github/
- - /rancher/v2.x/en/admin-settings/authentication/github/
---
In environments using GitHub, you can configure Rancher to allow sign on using GitHub credentials.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
index ce9cf315feb..99fc5e23827 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
@@ -1,8 +1,5 @@
---
title: Configuring Google OAuth
-weight: 15
-aliases:
- - /rancher/v2.x/en/admin-settings/authentication/google/
---
If your organization uses G Suite for user authentication, you can configure Rancher to allow your users to log in using their G Suite credentials.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak.md
index c2c40220722..de7144d187c 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak.md
@@ -1,9 +1,6 @@
---
title: Configuring Keycloak (SAML)
description: Create a Keycloak SAML client and configure Rancher to work with Keycloak. By the end your users will be able to sign into Rancher using their Keycloak logins
-weight: 1200
-aliases:
- - /rancher/v2.x/en/admin-settings/authentication/keycloak/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
index de2a85b351a..051b43cd31f 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
@@ -1,8 +1,5 @@
---
title: Configuring Okta (SAML)
-weight: 1210
-aliases:
- - /rancher/v2.x/en/admin-settings/authentication/okta/
---
If your organization uses Okta Identity Provider (IdP) for user authentication, you can configure Rancher to allow your users to log in using their IdP credentials.
@@ -13,7 +10,7 @@ If your organization uses Okta Identity Provider (IdP) for user authentication,
In Okta, create a SAML Application with the settings below. See the [Okta documentation](https://developer.okta.com/standards/SAML/setting_up_a_saml_application_in_okta) for help.
-Setting | Value
+Setting | Value
------------|------------
`Single Sign on URL` | `https://yourRancherHostURL/v1-saml/okta/saml/acs`
`Audience URI (SP Entity ID)` | `https://yourRancherHostURL/v1-saml/okta/saml/metadata`
@@ -37,7 +34,7 @@ Setting | Value
| Metadata XML | The `Identity Provider metadata` file that you find in the application `Sign On` section. |
>**Tip:** You can generate a key/certificate pair using an openssl command. For example:
- >
+ >
> openssl req -x509 -sha256 -nodes -days 365 -newkey rsa:2048 -keyout myservice.key -out myservice.crt
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
index 8fcfd7e2348..af3f2c15b8d 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
@@ -1,8 +1,5 @@
---
title: Configuring PingIdentity (SAML)
-weight: 1200
-aliases:
- - /rancher/v2.x/en/admin-settings/authentication/ping-federate/
---
If your organization uses Ping Identity Provider (IdP) for user authentication, you can configure Rancher to allow your users to log in using their IdP credentials.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
index 2aabd06d30b..c7bb63539fd 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
@@ -1,9 +1,5 @@
---
title: Local Authentication
-weight: 1111
-aliases:
- - /rancher/v2.5/en/tasks/global-configuration/authentication/local-authentication/
- - /rancher/v2.x/en/admin-settings/authentication/local/
---
Local authentication is the default until you configure an external authentication provider. Local authentication is where Rancher stores the user information, i.e. names and passwords, of who can log in to Rancher. By default, the `admin` user that logs in to Rancher for the first time is a local user.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
index 172c24add28..eecc0b0fe92 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
@@ -1,8 +1,5 @@
---
title: Users and Groups
-weight: 1
-aliases:
- - /rancher/v2.x/en/admin-settings/authentication/user-groups/
---
Rancher relies on users and groups to determine who is allowed to log in to Rancher and which resources they can access. When you configure an external authentication provider, users from that provider will be able to log in to your Rancher server. When a user logs in, the authentication provider will supply your Rancher server with a list of groups to which the user belongs.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
index 1dc44ce1fc1..802245db536 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
@@ -1,68 +1,65 @@
---
title: 1. Configuring Microsoft AD FS for Rancher
-weight: 1205
-aliases:
- - /rancher/v2.x/en/admin-settings/authentication/microsoft-adfs/microsoft-adfs-setup/
---
-Before configuring Rancher to support AD FS users, you must add Rancher as a [relying party trust](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/technical-reference/understanding-key-ad-fs-concepts) in AD FS.
+Before configuring Rancher to support AD FS users, you must add Rancher as a [relying party trust](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/technical-reference/understanding-key-ad-fs-concepts) in AD FS.
1. Log into your AD server as an administrative user.
1. Open the **AD FS Management** console. Select **Add Relying Party Trust...** from the **Actions** menu and click **Start**.
-
+

1. Select **Enter data about the relying party manually** as the option for obtaining data about the relying party.

-
+
1. Enter your desired **Display name** for your Relying Party Trust. For example, `Rancher`.

-
+
1. Select **AD FS profile** as the configuration profile for your relying party trust.
-
+

-
+
1. Leave the **optional token encryption certificate** empty, as Rancher AD FS will not be using one.
-
+

-
+
1. Select **Enable support for the SAML 2.0 WebSSO protocol**
and enter `https:///v1-saml/adfs/saml/acs` for the service URL.
-
+

-
+
1. Add `https:///v1-saml/adfs/saml/metadata` as the **Relying party trust identifier**.
-
+

-
+
1. This tutorial will not cover multi-factor authentication; please refer to the [Microsoft documentation](https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/operations/configure-additional-authentication-methods-for-ad-fs) if you would like to configure multi-factor authentication.
-
+

-
+
1. From **Choose Issuance Authorization RUles**, you may select either of the options available according to use case. However, for the purposes of this guide, select **Permit all users to access this relying party**.
-
+

1. After reviewing your settings, select **Next** to add the relying party trust.
-
+

-
+
1. Select **Open the Edit Claim Rules...** and click **Close**.
-
+

-
+
1. On the **Issuance Transform Rules** tab, click **Add Rule...**.
-
+

-
+
1. Select **Send LDAP Attributes as Claims** as the **Claim rule template**.

-
+
1. Set the **Claim rule name** to your desired name (for example, `Rancher Attributes`) and select **Active Directory** as the **Attribute store**. Create the following mapping to reflect the table below:
| LDAP Attribute | Outgoing Claim Type |
@@ -74,7 +71,7 @@ Before configuring Rancher to support AD FS users, you must add Rancher as a [re

-1. Download the `federationmetadata.xml` from your AD server at:
+1. Download the `federationmetadata.xml` from your AD server at:
```
https:///federationmetadata/2007-06/federationmetadata.xml
```
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
index db7b4b1fa22..427b4a072fc 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
@@ -1,14 +1,11 @@
---
title: 2. Configuring Rancher for Microsoft AD FS
-weight: 1205
-aliases:
- - /rancher/v2.x/en/admin-settings/authentication/microsoft-adfs/rancher-adfs-setup/
---
After you complete [Configuring Microsoft AD FS for Rancher](configure-ms-adfs-for-rancher.md), enter your AD FS information into Rancher to allow AD FS users to authenticate with Rancher.
>**Important Notes For Configuring Your AD FS Server:**
->
+>
>- The SAML 2.0 WebSSO Protocol Service URL is: `https:///v1-saml/adfs/saml/acs`
>- The Relying Party Trust identifier URL is: `https:///v1-saml/adfs/saml/metadata`
>- You must export the `federationmetadata.xml` file from your AD FS server. This can be found at: `https:///federationmetadata/2007-06/federationmetadata.xml`
@@ -20,13 +17,13 @@ After you complete [Configuring Microsoft AD FS for Rancher](configure-ms-adfs-f
1. Complete the **Configure AD FS Account** form. Microsoft AD FS lets you specify an existing Active Directory (AD) server. The [configuration section below](#configuration) describe how you can map AD attributes to fields within Rancher.
-
-
-
-
-
+
+
+
+
+
1. After you complete the **Configure AD FS Account** form, click **Authenticate with AD FS**, which is at the bottom of the page.
Rancher redirects you to the AD FS login page. Enter credentials that authenticate with Microsoft AD FS to validate your Rancher AD FS configuration.
@@ -48,7 +45,7 @@ After you complete [Configuring Microsoft AD FS for Rancher](configure-ms-adfs-f
| Metadata XML | The `federationmetadata.xml` file exported from your AD FS server.
You can find this file at `https:///federationmetadata/2007-06/federationmetadata.xml`. |
-
+
**Tip:** You can generate a certificate using an openssl command. For example:
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
index 2c9fa74695b..edeb387c61f 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
@@ -1,11 +1,8 @@
---
title: Group Permissions with Shibboleth and OpenLDAP
-weight: 1
-aliases:
- - /rancher/v2.x/en/admin-settings/authentication/shibboleth/about/
---
-This page provides background information and context for Rancher users who intend to set up the Shibboleth authentication provider in Rancher.
+This page provides background information and context for Rancher users who intend to set up the Shibboleth authentication provider in Rancher.
Because Shibboleth is a SAML provider, it does not support searching for groups. While a Shibboleth integration can validate user credentials, it can't be used to assign permissions to groups in Rancher without additional configuration.
@@ -31,4 +28,3 @@ When a member of the OpenLDAP group logs in to Rancher, she is redirected to Shi
Shibboleth validates her credentials, and retrieves user attributes from OpenLDAP, including groups. Then Shibboleth sends a SAML assertion to Rancher including the user attributes. Rancher uses the group data so that she can access all of the resources and permissions that her groups have permissions for.

-
\ No newline at end of file
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
index bf35682d129..b703dafb7fe 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
@@ -1,8 +1,5 @@
---
title: Cluster Drivers
-weight: 1
-aliases:
- - /rancher/v2.x/en/admin-settings/drivers/cluster-drivers/
---
Cluster drivers are used to create clusters in a [hosted Kubernetes provider](../../../../pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md), such as Google GKE. The availability of which cluster driver to display when creating clusters is defined by the cluster driver's status. Only `active` cluster drivers will be displayed as an option for creating clusters. By default, Rancher is packaged with several existing cloud provider cluster drivers, but you can also add custom cluster drivers to Rancher.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
index 0a5e3dc4098..fd40bdb949f 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
@@ -1,10 +1,5 @@
---
title: Node Drivers
-weight: 2
-aliases:
- - /rancher/v2.5/en/concepts/global-configuration/node-drivers/
- - /rancher/v2.5/en/tasks/global-configuration/node-drivers/
- - /rancher/v2.x/en/admin-settings/drivers/node-drivers/
---
Node drivers are used to provision hosts, which Rancher uses to launch and manage Kubernetes clusters. A node driver is the same as a [Docker Machine driver](https://docs.docker.com/machine/drivers/). The availability of which node driver to display when creating node templates is defined based on the node driver's status. Only `active` node drivers will be displayed as an option for creating node templates. By default, Rancher is packaged with many existing Docker Machine drivers, but you can also create custom node drivers to add to Rancher.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
index 915aad540b4..4c104ac767b 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
@@ -1,8 +1,5 @@
---
title: Access and Sharing
-weight: 31
-aliases:
- - /rancher/v2.x/en/admin-settings/rke-templates/template-access-and-sharing/
---
If you are an RKE template owner, you can share it with users or groups of users, who can then use the template to create clusters.
@@ -14,7 +11,7 @@ When you share a template, each user can have one of two access levels:
- **Owner:** This user can update, delete, and share the templates that they own. The owner can also share the template with other users.
- **User:** These users can create clusters using the template. They can also upgrade those clusters to new revisions of the same template. When you share a template as **Make Public (read-only),** all users in your Rancher setup have the User access level for the template.
-If you create a template, you automatically become an owner of that template.
+If you create a template, you automatically become an owner of that template.
If you want to delegate responsibility for updating the template, you can share ownership of the template. For details on how owners can modify templates, refer to the [documentation about revising templates.](manage-rke1-templates.md)
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
index cc943799b90..c14a7a0dd80 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
@@ -1,8 +1,5 @@
---
title: Applying Templates
-weight: 50
-aliases:
- - /rancher/v2.x/en/admin-settings/rke-templates/applying-templates/
---
You can create a cluster from an RKE template that you created, or from a template that has been [shared with you.](access-or-share-templates.md)
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
index dceb7266459..dcadeb51b2f 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
@@ -1,8 +1,5 @@
---
title: Template Creator Permissions
-weight: 10
-aliases:
- - /rancher/v2.x/en/admin-settings/rke-templates/creator-permissions/
---
Administrators have the permission to create RKE templates, and only administrators can give that permission to other users.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
index b9c2c010935..b7fee55de3a 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
@@ -1,8 +1,5 @@
---
title: Template Enforcement
-weight: 32
-aliases:
- - /rancher/v2.x/en/admin-settings/rke-templates/enforcement/
---
This section describes how template administrators can enforce templates in Rancher, restricting the ability of users to create clusters without a template.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
index ec700d51cb5..9f4d719192e 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
@@ -1,8 +1,5 @@
---
title: Example Scenarios
-weight: 5
-aliases:
- - /rancher/v2.x/en/admin-settings/rke-templates/example-scenarios/
---
These example scenarios describe how an organization could use templates to standardize cluster creation.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
index 0b9dac6d5ed..1a224d34b87 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
@@ -1,8 +1,5 @@
---
title: RKE Templates and Infrastructure
-weight: 90
-aliases:
- - /rancher/v2.x/en/admin-settings/rke-templates/rke-templates-and-hardware/
---
In Rancher, RKE templates are used to provision Kubernetes and define Rancher settings, while node templates are used to provision nodes.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
index 07084a79bff..6edd3902df7 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
@@ -1,8 +1,5 @@
---
title: Creating and Revising Templates
-weight: 32
-aliases:
- - /rancher/v2.x/en/admin-settings/rke-templates/creating-and-revising/
---
This section describes how to manage RKE templates and revisions. You an create, share, update, and delete templates from the **Global** view under **Tools > RKE Templates.**
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
index 55af9eb53ed..a16c246d425 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
@@ -1,8 +1,5 @@
---
title: Overriding Template Settings
-weight: 33
-aliases:
- - /rancher/v2.x/en/admin-settings/rke-templates/overrides/
---
When a user creates an RKE template, each setting in the template has a switch in the Rancher UI that indicates if users can override the setting. This switch marks those settings as **Allow User Override.**
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
index 5d4400caa80..ce8a170fa25 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
@@ -1,11 +1,5 @@
---
title: Pod Security Policies
-weight: 1135
-aliases:
- - /rancher/v2.5/en/concepts/global-configuration/pod-security-policies/
- - /rancher/v2.5/en/tasks/global-configuration/pod-security-policies/
- - /rancher/v2.5/en/tasks/clusters/adding-a-pod-security-policy/
- - /rancher/v2.x/en/admin-settings/pod-security-policies/
---
_Pod Security Policies_ (or PSPs) are objects that control security-sensitive aspects of pod specification (like root privileges).
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
index 9d9624806fa..746d8abbc7b 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
@@ -1,8 +1,5 @@
---
title: Configuring a Global Default Private Registry
-weight: 400
-aliases:
- - /rancher/v2.x/en/admin-settings/config-private-registry/
---
You might want to use a private container registry to share your custom base images within your organization. With a private registry, you can keep a private, consistent, and centralized source of truth for the container images that are used in your clusters.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
index e5d7a6201ac..71967e57153 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
@@ -1,8 +1,5 @@
---
title: Cluster and Project Roles
-weight: 1127
-aliases:
- - /rancher/v2.x/en/admin-settings/rbac/cluster-project-roles/
---
Cluster and project roles define user authorization inside a cluster or project. You can manage these roles from the **Global > Security > Roles** page.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
index 906f313e3b8..4ddbb8c838e 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
@@ -1,9 +1,5 @@
---
title: Custom Roles
-weight: 1128
-aliases:
- - /rancher/v2.5/en/tasks/global-configuration/roles/
- - /rancher/v2.x/en/admin-settings/rbac/default-custom-roles/
---
Within Rancher, _roles_ determine what actions a user can make within a cluster or project.
@@ -44,7 +40,7 @@ The steps to add custom roles differ depending on the version of Rancher.
1. Use the **Grant Resources** options to assign individual [Kubernetes API endpoints](https://kubernetes.io/docs/reference/) to the role.
> When viewing the resources associated with default roles created by Rancher, if there are multiple Kubernetes API resources on one line item, the resource will have `(Custom)` appended to it. These are not custom resources but just an indication that there are multiple Kubernetes API resources as one resource.
-
+
> The Resource text field provides a method to search for pre-defined Kubernetes API resources, or enter a custom resource name for the grant. The pre-defined or `(Custom)` resource must be selected from the dropdown, after entering a resource name into this field.
You can also choose the individual cURL methods (`Create`, `Delete`, `Get`, etc.) available for use with each endpoint you assign.
@@ -84,7 +80,7 @@ Custom global roles don't have to be based on existing roles. To create a custom
1. In the **Grant Resources** section, select the Kubernetes resource operations that will be enabled for users with the custom role.
> The Resource text field provides a method to search for pre-defined Kubernetes API resources, or enter a custom resource name for the grant. The pre-defined or `(Custom)` resource must be selected from the dropdown, after entering a resource name into this field.
-
+
1. Click **Save.**
## Deleting a Custom Global Role
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
index f6ad8d03459..123feab5703 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
@@ -1,8 +1,5 @@
---
title: Global Permissions
-weight: 1126
-aliases:
- - /rancher/v2.x/en/admin-settings/rbac/global-permissions/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
index 7cde1f7e449..db5ea2811d8 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
@@ -1,8 +1,5 @@
---
title: Locked Roles
-weight: 1129
-aliases:
- - /rancher/v2.x/en/admin-settings/rbac/locked-roles/
---
You can set roles to a status of `locked`. Locking roles prevent them from being assigned users in the future.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
index bd7afa98a03..35d48666c07 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
@@ -1,10 +1,5 @@
---
title: 1. Enable Istio in the Cluster
-weight: 1
-aliases:
- - /rancher/v2.5/en/istio/setup/enable-istio-in-cluster
- - /rancher/v2.5/en/istio/v2.5/setup/enable-istio-in-cluster
- - /rancher/v2.x/en/istio/v2.5/setup/enable-istio-in-cluster/
---
>**Prerequisites:**
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md
index 4221bb58548..c7cd51836f9 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-namespace.md
@@ -1,10 +1,5 @@
---
title: 2. Enable Istio in a Namespace
-weight: 2
-aliases:
- - /rancher/v2.5/en/istio/setup/enable-istio-in-namespace
- - /rancher/v2.5/en/istio/v2.5/setup/enable-istio-in-namespace
- - /rancher/v2.x/en/istio/v2.5/setup/enable-istio-in-namespace/
---
You will need to manually enable Istio in each namespace that you want to be tracked or controlled by Istio. When Istio is enabled in a namespace, the Envoy sidecar proxy will be automatically injected into all new workloads that are deployed in the namespace.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
index 9acbc86d11b..71a3f2a879c 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
@@ -1,11 +1,5 @@
---
title: 6. Generate and View Traffic
-weight: 7
-aliases:
- - /rancher/v2.5/en/istio/setup/view-traffic
- - /rancher/v2.5/en/istio/setup/view-traffic
- - /rancher/v2.5/en/istio/v2.5/setup/view-traffic
- - /rancher/v2.x/en/istio/v2.5/setup/view-traffic/
---
This section describes how to view the traffic that is being managed by Istio.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md
index f6f1c246513..83c886c2244 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-istio-gateway.md
@@ -1,13 +1,8 @@
---
title: 4. Set up the Istio Gateway
-weight: 5
-aliases:
- - /rancher/v2.5/en/istio/setup/gateway
- - /rancher/v2.5/en/istio/v2.5/setup/gateway
- - /rancher/v2.x/en/istio/v2.5/setup/gateway/
---
-The gateway to each cluster can have its own port or load balancer, which is unrelated to a service mesh. By default, each Rancher-provisioned cluster has one NGINX ingress controller allowing traffic into the cluster.
+The gateway to each cluster can have its own port or load balancer, which is unrelated to a service mesh. By default, each Rancher-provisioned cluster has one NGINX ingress controller allowing traffic into the cluster.
You can use the Nginx Ingress controller with or without Istio installed. If this is the only gateway to your cluster, Istio will be able to route traffic from service to service, but Istio will not be able to receive traffic from outside the cluster.
@@ -17,15 +12,15 @@ You will also need to set up a Kubernetes gateway for your services. This Kubern
You can route traffic into the service mesh with a load balancer or use Istio's NodePort gateway. This section describes how to set up the NodePort gateway.
-For more information on the Istio gateway, refer to the [Istio documentation.](https://istio.io/docs/reference/config/networking/v1alpha3/gateway/)
+For more information on the Istio gateway, refer to the [Istio documentation.](https://istio.io/docs/reference/config/networking/v1alpha3/gateway/)

# Enable an Istio Gateway
-The ingress gateway is a Kubernetes service that will be deployed in your cluster. The Istio Gateway allows for more extensive customization and flexibility.
+The ingress gateway is a Kubernetes service that will be deployed in your cluster. The Istio Gateway allows for more extensive customization and flexibility.
-1. From the **Cluster Explorer**, select **Istio** from the nav dropdown.
+1. From the **Cluster Explorer**, select **Istio** from the nav dropdown.
1. Click **Gateways** in the side nav bar.
1. Click **Create from Yaml**.
1. Paste your Istio Gateway yaml, or **Read from File**.
@@ -37,7 +32,7 @@ The ingress gateway is a Kubernetes service that will be deployed in your cluste
We add the BookInfo app deployments in services when going through the Workloads example. Next we add an Istio Gateway so that the app is accessible from outside your cluster.
-1. From the **Cluster Explorer**, select **Istio** from the nav dropdown.
+1. From the **Cluster Explorer**, select **Istio** from the nav dropdown.
1. Click **Gateways** in the side nav bar.
1. Click **Create from Yaml**.
1. Copy and paste the Gateway yaml provided below.
@@ -118,8 +113,8 @@ To test and see if the BookInfo app deployed correctly, the app can be viewed a
To get the ingress gateway URL and port,
-1. From the **Cluster Explorer**, Click on **Workloads > Overview**.
-1. Scroll down to the `istio-system` namespace.
+1. From the **Cluster Explorer**, Click on **Workloads > Overview**.
+1. Scroll down to the `istio-system` namespace.
1. Within `istio-system`, there is a workload named `istio-ingressgateway`. Under the name of this workload, you should see links, such as `80/tcp`.
1. Click one of those links. This should show you the URL of the ingress gateway in your web browser. Append `/productpage` to the URL.
@@ -137,8 +132,8 @@ You can try the steps in this section to make sure the Kubernetes gateway is con
In the gateway resource, the selector refers to Istio's default ingress controller by its label, in which the key of the label is `istio` and the value is `ingressgateway`. To make sure the label is appropriate for the gateway, do the following:
-1. From the **Cluster Explorer**, Click on **Workloads > Overview**.
-1. Scroll down to the `istio-system` namespace.
+1. From the **Cluster Explorer**, Click on **Workloads > Overview**.
+1. Scroll down to the `istio-system` namespace.
1. Within `istio-system`, there is a workload named `istio-ingressgateway`. Click the name of this workload and go to the **Labels and Annotations** section. You should see that it has the key `istio` and the value `ingressgateway`. This confirms that the selector in the Gateway resource matches Istio's default ingress controller.
### [Next: Set up Istio's Components for Traffic Management](set-up-traffic-management.md)
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md
index f3d61423f34..387da5da697 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/set-up-traffic-management.md
@@ -1,10 +1,5 @@
---
title: 5. Set up Istio's Components for Traffic Management
-weight: 6
-aliases:
- - /rancher/v2.5/en/istio/setup/set-up-traffic-management
- - /rancher/v2.5/en/istio/v2.5/setup/set-up-traffic-management
- - /rancher/v2.x/en/istio/v2.5/setup/set-up-traffic-management/
---
A central advantage of traffic management in Istio is that it allows dynamic request routing. Some common applications for dynamic request routing include canary deployments and blue/green deployments. The two key resources in Istio traffic management are *virtual services* and *destination rules*.
@@ -20,7 +15,7 @@ After this virtual service is deployed, we will generate traffic and see from th
To deploy the virtual service and destination rules for the `reviews` service,
-1. From the **Cluster Explorer**, select **Istio** from the nav dropdown.
+1. From the **Cluster Explorer**, select **Istio** from the nav dropdown.
1. Click **DestinationRule** in the side nav bar.
1. Click **Create from Yaml**.
1. Copy and paste the DestinationRule yaml provided below.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md
index ce303085aca..ebc410ce9e4 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/istio-setup-guide/use-istio-sidecar.md
@@ -1,13 +1,8 @@
---
title: 3. Add Deployments and Services with the Istio Sidecar
-weight: 4
-aliases:
- - /rancher/v2.5/en/istio/setup/deploy-workloads
- - /rancher/v2.5/en/istio/v2.5/setup/deploy-workloads
- - /rancher/v2.x/en/istio/v2.5/setup/deploy-workloads/
---
-> **Prerequisite:** To enable Istio for a workload, the cluster and namespace must have the Istio app installed.
+> **Prerequisite:** To enable Istio for a workload, the cluster and namespace must have the Istio app installed.
Enabling Istio in a namespace only enables automatic sidecar injection for new workloads. To enable the Envoy sidecar for existing workloads, you need to enable it manually for each workload.
@@ -23,7 +18,7 @@ There are a few ways to add new **Deployments** in your namespace
1. Click **Create.**
1. Select **Deployment** from the various workload options.
1. Fill out the form, or **Edit as Yaml.**
-1. Click **Create.**
+1. Click **Create.**
Alternatively, you can select the specific workload you want to deploy from the **Workload** section of the left navigation bar and create it from there.
@@ -33,12 +28,12 @@ To add a **Service** to your namespace
1. Click **Create**
1. Select the type of service you want to create from the various options
1. Fill out the form, or **Edit as Yaml**
-1. Click **Create**
+1. Click **Create**
You can also create deployments and services using the kubectl **shell**
1. Run `kubectl create -f .yaml` if your file is stored locally in the cluster
-1. Or run `cat<< EOF | kubectl apply -f -`, paste the file contents into the terminal, then run `EOF` to complete the command.
+1. Or run `cat<< EOF | kubectl apply -f -`, paste the file contents into the terminal, then run `EOF` to complete the command.
### Example Deployments and Services
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
index 250c7b4c9ce..c93ff02f41f 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
@@ -1,12 +1,5 @@
---
title: Adding Users to Clusters
-weight: 2020
-aliases:
- - /rancher/v2.5/en/tasks/clusters/adding-managing-cluster-members/
- - /rancher/v2.5/en/k8s-in-rancher/cluster-members/
- - /rancher/v2.5/en/cluster-admin/cluster-members
- - /rancher/v2.5/en/cluster-provisioning/cluster-members/
- - /rancher/v2.x/en/cluster-admin/cluster-access/cluster-members/
---
If you want to provide a user with access and permissions to _all_ projects, nodes, and resources within a cluster, assign the user a cluster membership.
@@ -44,7 +37,7 @@ Cluster administrators can edit the membership for a cluster, controlling which
>**Note:** If you are logged in as a local user, external users do not display in your search results. For more information, see [External Authentication Configuration and Principal Users](../../../../pages-for-subheaders/about-authentication.md#external-authentication-configuration-and-principal-users).
-4. Assign the user or group **Cluster** roles.
+4. Assign the user or group **Cluster** roles.
[What are Cluster Roles?](../../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
index 28a62afd51e..1977de1b0ea 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
@@ -1,8 +1,5 @@
---
title: How the Authorized Cluster Endpoint Works
-weight: 2015
-aliases:
- - /rancher/v2.x/en/cluster-admin/cluster-access/ace/
---
This section describes how the kubectl CLI, the kubeconfig file, and the authorized cluster endpoint work together to allow you to access a downstream Kubernetes cluster directly, without authenticating through the Rancher server. It is intended to provide background information and context to the instructions for [how to set up kubectl to directly access a cluster.](use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster)
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
index 02b74aedc2c..fb80d6ff62d 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
@@ -1,14 +1,6 @@
---
title: "Access a Cluster with Kubectl and kubeconfig"
description: "Learn how you can access and manage your Kubernetes clusters using kubectl with kubectl Shell or with kubectl CLI and kubeconfig file. A kubeconfig file is used to configure access to Kubernetes. When you create a cluster with Rancher, it automatically creates a kubeconfig for your cluster."
-weight: 2010
-aliases:
- - /rancher/v2.5/en/k8s-in-rancher/kubectl/
- - /rancher/v2.5/en/cluster-admin/kubectl
- - /rancher/v2.5/en/concepts/clusters/kubeconfig-files/
- - /rancher/v2.5/en/k8s-in-rancher/kubeconfig/
- - /rancher/2.x/en/cluster-admin/kubeconfig
- - /rancher/v2.x/en/cluster-admin/cluster-access/kubectl/
---
This section describes how to manipulate your downstream Kubernetes cluster with kubectl from the Rancher UI or from your workstation.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
index c9c257a20a8..c04d124b489 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
@@ -1,11 +1,8 @@
---
title: Adding a Pod Security Policy
-weight: 80
-aliases:
- - /rancher/v2.x/en/cluster-admin/pod-security-policy/
---
-> **Prerequisite:** The options below are available only for clusters that are [launched using RKE.](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md)
+> **Prerequisite:** The options below are available only for clusters that are [launched using RKE.](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md)
When your cluster is running pods with security-sensitive configurations, assign it a [pod security policy](../authentication-permissions-and-global-configuration/create-pod-security-policies.md), which is a set of rules that monitors the conditions and settings in your pods. If a pod doesn't meet the rules specified in your policy, the policy stops it from running.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
index 5fef5e00c3f..72cd255f22e 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
@@ -1,8 +1,5 @@
---
title: Assigning Pod Security Policies
-weight: 2260
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/options/pod-security-policies/
---
_Pod Security Policies_ are objects that control security-sensitive aspects of pod specification (like root privileges).
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
index 97bb0db5742..ec66a534628 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
@@ -1,10 +1,6 @@
---
title: Removing Kubernetes Components from Nodes
description: Learn about cluster cleanup when removing nodes from your Rancher-launched Kubernetes cluster. What is removed, how to do it manually
-weight: 2055
-aliases:
- - /rancher/v2.5/en/faq/cleaning-cluster-nodes/
- - /rancher/v2.x/en/cluster-admin/cleaning-cluster-nodes/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
index 78a9ccac948..14364608a0c 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
@@ -1,9 +1,5 @@
---
title: Cloning Clusters
-weight: 2035
-aliases:
- - /rancher/v2.5/en/cluster-provisioning/cloning-clusters/
- - /rancher/v2.x/en/cluster-admin/cloning-clusters/
---
If you have a cluster in Rancher that you want to use as a template for creating similar clusters, you can use Rancher CLI to clone the cluster's configuration, edit it, and then use it to quickly launch the cloned cluster.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
index e9dc887601f..83cadc01a34 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
@@ -1,8 +1,5 @@
---
title: GlusterFS Volumes
-weight: 5000
-aliases:
- - /rancher/v2.x/en/cluster-admin/volumes-and-storage/glusterfs-volumes/
---
> This section only applies to [RKE clusters.](../../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md)
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
index 1673fb99a87..8a49d18bb3e 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
@@ -1,9 +1,5 @@
---
title: How Persistent Storage Works
-weight: 1
-aliases:
- - /rancher/v2.5/en/tasks/workloads/add-persistent-volume-claim
- - /rancher/v2.x/en/cluster-admin/volumes-and-storage/how-storage-works/
---
A persistent volume (PV) is a piece of storage in the Kubernetes cluster, while a persistent volume claim (PVC) is a request for storage.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
index 4f6deb1aba6..2d39f9cea38 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
@@ -1,8 +1,5 @@
---
title: Dynamically Provisioning New Storage in Rancher
-weight: 2
-aliases:
- - /rancher/v2.x/en/cluster-admin/volumes-and-storage/provisioning-new-storage/
---
This section describes how to provision new persistent storage for workloads in Rancher.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
index 6f456414c29..60eccd1d2d7 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
@@ -1,8 +1,5 @@
---
title: iSCSI Volumes
-weight: 6000
-aliases:
- - /rancher/v2.x/en/cluster-admin/volumes-and-storage/iscsi-volumes/
---
In [Rancher Launched Kubernetes clusters](../../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) that store data on iSCSI volumes, you may experience an issue where kubelets fail to automatically connect with iSCSI volumes. This failure is likely due to an incompatibility issue involving the iSCSI initiator tool. You can resolve this issue by installing the iSCSI initiator tool on each of your cluster nodes.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
index e7dd896a9eb..bd060456694 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
@@ -1,9 +1,5 @@
---
title: Setting up Existing Storage
-weight: 1
-aliases:
- - /rancher/v2.5/en/k8s-in-rancher/volumes-and-storage/persistent-volume-claims/
- - /rancher/v2.x/en/cluster-admin/volumes-and-storage/attaching-existing-storage/
---
This section describes how to set up existing persistent storage for workloads in Rancher.
@@ -26,7 +22,7 @@ To set up storage, follow these steps:
Creating a persistent volume in Rancher will not create a storage volume. It only creates a Kubernetes resource that maps to an existing volume. Therefore, before you can create a persistent volume as a Kubernetes resource, you must have storage provisioned.
-The steps to set up a persistent storage device will differ based on your infrastructure. We provide examples of how to set up storage using [vSphere,](../provisioning-storage-examples/vsphere-storage.md) [NFS,](../provisioning-storage-examples/nfs-storage.md) or Amazon's [EBS.](../provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)
+The steps to set up a persistent storage device will differ based on your infrastructure. We provide examples of how to set up storage using [vSphere,](../provisioning-storage-examples/vsphere-storage.md) [NFS,](../provisioning-storage-examples/nfs-storage.md) or Amazon's [EBS.](../provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)
If you have a pool of block storage, and you don't want to use a cloud provider, Longhorn could help you provide persistent storage to your Kubernetes cluster. For more information, see [this page.](../../../../../explanations/integrations-in-rancher/longhorn.md)
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
index 5a144889b9a..610f41e7372 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
@@ -1,8 +1,5 @@
---
title: Using an External Ceph Driver
-weight: 10
-aliases:
- - /rancher/v2.x/en/cluster-admin/volumes-and-storage/ceph/
---
These instructions are about using the external Ceph driver in an RKE2 cluster. If you are using RKE, additional steps are required. For details, refer to [this section.](#using-the-ceph-driver-with-rke)
@@ -205,7 +202,7 @@ spec:
fsType: ext4
readOnly: false
EOF
-
+
kubectl apply -f ceph-rbd-pod-inline.yaml
kubectl get pod
kubectl exec pod/ceph-rbd-pod-inline -- df -k | grep rbd
@@ -230,9 +227,9 @@ spec:
- 10.85.8.118:6789
- 10.85.8.123:6789
- 10.85.8.124:6789
- pool: myPool
+ pool: myPool
image: image
- user: myPoolUser
+ user: myPoolUser
secretRef:
name: ceph-user
fsType: ext4
@@ -266,13 +263,13 @@ spec:
persistentVolumeClaim:
claimName: ceph-rbd-pvc
EOF
-
+
kubectl apply -f ceph-rbd-pod-pvc-pv-allinone.yaml
kubectl get pv,pvc,pod
kubectl exec pod/ceph-rbd-pod-pvc-pv -- df -k | grep rbd
```
-### Using RBD in Storage Classes
+### Using RBD in Storage Classes
This example is for dynamic provisioning. The ceph-csi driver is needed.
@@ -312,7 +309,7 @@ spec:
requests:
storage: 2Gi
storageClassName: ceph-rbd-sc
----
+---
apiVersion: v1
kind: Pod
metadata:
@@ -330,7 +327,7 @@ spec:
persistentVolumeClaim:
claimName: ceph-rbd-sc-pvc
EOF
-
+
kubectl apply -f ceph-rbd-pod-pvc-sc-allinone.yaml
kubectl get pv,pvc,sc,pod
kubectl exec pod/ceph-rbd-pod-pvc-sc -- df -k | grep rbd
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
index e785b0c62fb..6282fb5e0b2 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
@@ -1,9 +1,5 @@
---
title: NFS Storage
-weight: 3054
-aliases:
- - /rancher/v2.5/en/tasks/clusters/adding-storage/provisioning-storage/nfs/
- - /rancher/v2.x/en/cluster-admin/volumes-and-storage/examples/nfs/
---
Before you can use the NFS storage volume plug-in with Rancher deployments, you need to provision an NFS server.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
index 5ddb1dc703d..a9e3e200de1 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
@@ -1,8 +1,5 @@
---
title: Creating Persistent Storage in Amazon's EBS
-weight: 3053
-aliases:
- - /rancher/v2.x/en/cluster-admin/volumes-and-storage/examples/ebs/
---
This section describes how to set up Amazon's Elastic Block Store in EC2.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
index 0b6d90350c3..5f1447ad2bb 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
@@ -1,9 +1,5 @@
---
title: vSphere Storage
-weight: 3055
-aliases:
- - /rancher/v2.5/en/tasks/clusters/adding-storage/provisioning-storage/vsphere/
- - /rancher/v2.x/en/cluster-admin/volumes-and-storage/examples/vsphere/
---
To provide stateful workloads with vSphere storage, we recommend creating a vSphereVolume StorageClass. This practice dynamically provisions vSphere storage when workloads request volumes through a persistent volume claim.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
index 102a674be11..c0ea2d0642b 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
@@ -1,8 +1,5 @@
---
title: Cluster Autoscaler with AWS EC2 Auto Scaling Groups
-weight: 1
-aliases:
- - /rancher/v2.x/en/cluster-admin/cluster-autoscaler/amazon/
---
This guide will show you how to install and use [Kubernetes cluster-autoscaler](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/) on Rancher custom clusters using AWS EC2 Auto Scaling Groups.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
index 7b9497b7df4..6cd8fcf886d 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
@@ -1,8 +1,5 @@
---
title: Nodes and Node Pools
-weight: 2030
-aliases:
- - /rancher/v2.x/en/cluster-admin/nodes/
---
After you launch a Kubernetes cluster in Rancher, you can manage individual nodes from the cluster's **Node** tab. Depending on the [option used](../../../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md) to provision the cluster, there are different node options available.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
index 251046fa91b..d652a4963dd 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
@@ -1,13 +1,6 @@
---
title: Projects and Kubernetes Namespaces with Rancher
description: Rancher Projects ease the administrative burden of your cluster and support multi-tenancy. Learn to create projects and divide projects into Kubernetes namespaces
-weight: 2032
-aliases:
- - /rancher/v2.5/en/concepts/projects/
- - /rancher/v2.5/en/tasks/projects/
- - /rancher/v2.5/en/tasks/projects/create-project/
- - /rancher/v2.5/en/tasks/projects/create-project/
- - /rancher/v2.x/en/cluster-admin/projects-and-namespaces/
---
A namespace is a Kubernetes concept that allows a virtual cluster within a cluster, which is useful for dividing the cluster into separate "virtual clusters" that each have their own access control and resource quotas.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
index be83aba86d2..289ee1904d8 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
@@ -1,8 +1,5 @@
---
title: Certificate Rotation
-weight: 2040
-aliases:
- - /rancher/v2.x/en/cluster-admin/certificate-rotation/
---
> **Warning:** Rotating Kubernetes certificates may result in your cluster being temporarily unavailable as components are restarted. For production environments, it's recommended to perform this action during a maintenance window.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
index ba7527cd5ad..6b23b86a616 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
@@ -1,10 +1,5 @@
---
title: Adding Users to Projects
-weight: 2505
-aliases:
- - /rancher/v2.5/en/tasks/projects/add-project-members/
- - /rancher/v2.5/en/cluster-admin/projects-and-namespaces/project-members
- - /rancher/v2.x/en/project-admin/project-members/
---
If you want to provide a user with access and permissions to _specific_ projects and resources within a cluster, assign the user a project membership.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md
index 7c98a040713..0755b7a9e30 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md
@@ -1,13 +1,8 @@
---
title: Rancher's CI/CD Pipelines
description: Use Rancher’s CI/CD pipeline to automatically checkout code, run builds or scripts, publish Docker images, and deploy software to users
-weight: 4000
-aliases:
- - /rancher/v2.5/en/concepts/ci-cd-pipelines/
- - /rancher/v2.5/en/tasks/pipelines/
- - /rancher/v2.5/en/tools/pipelines/configurations/
- - /rancher/v2.x/en/project-admin/pipelines/
---
+
Using Rancher, you can integrate with a GitHub repository to setup a continuous integration (CI) pipeline.
After configuring Rancher and GitHub, you can deploy containers running Jenkins to automate a pipeline execution:
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
index c81c5a72f86..69f7e9229b8 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
@@ -1,8 +1,5 @@
---
title: Namespaces
-weight: 2520
-aliases:
- - /rancher/v2.x/en/project-admin/namespaces/
---
Within Rancher, you can further divide projects into different [namespaces](https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/), which are virtual clusters within a project backed by a physical cluster. Should you require another level of organization beyond projects and the `default` namespace, you can use multiple namespaces to isolate applications and resources.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
index f1214fb1b32..fe08d0afe49 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
@@ -1,18 +1,15 @@
---
title: Pod Security Policies
-weight: 5600
-aliases:
- - /rancher/v2.x/en/project-admin/pod-security-policies/
---
-> These cluster options are only available for [clusters in which Rancher has launched Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md).
+> These cluster options are only available for [clusters in which Rancher has launched Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md).
You can always assign a pod security policy (PSP) to an existing project if you didn't assign one during creation.
### Prerequisites
- Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies](../authentication-permissions-and-global-configuration/create-pod-security-policies.md).
-- Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [the documentation about adding a pod security policy to a cluster](../manage-clusters/add-a-pod-security-policy.md).
+- Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [the documentation about adding a pod security policy to a cluster](../manage-clusters/add-a-pod-security-policy.md).
### Applying a Pod Security Policy
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
index a4eb105a9e0..640e612dbc1 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
@@ -1,8 +1,5 @@
---
title: How Resource Quotas Work in Rancher Projects
-weight: 1
-aliases:
- - /rancher/v2.x/en/project-admin/resource-quotas/quotas-for-projects/
---
Resource quotas in Rancher include the same functionality as the [native version of Kubernetes](https://kubernetes.io/docs/concepts/policy/resource-quotas/). However, in Rancher, resource quotas have been extended so that you can apply them to projects.
@@ -27,7 +24,7 @@ The resource quota includes two limits, which you set while creating or editing
- **Namespace Default Limits:**
This value is the default resource limit available for each namespace. When the resource quota is created at the project level, this limit is automatically propagated to each namespace in the project. Each namespace is bound to this default limit unless you override it.
-
+
In the following diagram, a Rancher administrator wants to apply a resource quota that sets the same CPU and memory limit for every namespace in their project (`Namespace 1-4`). However, in Rancher, the administrator can set a resource quota for the project (`Project Resource Quota`) rather than individual namespaces. This quota includes resource limits for both the entire project (`Project Limit`) and individual namespaces (`Namespace Default Limit`). Rancher then propagates the `Namespace Default Limit` quotas to each namespace (`Namespace Resource Quota`) when created.
Rancher: Resource Quotas Propagating to Each Namespace
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
index 7c738d55e3d..d0bb519de80 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
@@ -1,8 +1,5 @@
---
title: Overriding the Default Limit for a Namespace
-weight: 2
-aliases:
- - /rancher/v2.x/en/project-admin/resource-quotas/override-namespace-default/
---
Although the **Namespace Default Limit** propagates from the project to each namespace when created, in some cases, you may need to increase (or decrease) the quotas for a specific namespace. In this situation, you can override the default limits by editing the namespace.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md
index c3d20c529f0..7c6c072146d 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md
@@ -1,8 +1,5 @@
---
title: Resource Quota Type Reference
-weight: 4
-aliases:
- - /rancher/v2.x/en/project-admin/resource-quotas/quota-type-reference/
---
When you create a resource quota, you are configuring the pool of resources available to the project. You can set the following resource limits for the following resource types.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md
index 38740198bcd..d7034958bdb 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits.md
@@ -1,8 +1,5 @@
---
title: Setting Container Default Resource Limits
-weight: 3
-aliases:
- - /rancher/v2.x/en/project-admin/resource-quotas/override-container-default/
---
When setting resource quotas, if you set anything related to CPU or Memory (i.e. limits or reservations) on a project / namespace, all containers will require a respective CPU or Memory field set during creation. See the [Kubernetes documentation](https://kubernetes.io/docs/concepts/policy/resource-quotas/#requests-vs-limits) for more details on why this is required.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md
index 66b4d84d322..59262573937 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md
@@ -1,9 +1,5 @@
---
title: Persistent Grafana Dashboards
-weight: 6
-aliases:
- - /rancher/v2.5/en/monitoring-alerting/persist-grafana
- - /rancher/v2.x/en/monitoring-alerting/v2.5/persist-grafana/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
index 2b038be9c46..20c1a7296fb 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
@@ -1,6 +1,5 @@
---
title: Customizing Grafana Dashboards
-weight: 5
---
In this section, you'll learn how to customize the Grafana dashboard to show metrics that apply to a certain container.
@@ -27,12 +26,12 @@ For any panel, you can click the title and click **Explore** to get the PromQL q
For this example, we would like to get the CPU usage for the Alertmanager container, so we click **CPU Utilization > Inspect.**
The **Data** tab shows the underlying data as a time series, with the time in first column and the PromQL query result in the second column. Copy the PromQL query.
-
+
```
(1 - (avg(irate({__name__=~"node_cpu_seconds_total|windows_cpu_time_total",mode="idle"}[5m])))) * 100
```
-You can then modify the query in the Grafana panel or create a new Grafana panel using the query.
+You can then modify the query in the Grafana panel or create a new Grafana panel using the query.
See also:
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/debug-high-memory-usage.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/debug-high-memory-usage.md
index 9583570c444..d411a0d92fc 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/debug-high-memory-usage.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/debug-high-memory-usage.md
@@ -1,6 +1,5 @@
---
title: Debugging High Memory Usage
-weight: 8
---
Every time series in Prometheus is uniquely identified by its [metric name](https://prometheus.io/docs/practices/naming/#metric-names) and optional key-value pairs called [labels.](https://prometheus.io/docs/practices/naming/#labels)
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
index 998a53a1cdb..cde740a7d2a 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
@@ -1,6 +1,5 @@
---
title: Enable Monitoring
-weight: 1
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
index 041906d0d4c..37e9975d6bb 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
@@ -1,16 +1,12 @@
---
title: Migrating to Rancher v2.5 Monitoring
-weight: 9
-aliases:
- - /rancher/v2.5/en/monitoring-alerting/migrating
- - /rancher/v2.x/en/monitoring-alerting/v2.5/migrating/
---
If you previously enabled Monitoring, Alerting, or Notifiers in Rancher before v2.5, there is no automatic upgrade path for switching to the new monitoring/alerting solution. Before deploying the new monitoring solution via Cluster Explore, you will need to disable and remove all existing custom alerts, notifiers and monitoring installations for the whole cluster and in all projects.
## Monitoring Before Rancher v2.5
-As of v2.2.0, Rancher's Cluster Manager allowed users to enable Monitoring & Alerting V1 (both powered by [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator)) independently within a cluster.
+As of v2.2.0, Rancher's Cluster Manager allowed users to enable Monitoring & Alerting V1 (both powered by [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator)) independently within a cluster.
When Monitoring is enabled, Monitoring V1 deploys [Prometheus](https://prometheus.io/) and [Grafana](https://grafana.com/docs/grafana/latest/getting-started/what-is-grafana/) onto a cluster to monitor the state of processes of your cluster nodes, Kubernetes components, and software deployments and create custom dashboards to make it easy to visualize collected metrics.
@@ -20,7 +16,7 @@ When Alerts or Notifiers are enabled, Alerting V1 deploys [Prometheus Alertmanag
## Monitoring and Alerting via Cluster Explorer in Rancher 2.5
-As of v2.5.0, Rancher's Cluster Explorer now allows users to enable Monitoring & Alerting V2 (both powered by [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator)) together within a cluster.
+As of v2.5.0, Rancher's Cluster Explorer now allows users to enable Monitoring & Alerting V2 (both powered by [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator)) together within a cluster.
Unlike in Monitoring & Alerting V1, both features are packaged in a single Helm chart found [here](https://github.com/rancher/charts/blob/main/charts/rancher-monitoring). The behavior of this chart and configurable fields closely matches [kube-prometheus-stack](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack), a Prometheus Community Helm chart, and any deviations from the upstream chart can be found in the [CHANGELOG.md](https://github.com/rancher/charts/blob/main/charts/rancher-monitoring/CHANGELOG.md) maintained with the chart.
@@ -80,8 +76,8 @@ metadata:
grafana_dashboard: "1"
data:
custom-dashboard.json: |
- {
- ...
+ {
+ ...
}
```
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/set-up-monitoring-for-workloads.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/set-up-monitoring-for-workloads.md
index 2c8ed38dc62..befcd8e2d04 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/set-up-monitoring-for-workloads.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/set-up-monitoring-for-workloads.md
@@ -1,6 +1,5 @@
---
title: Setting up Monitoring for a Workload
-weight: 4
---
If you only need CPU and memory time series for the workload, you don't need to deploy a ServiceMonitor or PodMonitor because the monitoring application already collects metrics data on resource usage by default.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/uninstall-monitoring.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/uninstall-monitoring.md
index 0c9d681cc16..72b8fe20479 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/uninstall-monitoring.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-alerting-guides/uninstall-monitoring.md
@@ -1,6 +1,5 @@
---
title: Uninstall Monitoring
-weight: 2
---
1. From the **Cluster Explorer,** click Apps & Marketplace.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
index d0c98222ce8..820452b14ee 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
@@ -1,6 +1,5 @@
---
title: Alertmanager Configuration
-weight: 1
---
It is usually not necessary to directly edit the Alertmanager custom resource. For most use cases, you will only need to edit the Receivers and Routes to configure notifications.
@@ -24,9 +23,9 @@ While the Rancher UI only supports a routing tree that is two levels deep, you c
### Multiple Alertmanager Replicas
As part of the chart deployment options, you can opt to increase the number of replicas of the Alertmanager deployed onto your cluster. The replicas can all be managed using the same underlying Alertmanager Config Secret.
-
+
This Secret should be updated or modified any time you want to:
-
+
- Add in new notifiers or receivers
- Change the alerts that should be sent to specific notifiers or receivers
- Change the group of alerts that are sent out
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
index 7f6e8492f44..16f1a6c6796 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
@@ -1,10 +1,5 @@
---
title: Prometheus Configuration
-weight: 1
-aliases:
- - /rancher/v2.5/en/monitoring-alerting/configuration/prometheusrules
- - /rancher/v2.5/en/monitoring-alerting/configuration/prometheusrules
- - /rancher/v2.5/en/monitoring-alerting/configuration/advanced/prometheusrules
---
It is usually not necessary to directly edit the Prometheus custom resource because the monitoring application automatically updates it based on changes to ServiceMonitors and PodMonitors.
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
index a044a2ab81d..f60903d087d 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
@@ -1,8 +1,5 @@
---
title: Configuring PrometheusRules
-weight: 3
-aliases:
- - /rancher/v2.x/en/monitoring-alerting/v2.5/configuration/prometheusrules/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md
index b31c1ccf055..99e73ccf7e6 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md
@@ -1,14 +1,5 @@
---
title: Backing up Rancher Installed with Docker
-shortTitle: Backups
-weight: 3
-aliases:
- - /rancher/v2.5/en/installation/after-installation/single-node-backup-and-restoration/
- - /rancher/v2.5/en/installation/after-installation/single-node-backup-and-restoration/
- - /rancher/v2.5/en/backups/backups/single-node-backups/
- - /rancher/v2.5/en/backups/legacy/backup/single-node-backups/
- - /rancher/v2.5/en/backups/v2.5/docker-installs/docker-backups/
- - /rancher/v2.x/en/backups/v2.5/docker-installs/docker-backups/
---
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md
index 05d9ae9e513..a863ae55a25 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md
@@ -1,8 +1,5 @@
---
title: Backing up a Cluster
-weight: 2045
-aliases:
- - /rancher/v2.x/en/cluster-admin/backing-up-etcd/
---
In the Rancher UI, etcd backup and recovery for [Rancher launched Kubernetes clusters](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) can be easily performed.
@@ -15,7 +12,7 @@ Snapshots of the etcd database are taken and saved either [locally onto the etcd
### Snapshot Components
-When Rancher creates a snapshot, it includes three components:
+When Rancher creates a snapshot, it includes three components:
- The cluster data in etcd
- The Kubernetes version
@@ -143,7 +140,7 @@ The list of all available snapshots for the cluster is available in the Rancher
# Safe Timestamps
-Snapshot files are timestamped to simplify processing the files using external tools and scripts, but in some S3 compatible backends, these timestamps were unusable.
+Snapshot files are timestamped to simplify processing the files using external tools and scripts, but in some S3 compatible backends, these timestamps were unusable.
The option `safe_timestamp` is added to support compatible file names. When this flag is set to `true`, all special characters in the snapshot filename timestamp are replaced.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md
index a26e8b70b27..c065f718570 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md
@@ -1,10 +1,5 @@
---
title: Backing up Rancher
-weight: 1
-aliases:
- - /rancher/v2.5/en/backups/v2.5/back-up-rancher
- - /rancher/v2.x/en/backups/
- - /rancher/v2.x/en/backups/v2.5/back-up-rancher/
---
In this section, you'll learn how to back up Rancher running on any Kubernetes cluster. To backup Rancher installed with Docker, refer to the instructions for [single node backups](./back-up-docker-installed-rancher.md).
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
index df35047fbf8..6a41f714bf8 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
@@ -1,8 +1,5 @@
---
title: Migrating Rancher to a New Cluster
-weight: 3
-aliases:
- - /rancher/v2.x/en/backups/v2.5/migrating-rancher/
---
If you are migrating Rancher to a new Kubernetes cluster, you don't need to install Rancher on the new cluster first. If Rancher is restored to a new cluster with Rancher already installed, it can cause problems.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md
index c2f0feccb45..32b964b9b61 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md
@@ -1,12 +1,5 @@
---
title: Restoring Backups—Docker Installs
-shortTitle: Restores
-weight: 3
-aliases:
- - /rancher/v2.5/en/installation/after-installation/single-node-backup-and-restoration/
- - /rancher/v2.5/en/backups/restorations/single-node-restoration
- - /rancher/v2.5/en/backups/v2.5/docker-installs/docker-restores
- - /rancher/v2.x/en/backups/v2.5/docker-installs/docker-restores/
---
If you encounter a disaster scenario, you can restore your Rancher Server to your most recent backup.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
index 4b5f810056b..51111c3878f 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
@@ -1,8 +1,5 @@
---
title: Restoring a Cluster from Backup
-weight: 2050
-aliases:
- - /rancher/v2.x/en/cluster-admin/restoring-etcd/
---
etcd backup and recovery for [Rancher launched Kubernetes clusters](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) can be easily performed. Snapshots of the etcd database are taken and saved either locally onto the etcd nodes or to a S3 compatible target. The advantages of configuring S3 is that if all etcd nodes are lost, your snapshot is saved remotely and can be used to restore the cluster.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md
index a9bf5655071..6b0a8c01507 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md
@@ -1,13 +1,8 @@
---
title: Restoring Rancher
-weight: 2
-aliases:
- - /rancher/v2.x/en/installation/backups/restores
- - /rancher/v2.x/en/backups/restoring-rancher
- - /rancher/v2.x/en/backups/v2.5/restoring-rancher/
---
-A restore is performed by creating a Restore custom resource.
+A restore is performed by creating a Restore custom resource.
> **Important**
>
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
index d4e18583ab7..02fd09d6662 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
@@ -1,8 +1,5 @@
---
title: Fleet - GitOps at Scale
-weight: 1
-aliases:
- - /rancher/v2.x/en/deploy-across-clusters/fleet/
---
_Available as of Rancher v2.5_
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
index 836714c2777..b6287978c38 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
@@ -1,8 +1,5 @@
---
title: Multi-cluster Apps
-weight: 2
-aliases:
- - /rancher/v2.x/en/deploy-across-clusters/multi-cluster-apps/
---
> As of Rancher v2.5, we now recommend using [Fleet](fleet.md) for deploying apps across clusters.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md
index 3067f1d7065..daf5fd980be 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer.md
@@ -1,11 +1,5 @@
---
title: Setting up Amazon ELB Network Load Balancer
-weight: 5
-aliases:
- - /rancher/v2.5/en/installation/ha/create-nodes-lb/nlb
- - /rancher/v2.5/en/installation/k8s-install/create-nodes-lb/nlb
- - /rancher/v2.5/en/installation/options/nlb
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/nlb/
---
This how-to guide describes how to set up a Network Load Balancer (NLB) in Amazon's EC2 service that will direct traffic to multiple instances on EC2.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
index 07cdc53e221..a8bf6f42e55 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
@@ -1,9 +1,5 @@
---
title: 'Set up Infrastructure for a High Availability K3s Kubernetes Cluster'
-weight: 1
-aliases:
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/infra-for-ha-with-external-db/
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/ha-with-external-db/
---
This tutorial is intended to help you provision the underlying infrastructure for a Rancher management server.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
index bb1fc6b5201..1bb756edcb9 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
@@ -1,8 +1,5 @@
---
title: 'Set up Infrastructure for a High Availability RKE Kubernetes Cluster'
-weight: 2
-aliases:
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/infra-for-ha/
---
This tutorial is intended to help you create a high-availability RKE cluster that can be used to install a Rancher server.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
index 56c53b2f869..364b8bbc2c2 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
@@ -1,8 +1,5 @@
---
title: 'Set up Infrastructure for a High Availability RKE2 Kubernetes Cluster'
-weight: 1
-aliases:
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/infra-for-rke2-ha/
---
This tutorial is intended to help you provision the underlying infrastructure for a Rancher management server.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md
index 16b26d4df28..e243e79b8d4 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds.md
@@ -1,10 +1,7 @@
---
title: Setting up a MySQL Database in Amazon RDS
-weight: 4
-aliases:
- - /rancher/v2.5/en/installation/options/rds
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/rds/
---
+
This tutorial describes how to set up a MySQL database in Amazon's RDS.
This database can later be used as an external datastore for a high-availability K3s Kubernetes cluster.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md
index 6429616c410..5d99d593b6f 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md
@@ -1,9 +1,5 @@
---
title: Setting up an NGINX Load Balancer
-weight: 4
-aliases:
- - /rancher/v2.5/en/installation/options/nginx
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/nginx/
---
NGINX will be configured as Layer 4 load balancer (TCP) that forwards connections to one of your Rancher nodes.
@@ -31,7 +27,7 @@ After installing NGINX, you need to update the NGINX configuration file, `nginx.
> **Note:** See [NGINX Documentation: TCP and UDP Load Balancing](https://docs.nginx.com/nginx/admin-guide/load-balancer/tcp-udp-load-balancer/) for all configuration options.
Example NGINX config
-
+
```
worker_processes 4;
worker_rlimit_nofile 40000;
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md
index 0d9d74d8742..ef27916b103 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2.md
@@ -1,9 +1,5 @@
---
title: Setting up Nodes in Amazon EC2
-weight: 3
-aliases:
- - /rancher/v2.5/en/installation/options/ec2-node
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/ec2-node/
---
In this tutorial, you will learn one way to set up Linux nodes for the Rancher management server. These nodes will fulfill the node requirements for [OS, Docker, hardware, and networking.](../../../pages-for-subheaders/installation-requirements.md)
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md
index 8932b4cd356..dac6692ad2c 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs.md
@@ -1,8 +1,5 @@
---
title: About High-availability Installations
-weight: 1
-aliases:
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/how-ha-works/
---
We recommend using Helm, a Kubernetes package manager, to install Rancher on a dedicated Kubernetes cluster. This is called a high-availability Kubernetes installation because increased availability is achieved by running Rancher on multiple nodes.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md
index ef6e6daa845..34098280ba5 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher.md
@@ -1,7 +1,5 @@
---
title: Setting up a High-availability K3s Kubernetes Cluster for Rancher
-shortTitle: Set up K3s for Rancher
-weight: 2
---
This section describes how to install a Kubernetes cluster according to the [best practices for the Rancher server environment.](../../../reference-guides/rancher-manager-architecture/architecture-recommendations.md#environment-for-kubernetes-installations)
@@ -53,7 +51,7 @@ Then you should see two nodes with the master role:
ubuntu@ip-172-31-60-194:~$ sudo k3s kubectl get nodes
NAME STATUS ROLES AGE VERSION
ip-172-31-60-194 Ready master 44m v1.17.2+k3s1
-ip-172-31-63-88 Ready master 6m8s v1.17.2+k3s1
+ip-172-31-63-88 Ready master 6m8s v1.17.2+k3s1
```
Then test the health of the cluster pods:
@@ -67,7 +65,7 @@ sudo k3s kubectl get pods --all-namespaces
When you installed K3s on each Rancher server node, a `kubeconfig` file was created on the node at `/etc/rancher/k3s/k3s.yaml`. This file contains credentials for full access to the cluster, and you should save this file in a secure location.
-To use this `kubeconfig` file,
+To use this `kubeconfig` file,
1. Install [kubectl,](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl) a Kubernetes command-line tool.
2. Copy the file at `/etc/rancher/k3s/k3s.yaml` and save it to the directory `~/.kube/config` on your local machine.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
index 7f46595de6c..a825a493014 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
@@ -1,10 +1,5 @@
---
title: Setting up a High-availability RKE Kubernetes Cluster
-shortTitle: Set up RKE Kubernetes
-weight: 3
-aliases:
- - /rancher/v2.5/en/installation/k8s-install/kubernetes-rke
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/ha-rke/
---
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md
index c35f995f5ba..abb77415021 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md
@@ -1,11 +1,7 @@
---
title: Setting up a High-availability RKE2 Kubernetes Cluster for Rancher
-shortTitle: Set up RKE2 for Rancher
-weight: 2
-aliases:
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/ha-RKE2
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/ha-RKE2/
---
+
_Tested on v2.5.6_
This section describes how to install a Kubernetes cluster according to the [best practices for the Rancher server environment.](../../../reference-guides/rancher-manager-architecture/architecture-recommendations.md#environment-for-kubernetes-installations)
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md
index eecc5dd54c0..814fdcc7b8e 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture.md
@@ -1,17 +1,14 @@
---
title: Recommended Cluster Architecture
-weight: 1
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/production/recommended-architecture/
---
-There are three roles that can be assigned to nodes: `etcd`, `controlplane` and `worker`.
+There are three roles that can be assigned to nodes: `etcd`, `controlplane` and `worker`.
## Separating Worker Nodes from Nodes with Other Roles
When designing your cluster(s), you have two options:
-* Use dedicated nodes for each role. This ensures resource availability for the components needed for the specified role. It also strictly isolates network traffic between each of the roles according to the [port requirements](../node-requirements-for-rancher-managed-clusters.md#networking-requirements).
+* Use dedicated nodes for each role. This ensures resource availability for the components needed for the specified role. It also strictly isolates network traffic between each of the roles according to the [port requirements](../node-requirements-for-rancher-managed-clusters.md#networking-requirements).
* Assign the `etcd` and `controlplane` roles to the same nodes. These nodes must meet the hardware requirements for both roles.
In either case, the `worker` role should not be used or added to nodes with the `etcd` or `controlplane` role.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md
index b689c859013..55daa6129e1 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes.md
@@ -1,8 +1,5 @@
---
title: Roles for Nodes in Kubernetes
-weight: 1
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/production/nodes-and-roles/
---
This section describes the roles for etcd nodes, controlplane nodes, and worker nodes in Kubernetes, and how the roles work together in a cluster.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
index fefc5180651..eee2bc57492 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
@@ -1,8 +1,5 @@
---
title: Rancher Agents
-weight: 2400
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/rancher-agents/
---
There are two different agent resources deployed on Rancher managed clusters:
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
index 074c965e336..0ffec37df75 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
@@ -1,8 +1,5 @@
---
title: Setting up the Amazon Cloud Provider
-weight: 1
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/cloud-providers/amazon/
---
When using the `Amazon` cloud provider, you can leverage the following capabilities:
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
index 66e1ae08b16..a477edfcdd3 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
@@ -1,8 +1,5 @@
---
title: Setting up the Azure Cloud Provider
-weight: 2
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/cloud-providers/azure/
---
When using the `Azure` cloud provider, you can leverage the following capabilities:
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
index e21d277b69b..f7b9809948b 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
@@ -1,15 +1,12 @@
---
title: Setting up the Google Compute Engine Cloud Provider
-weight: 3
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/cloud-providers/gce/
---
In this section, you'll learn how to enable the Google Compute Engine (GCE) cloud provider for custom clusters in Rancher. A custom cluster is one in which Rancher installs Kubernetes on existing nodes.
The official Kubernetes documentation for the GCE cloud provider is [here.](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/#gce)
-> **Prerequisites:** The service account of `Identity and API` access on GCE needs the `Computer Admin` permission.
+> **Prerequisites:** The service account of `Identity and API` access on GCE needs the `Computer Admin` permission.
If you are using Calico,
@@ -20,7 +17,7 @@ If you are using Calico,
rancher_kubernetes_engine_config:
cloud_provider:
name: gce
- customCloudProvider: |-
+ customCloudProvider: |-
[Global]
project-id=
network-name=
@@ -28,7 +25,7 @@ If you are using Calico,
node-instance-prefix=
node-tags=
network:
- options:
+ options:
calico_cloud_provider: "gce"
plugin: "calico"
```
@@ -40,17 +37,17 @@ If you are using Canal or Flannel,
```yaml
rancher_kubernetes_engine_config:
- cloud_provider:
+ cloud_provider:
name: gce
- customCloudProvider: |-
+ customCloudProvider: |-
[Global]
project-id=
network-name=
subnetwork-name=
node-instance-prefix=
node-tags=
- services:
- kube_controller:
+ services:
+ kube_controller:
extra_args:
configure-cloud-routes: true # we need to allow the cloud provider configure the routes for the hosts
```
\ No newline at end of file
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md
index 82c6e99a251..a7cc8543092 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md
@@ -1,9 +1,5 @@
---
title: How to Configure In-tree vSphere Cloud Provider
-shortTitle: In-tree Cloud Provider
-weight: 10
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/cloud-providers/vsphere/in-tree/
---
To set up the in-tree vSphere cloud provider, follow these steps while creating the vSphere cluster in Rancher:
@@ -13,7 +9,7 @@ To set up the in-tree vSphere cloud provider, follow these steps while creating

1. Click on **Edit as YAML**
-1. Insert the following structure to the pre-populated cluster YAML. This structure must be placed under `rancher_kubernetes_engine_config`. Note that the `name` *must* be set to `vsphere`.
+1. Insert the following structure to the pre-populated cluster YAML. This structure must be placed under `rancher_kubernetes_engine_config`. Note that the `name` *must* be set to `vsphere`.
```yaml
rancher_kubernetes_engine_config:
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md
index e0ac8ffb569..98132c74cbd 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md
@@ -1,10 +1,7 @@
---
title: How to Configure Out-of-tree vSphere Cloud Provider
-shortTitle: Out-of-tree Cloud Provider
-weight: 10
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/cloud-providers/vsphere/out-of-tree/
---
+
_Available as of v2.5+_
Kubernetes is moving away from maintaining cloud providers in-tree. vSphere has an out-of-tree cloud provider that can be used by installing the vSphere cloud provider and cloud storage plugins.
@@ -16,7 +13,7 @@ This page covers how to install the Cloud Provider Interface (CPI) and Cloud Sto
The vSphere versions supported:
* 6.7u3
-* 7.0u1 or higher.
+* 7.0u1 or higher.
The Kubernetes version must be 1.19 or higher.
@@ -33,7 +30,7 @@ The Cloud Provider Interface (CPI) should be installed first before installing t
1. Finish creating your cluster.
### 2. Install the CPI plugin
-
+
1. From the **Cluster Explorer** view, go to the top left dropdown menu and click **Apps & Marketplace.**
1. Select the **vSphere CPI** chart. Fill out the required vCenter details.
1. vSphere CPI initializes all nodes with ProviderID which is needed by the vSphere CSI driver. Check if all nodes are initialized with the ProviderID before installing CSI driver with the following command:
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md
index be2920a6328..c2f5c692fd7 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md
@@ -1,9 +1,7 @@
---
title: Migrating vSphere In-tree Volumes to CSI
-weight: 5
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/cloud-providers/vsphere/out-of-tree/vsphere-volume-migration/
---
+
_Available as of v2.5+_
Kubernetes is moving away from maintaining cloud providers in-tree. vSphere has an out-of-tree cloud provider that can be used by installing the vSphere cloud provider and cloud storage plugins.
@@ -48,7 +46,7 @@ Before installing CPI, we need to taint all nodes with `node.cloudprovider.kuber
This can be done by running the following commands:
```
-curl -O https://raw.githubusercontent.com/rancher/helm3-charts/56b622f519728378abeddfe95074f1b87ab73b1e/charts/vsphere-cpi/taints.sh
+curl -O https://raw.githubusercontent.com/rancher/helm3-charts/56b622f519728378abeddfe95074f1b87ab73b1e/charts/vsphere-cpi/taints.sh
```
Or:
@@ -56,10 +54,10 @@ Or:
```
wget https://raw.githubusercontent.com/rancher/helm3-charts/56b622f519728378abeddfe95074f1b87ab73b1e/charts/vsphere-cpi/taints.sh
chmod +x taints.sh
-./taints.sh
+./taints.sh
```
-Once all nodes are tainted by the running the script, launch the Helm vSphere CPI chart.
+Once all nodes are tainted by the running the script, launch the Helm vSphere CPI chart.
1. From the **Cluster Explorer** view, go to the top left dropdown menu and click **Apps & Marketplace.**
2. Select the **vSphere CPI** chart.
@@ -76,7 +74,7 @@ kubectl describe nodes | grep "ProviderID"
### 2. Install the CSI driver
1. From the **Cluster Explorer** view, go to the top left dropdown menu and click **Apps & Marketplace.**
-1. Select the **vSphere CSI** chart.
+1. Select the **vSphere CSI** chart.
1. Fill out the required vCenter details and click **Launch**.
1. Set **Enable CSI Migration** to **true**.
1. This chart creates a StorageClass with the `csi.vsphere.vmware.com` as the provisioner. You can provide the URL of the datastore to be used for CSI volume provisioning while creating this StorageClass. The datastore URL can be found in the vSphere client by selecting the datastore and going to the Summary tab. Fill out the details for the StorageClass and click **Launch**.
@@ -88,15 +86,15 @@ kubectl describe nodes | grep "ProviderID"
```yaml
extra_args:
- feature-gates: "CSIMigration=true,CSIMigrationvSphere=true"
+ feature-gates: "CSIMigration=true,CSIMigrationvSphere=true"
```
### 4. Drain worker nodes
-Worker nodes must be drained during the upgrade before changing the kubelet and kube-controller-manager args.
+Worker nodes must be drained during the upgrade before changing the kubelet and kube-controller-manager args.
1. Click **Edit as Form** and then click on "Advanced Options."
1. Set the field **Maximum Worker Nodes Unavailable** to count of 1.
-1. To drain the nodes during upgrade, select **Drain Nodes > Yes**.
+1. To drain the nodes during upgrade, select **Drain Nodes > Yes**.
1. Set **Force** and **Delete Local Data** to **true**.
1. Click **Save** to upgrade the cluster.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
index 7bfe48abc99..c661530ab04 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
@@ -1,11 +1,7 @@
---
title: Creating a DigitalOcean Cluster
-shortTitle: DigitalOcean
-weight: 2215
-aliases:
- - /rancher/v2.5/en/tasks/clusters/creating-a-cluster/create-cluster-digital-ocean/
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/digital-ocean/
---
+
In this section, you'll learn how to use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in DigitalOcean.
First, you will set up your DigitalOcean cloud credentials in Rancher. Then you will use your cloud credentials to create a node template, which Rancher will use to provision new nodes in DigitalOcean.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
index ce26bee5c7b..6c3519baccf 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
@@ -1,11 +1,8 @@
---
title: Creating an Amazon EC2 Cluster
-shortTitle: Amazon EC2
description: Learn the prerequisites and steps required in order for you to create an Amazon EC2 cluster using Rancher
-weight: 2210
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/ec2/
---
+
In this section, you'll learn how to use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in Amazon EC2.
First, you will set up your EC2 cloud credentials in Rancher. Then you will use your cloud credentials to create a node template, which Rancher will use to provision new nodes in EC2.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
index 1de381dd961..d9bb1804874 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
@@ -1,10 +1,5 @@
---
title: Creating an Azure Cluster
-shortTitle: Azure
-weight: 2220
-aliases:
- - /rancher/v2.5/en/tasks/clusters/creating-a-cluster/create-cluster-azure/
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/azure/
---
In this section, you'll learn how to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in Azure through Rancher.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
index 6cace56955b..9bf57f794cd 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
@@ -1,9 +1,5 @@
---
title: Creating Credentials in the vSphere Console
-weight: 3
-aliases:
- - /rancher/v2.5/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/creating-credentials
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/creating-credentials/
---
This section describes how to create a vSphere username and password. You will need to provide these vSphere credentials to Rancher, which allows Rancher to provision resources in vSphere.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
index 8da3db7ae96..76c18b86a26 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
@@ -1,8 +1,5 @@
---
title: Provisioning Kubernetes Clusters in vSphere
-weight: 1
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/provisioning-vsphere-clusters/
---
In this section, you'll learn how to use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in vSphere.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
index 81baadf879f..63342ebabcf 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
@@ -1,8 +1,5 @@
---
title: Configuration for Storage Classes in Azure
-weight: 3
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/windows-clusters/azure-storageclass/
---
If you are using Azure VMs for your nodes, you can use [Azure files](https://docs.microsoft.com/en-us/azure/aks/azure-files-dynamic-pv) as a StorageClass for the cluster.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
index 3be832aaeae..7a430ad34cf 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
@@ -1,8 +1,5 @@
---
title: Networking Requirements for Host Gateway (L2bridge)
-weight: 1000
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/windows-clusters/host-gateway-requirements/
---
This section describes how to configure custom Windows clusters that are using *Host Gateway (L2bridge)* mode.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md
index ce7d7b67ae2..ec63830e990 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md
@@ -1,6 +1,5 @@
---
title: Windows and Linux Cluster Feature Parity
-weight: 3
---
Windows clusters do not share the same feature support as Linux clusters.
@@ -9,14 +8,14 @@ The following chart describes the feature parity between Windows and Linux on Ra
**Component** | **Linux** | **Windows**
--- | --- | ---
-**Distributions** | |
+**Distributions** | |
RKE | Supported | Supported
RKE2 | Supported | Tenatively Planned For 2.6.x
K3S | Supported | Not Supported
EKS | Supported | Not Supported
GKE | Supported | Not Supported
AKS | Supported | Not Supported
-**Rancher Components** | |
+**Rancher Components** | |
Server | Supported | Not Supported
Agent | Supported | Supported
Fleet | Supported | Supported
@@ -35,7 +34,7 @@ OPA | Supported | Not Supported
Longhorn | Supported | Not Supported
CIS Scans | Supported | Not Supported
Backup/Restore Operator | Supported | Not Supported
-**CNI / Add-ons** | |
+**CNI / Add-ons** | |
Flannel | Supported | Supported
Canal | Supported | Not Supported
Calico | Supported | Tentatively Planned for 2.6.x
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
index d53b4330118..93d3e62bdb7 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
@@ -1,8 +1,5 @@
---
title: Node Requirements for Rancher Managed Clusters
-weight: 1
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/node-requirements/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
index a4e00b17b67..f81ce184d0f 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
@@ -1,10 +1,5 @@
---
title: Registering Existing Clusters
-weight: 6
-aliases:
- - /rancher/v2.5/en/cluster-provisioning/imported-clusters
- - /rancher/v2.x/en/cluster-provisioning/imported-clusters/
- - /rancher/v2.x/en/cluster-provisioning/registered-clusters/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md
index 0d6e00a4d11..4af579ce05b 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks.md
@@ -1,10 +1,5 @@
---
title: Creating an AKS Cluster
-shortTitle: Azure Kubernetes Service
-weight: 2115
-aliases:
- - /rancher/v2.5/en/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service/
- - /rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/aks/
---
You can use Rancher to create a cluster hosted in Microsoft Azure Kubernetes Service (AKS).
@@ -82,7 +77,7 @@ You can also follow these instructions to set up a service principal and give it
1. Click **Register.**
-1. You should now see the name of your service principal under **Azure Active Directory > App registrations.**
+1. You should now see the name of your service principal under **Azure Active Directory > App registrations.**
1. Click the name of your service principal. Take note of the tenant ID and application ID (also called app ID or client ID) so that you can use it when provisioning your AKS cluster. Then click **Certificates & secrets.**
@@ -90,7 +85,7 @@ You can also follow these instructions to set up a service principal and give it
1. Enter a short description, pick an expiration time, and click **Add.** Take note of the client secret so that you can use it when provisioning the AKS cluster.
-**Result:** You have created a service principal and you should be able to see it listed in the **Azure Active Directory** section under **App registrations.** You still need to give the service principal access to AKS.
+**Result:** You have created a service principal and you should be able to see it listed in the **Azure Active Directory** section under **App registrations.** You still need to give the service principal access to AKS.
To give role-based access to your service principal,
@@ -126,7 +121,7 @@ Use Rancher to set up and configure your Kubernetes cluster.
1. Use your subscription ID, tenant ID, client ID, and client secret to give your cluster access to AKS. If you don't have all of that information, you can retrieve it using these instructions:
- **Tenant ID:** To get the Tenant ID, you can go to the Azure Portal, then click **Azure Active Directory**, then click **Properties** and find the **Tenant ID** field.
- **Client ID:** To get the Client ID, you can go to the Azure Portal, then click **Azure Active Directory**, then click **Enterprise applications.** Click **All applications.** Select your application, click **Properties,** and copy the application ID.
- - **Client secret:** If you didn't copy the client secret when creating the service principal, you can get a new one if you go to the app registration detail page, then click **Certificates & secrets**, then click **New client secret.**
+ - **Client secret:** If you didn't copy the client secret when creating the service principal, you can get a new one if you go to the app registration detail page, then click **Certificates & secrets**, then click **New client secret.**
- **Subscription ID:** You can get the subscription ID is available in the portal from **All services > Subscriptions.**
1. Use **Cluster Options** to choose the version of Kubernetes, what network provider will be used and if you want to enable project network isolation. To see more cluster options, click on **Show advanced options.**
@@ -141,13 +136,13 @@ Use Rancher to set up and configure your Kubernetes cluster.
1. Review your options to confirm they're correct. Then click **Create**.
-**Result:**
+**Result:**
Your cluster is created and assigned a state of **Provisioning.** Rancher is standing up your cluster.
You can access your cluster after its state is updated to **Active.**
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
index bd580555868..632f9823677 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
@@ -1,9 +1,5 @@
---
title: Creating an Aliyun ACK Cluster
-shortTitle: Alibaba Cloud Container Service for Kubernetes
-weight: 2120
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/ack/
---
You can use Rancher to create a cluster hosted in Alibaba Cloud Kubernetes (ACK). Rancher has already implemented and packaged the [cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md) for ACK, but by default, this cluster driver is `inactive`. In order to launch ACK clusters, you will need to [enable the ACK cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#activating-deactivating-cluster-drivers). After enabling the cluster driver, you can start provisioning ACK clusters.
@@ -45,13 +41,13 @@ You can use Rancher to create a cluster hosted in Alibaba Cloud Kubernetes (ACK)
1. Review your options to confirm they're correct. Then click **Create**.
-**Result:**
+**Result:**
Your cluster is created and assigned a state of **Provisioning.** Rancher is standing up your cluster.
You can access your cluster after its state is updated to **Active.**
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md
index abd9fbea8a8..7bad3b46b9c 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke.md
@@ -1,11 +1,5 @@
---
title: Managing GKE Clusters
-shortTitle: Google Kubernetes Engine
-weight: 2105
-aliases:
- - /rancher/v2.5/en/tasks/clusters/creating-a-cluster/create-cluster-gke/
- - /rancher/v2.5/en/cluster-provisioning/hosted-kubernetes-clusters/gke
- - /rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/gke/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
index 59318535175..c1933daf210 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
@@ -1,9 +1,5 @@
---
title: Creating a Huawei CCE Cluster
-shortTitle: Huawei Cloud Kubernetes Service
-weight: 2130
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/cce/
---
You can use Rancher to create a cluster hosted in Huawei Cloud Container Engine (CCE). Rancher has already implemented and packaged the [cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md) for CCE, but by default, this cluster driver is `inactive`. In order to launch CCE clusters, you will need to [enable the CCE cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#activating-deactivating-cluster-drivers). After enabling the cluster driver, you can start provisioning CCE clusters.
@@ -31,13 +27,13 @@ Huawei CCE service doesn't support the ability to create clusters with public ac
1. Fill the following node configuration of the cluster. For help filling out the form, refer to [Node Configuration.](#node-configuration)
1. Click **Create** to create the CCE cluster.
-**Result:**
+**Result:**
Your cluster is created and assigned a state of **Provisioning.** Rancher is standing up your cluster.
You can access your cluster after its state is updated to **Active.**
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
index 60e17222616..3065569de89 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
@@ -1,9 +1,5 @@
---
title: Creating a Tencent TKE Cluster
-shortTitle: Tencent Kubernetes Engine
-weight: 2125
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/tke/
---
You can use Rancher to create a cluster hosted in Tencent Kubernetes Engine (TKE). Rancher has already implemented and packaged the [cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md) for TKE, but by default, this cluster driver is `inactive`. In order to launch TKE clusters, you will need to [enable the TKE cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#activating-deactivating-cluster-drivers). After enabling the cluster driver, you can start provisioning TKE clusters.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md
index a8e1e3ba0d9..b20161c7323 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps.md
@@ -1,10 +1,5 @@
---
title: ConfigMaps
-weight: 3061
-aliases:
- - /rancher/v2.5/en/tasks/projects/add-configmaps
- - /rancher/v2.5/en/k8s-in-rancher/configmaps
- - /rancher/v2.x/en/k8s-in-rancher/configmaps/
---
While most types of Kubernetes secrets store sensitive information, [ConfigMaps](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap/) store general configuration information, such as a group of config files. Because ConfigMaps don't store sensitive information, they can be updated automatically, and therefore don't require their containers to be restarted following update (unlike most secret types, which require manual updates and a container restart to take effect).
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md
index f6f6204af0e..1c2b4089566 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/create-services.md
@@ -1,10 +1,5 @@
---
title: Service Discovery
-weight: 3045
-aliases:
- - /rancher/v2.5/en/tasks/workloads/add-a-dns-record/
- - /rancher/v2.5/en/k8s-in-rancher/service-discovery
- - /rancher/v2.x/en/k8s-in-rancher/service-discovery/
---
For every workload created, a complementing Service Discovery entry is created. This Service Discovery entry enables DNS resolution for the workload's pods using the following naming convention:
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md
index 72a8bf6f7db..06a75004f9b 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md
@@ -1,11 +1,6 @@
---
title: Encrypting HTTP Communication
description: Learn how to add an SSL (Secure Sockets Layer) certificate or TLS (Transport Layer Security) certificate to either a project, a namespace, or both, so that you can add it to deployments
-weight: 3060
-aliases:
- - /rancher/v2.5/en/tasks/projects/add-ssl-certificates/
- - /rancher/v2.5/en/k8s-in-rancher/certificates
- - /rancher/v2.x/en/k8s-in-rancher/certificates/
---
When you create an ingress within Rancher/Kubernetes, you must provide it with a secret that includes a TLS private key and certificate, which are used to encrypt and decrypt communications that come through the ingress. You can make certificates available for ingress use by navigating to its project or namespace, and then uploading the certificate. You can then add the certificate to the ingress deployment.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md
index 1a2c9bc858c..689581f99d8 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas.md
@@ -1,9 +1,5 @@
---
title: Background Information on HPAs
-weight: 3027
-aliases:
- - /rancher/v2.5/en/k8s-in-rancher/horizontal-pod-autoscaler/hpa-background
- - /rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/hpa-background/
---
The [Horizontal Pod Autoscaler](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) (HPA) is a Kubernetes feature that allows you to configure your cluster to automatically scale the services it's running up or down. This section provides explanation on how HPA works with Kubernetes.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md
index 95f6fc6b7af..a79f4ca2dc4 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl.md
@@ -1,9 +1,5 @@
---
title: Managing HPAs with kubectl
-weight: 3029
-aliases:
- - /rancher/v2.5/en/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl
- - /rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/manage-hpa-with-kubectl/
---
This section describes HPA management with `kubectl`. This document has instructions for how to:
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md
index 140d748429f..98df28cdfed 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui.md
@@ -1,9 +1,5 @@
---
title: Managing HPAs with the Rancher UI
-weight: 3028
-aliases:
- - /rancher/v2.5/en/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-rancher-ui
- - /rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/manage-hpa-with-rancher-ui/
---
The Rancher UI supports creating, managing, and deleting HPAs. You can configure CPU or memory usage as the metric that the HPA uses to scale.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
index 3188cf97d66..1c753de2cf2 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
@@ -1,9 +1,5 @@
---
title: Testing HPAs with kubectl
-weight: 3031
-aliases:
- - /rancher/v2.5/en/k8s-in-rancher/horizontal-pod-autoscaler/testing-hpa
- - /rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/testing-hpa/
---
This document describes how to check the status of your HPAs after scaling them up or down with your load testing tool. For information on how to check the status from the Rancher UI (at least version 2.3.x), refer to [Managing HPAs with the Rancher UI](manage-hpas-with-kubectl.md).
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md
index a32242944c0..f3e97c2abd2 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md
@@ -1,14 +1,9 @@
---
title: Kubernetes Registry and Docker Registry
description: Learn about the Docker registry and Kubernetes registry, their use cases and how to use a private registry with the Rancher UI
-weight: 3063
-aliases:
- - /rancher/v2.5/en/tasks/projects/add-registries/
- - /rancher/v2.5/en/k8s-in-rancher/registries
- - /rancher/v2.5/en/k8s-resources/k8s-in-rancher/registries
- - /rancher/v2.x/en/k8s-in-rancher/registries/
---
-Registries are Kubernetes secrets containing credentials used to authenticate with [private Docker registries](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/).
+
+Registries are Kubernetes secrets containing credentials used to authenticate with [private Docker registries](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/).
The word "registry" can mean two things, depending on whether it is used to refer to a Docker or Kubernetes registry:
@@ -25,7 +20,7 @@ Currently, deployments pull the private registry credentials automatically only
1. From the **Global** view, select the project containing the namespace(s) where you want to add a registry.
-1. From the main menu, click **Resources > Secrets > Registry Credentials.**
+1. From the main menu, click **Resources > Secrets > Registry Credentials.**
1. Click **Add Registry.**
@@ -39,7 +34,7 @@ Currently, deployments pull the private registry credentials automatically only
1. Click **Save**.
-**Result:**
+**Result:**
- Your secret is added to the project or namespace, depending on the scope you chose.
- You can view the secret in the Rancher UI from the **Resources > Registries** view.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md
index 3d830e855ab..d08828a46a1 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses.md
@@ -1,11 +1,6 @@
---
title: Adding Ingresses to Your Project
description: Ingresses can be added for workloads to provide load balancing, SSL termination and host/path-based routing. Learn how to add Rancher ingress to your project
-weight: 3042
-aliases:
- - /rancher/v2.5/en/tasks/workloads/add-ingress/
- - /rancher/v2.5/en/k8s-in-rancher/load-balancers-and-ingress/ingress
- - /rancher/v2.x/en/k8s-in-rancher/load-balancers-and-ingress/ingress/
---
Ingress can be added for workloads to provide load balancing, SSL termination and host/path based routing. When using ingresses in a project, you can program the ingress hostname to an external DNS by setting up a Global DNS entry.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md
index 8da2331f9ed..fa522b38d52 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing.md
@@ -1,12 +1,8 @@
---
title: "Layer 4 and Layer 7 Load Balancing"
description: "Kubernetes supports load balancing in two ways: Layer-4 Load Balancing and Layer-7 Load Balancing. Learn about the support for each way in different deployments"
-weight: 3041
-aliases:
- - /rancher/v2.5/en/concepts/load-balancing/
- - /rancher/v2.5/en/k8s-in-rancher/load-balancers-and-ingress/load-balancers
- - /rancher/v2.x/en/k8s-in-rancher/load-balancers-and-ingress/load-balancers/
---
+
Kubernetes supports load balancing in two ways: Layer-4 Load Balancing and Layer-7 Load Balancing.
## Layer-4 Load Balancer
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md
index 0a0688dd48a..d5a4b0eca03 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md
@@ -1,10 +1,5 @@
---
title: Secrets
-weight: 3062
-aliases:
- - /rancher/v2.5/en/tasks/projects/add-a-secret
- - /rancher/v2.5/en/k8s-in-rancher/secrets
- - /rancher/v2.x/en/k8s-in-rancher/secrets/
---
[Secrets](https://kubernetes.io/docs/concepts/configuration/secret/#overview-of-secrets) store sensitive data like passwords, tokens, or keys. They may contain one or more key value pairs.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
index ed9ce17e6de..ab619e26720 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
@@ -1,11 +1,7 @@
---
title: Adding a Sidecar
-weight: 3029
-aliases:
- - /rancher/v2.5/en/tasks/workloads/add-a-sidecar/
- - /rancher/v2.5/en/k8s-in-rancher/workloads/add-a-sidecar
- - /rancher/v2.x/en/k8s-in-rancher/workloads/add-a-sidecar/
---
+
A _sidecar_ is a container that extends or enhances the main container in a pod. The main container and the sidecar share a pod, and therefore share the same network space and storage. You can add sidecars to existing workloads by using the **Add a Sidecar** option.
1. From the **Global** view, open the project running the workload you want to add a sidecar to.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
index 709e686d596..0a22632fde5 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
@@ -1,11 +1,6 @@
---
title: Deploying Workloads
description: Read this step by step guide for deploying workloads. Deploy a workload to run an application in one or more containers.
-weight: 3026
-aliases:
- - /rancher/v2.5/en/tasks/workloads/deploy-workloads/
- - /rancher/v2.5/en/k8s-in-rancher/workloads/deploy-workloads
- - /rancher/v2.x/en/k8s-in-rancher/workloads/deploy-workloads/
---
Deploy a workload to run an application in one or more containers.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md
index 794b9969f24..fee48c4ff61 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads.md
@@ -1,10 +1,5 @@
---
title: Rolling Back Workloads
-weight: 3027
-aliases:
- - /rancher/v2.5/en/tasks/workloads/rollback-workloads/
- - /rancher/v2.5/en/k8s-in-rancher/workloads/rollback-workloads
- - /rancher/v2.x/en/k8s-in-rancher/workloads/rollback-workloads/
---
Sometimes there is a need to rollback to the previous version of the application, either for debugging purposes or because an upgrade did not go as planned.
diff --git a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
index 5ebbe02d5ae..e393457d83d 100644
--- a/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
+++ b/versioned_docs/version-2.5/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
@@ -1,11 +1,7 @@
---
title: Upgrading Workloads
-weight: 3028
-aliases:
- - /rancher/v2.5/en/tasks/workloads/upgrade-workloads/
- - /rancher/v2.5/en/k8s-in-rancher/workloads/upgrade-workloads
- - /rancher/v2.x/en/k8s-in-rancher/workloads/upgrade-workloads/
---
+
When a new version of an application image is released on Docker Hub, you can upgrade any workloads running a previous version of the application to the new one.
1. From the **Global** view, open the project running the workload you want to upgrade.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/about-authentication.md b/versioned_docs/version-2.5/pages-for-subheaders/about-authentication.md
index bedbe9b6fa3..ee3872561f2 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/about-authentication.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/about-authentication.md
@@ -1,10 +1,5 @@
---
title: Authentication
-weight: 1115
-aliases:
- - /rancher/v2.5/en/concepts/global-configuration/authentication/
- - /rancher/v2.5/en/tasks/global-configuration/authentication/
- - /rancher/v2.x/en/admin-settings/authentication/
---
One of the key features that Rancher adds to Kubernetes is centralized user authentication. This feature allows your users to use one set of credentials to authenticate with any of your Kubernetes clusters.
@@ -25,8 +20,8 @@ The Rancher authentication proxy integrates with the following external authenti
| [Microsoft AD FS](configure-microsoft-ad-federation-service-saml.md) |
| [PingIdentity](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md) |
| [Keycloak](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak.md) |
-| [Okta](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md) |
-| [Google OAuth](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md) |
+| [Okta](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md) |
+| [Google OAuth](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md) |
| [Shibboleth](configure-shibboleth-saml.md) |
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/about-provisioning-drivers.md b/versioned_docs/version-2.5/pages-for-subheaders/about-provisioning-drivers.md
index dec80b0f83a..bbea00badab 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/about-provisioning-drivers.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/about-provisioning-drivers.md
@@ -1,8 +1,5 @@
---
title: Provisioning Drivers
-weight: 1140
-aliases:
- - /rancher/v2.x/en/admin-settings/drivers/
---
Drivers in Rancher allow you to manage which providers can be used to deploy [hosted Kubernetes clusters](set-up-clusters-from-hosted-kubernetes-providers.md) or [nodes in an infrastructure provider](use-new-nodes-in-an-infra-provider.md) to allow Rancher to deploy and manage Kubernetes.
@@ -16,7 +13,7 @@ There are two types of drivers within Rancher:
* [Cluster Drivers](#cluster-drivers)
* [Node Drivers](#node-drivers)
-### Cluster Drivers
+### Cluster Drivers
Cluster drivers are used to provision [hosted Kubernetes clusters](set-up-clusters-from-hosted-kubernetes-providers.md), such as GKE, EKS, AKS, etc.. The availability of which cluster driver to display when creating a cluster is defined based on the cluster driver's status. Only `active` cluster drivers will be displayed as an option for creating clusters for hosted Kubernetes clusters. By default, Rancher is packaged with several existing cluster drivers, but you can also create custom cluster drivers to add to Rancher.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/about-rke1-templates.md b/versioned_docs/version-2.5/pages-for-subheaders/about-rke1-templates.md
index 48bbd44721b..d4f4c7ab33a 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/about-rke1-templates.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/about-rke1-templates.md
@@ -1,8 +1,5 @@
---
title: RKE Templates
-weight: 7010
-aliases:
- - /rancher/v2.x/en/admin-settings/rke-templates/
---
RKE templates are designed to allow DevOps and security teams to standardize and simplify the creation of Kubernetes clusters.
@@ -83,7 +80,7 @@ The documents in this section explain the details of RKE template management:
- [Getting permission to create templates](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md)
- [Creating and revising templates](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md)
-- [Enforcing template settings](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md#requiring-new-clusters-to-use-an-rke-template)
+- [Enforcing template settings](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md#requiring-new-clusters-to-use-an-rke-template)
- [Overriding template settings](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md)
- [Sharing templates with cluster creators](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#sharing-templates-with-specific-users-or-groups)
- [Sharing ownership of a template](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#sharing-ownership-of-templates)
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/about-the-api.md b/versioned_docs/version-2.5/pages-for-subheaders/about-the-api.md
index 65a0b42a064..27570e73a41 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/about-the-api.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/about-the-api.md
@@ -1,8 +1,5 @@
---
title: API
-weight: 24
-aliases:
- - /rancher/v2.x/en/api/
---
## How to use the API
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/access-clusters.md b/versioned_docs/version-2.5/pages-for-subheaders/access-clusters.md
index defcce8474e..2eba1efac1c 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/access-clusters.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/access-clusters.md
@@ -1,8 +1,5 @@
---
title: Cluster Access
-weight: 1
-aliases:
- - /rancher/v2.x/en/cluster-admin/cluster-access/
---
This section is about what tools can be used to access clusters managed by Rancher.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/advanced-configuration.md b/versioned_docs/version-2.5/pages-for-subheaders/advanced-configuration.md
index e2386f978a4..208abcf1ea8 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/advanced-configuration.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/advanced-configuration.md
@@ -1,6 +1,5 @@
---
title: Advanced Configuration
-weight: 500
---
### Alertmanager
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/advanced-options.md b/versioned_docs/version-2.5/pages-for-subheaders/advanced-options.md
index 76c2993f40d..4e9027dee15 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/advanced-options.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/advanced-options.md
@@ -1,8 +1,5 @@
---
title: Advanced
-weight: 1000
-aliases:
- - /rancher/v2.x/en/installation/resources/advanced/
---
The documents in this section contain resources for less common use cases.
\ No newline at end of file
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/air-gapped-helm-cli-install.md b/versioned_docs/version-2.5/pages-for-subheaders/air-gapped-helm-cli-install.md
index 5657bf90339..24e89c137c5 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/air-gapped-helm-cli-install.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/air-gapped-helm-cli-install.md
@@ -1,11 +1,5 @@
---
title: Air Gapped Helm CLI Install
-weight: 1
-aliases:
- - /rancher/v2.5/en/installation/air-gap-installation/
- - /rancher/v2.5/en/installation/air-gap-high-availability/
- - /rancher/v2.5/en/installation/air-gap-single-node/
- - /rancher/v2.x/en/installation/other-installation-methods/air-gap/
---
This section is about using the Helm CLI to install the Rancher server in an air gapped environment. An air gapped environment could be where Rancher server will be installed offline, behind a firewall, or behind a proxy.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/amazon-eks-permissions.md b/versioned_docs/version-2.5/pages-for-subheaders/amazon-eks-permissions.md
index 9d010cd2dc5..c113d497ba4 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/amazon-eks-permissions.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/amazon-eks-permissions.md
@@ -1,11 +1,7 @@
---
title: Creating an EKS Cluster
-shortTitle: Amazon EKS
-weight: 2110
-aliases:
- - /rancher/v2.5/en/tasks/clusters/creating-a-cluster/create-cluster-eks/
- - /rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/eks/
---
+
Amazon EKS provides a managed control plane for your Kubernetes cluster. Amazon EKS runs the Kubernetes control plane instances across multiple Availability Zones to ensure high availability. Rancher provides an intuitive user interface for managing and deploying the Kubernetes clusters you run in Amazon EKS. With this guide, you will use Rancher to quickly and easily launch an Amazon EKS Kubernetes cluster in your AWS account. For more information on Amazon EKS, see this [documentation](https://docs.aws.amazon.com/eks/latest/userguide/what-is-eks.html).
@@ -47,17 +43,17 @@ Use Rancher to set up and configure your Kubernetes cluster.
1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
-1. Fill out the rest of the form. For help, refer to the [configuration reference.](#eks-cluster-configuration-reference)
+1. Fill out the rest of the form. For help, refer to the [configuration reference.](#eks-cluster-configuration-reference)
1. Click **Create**.
-**Result:**
+**Result:**
Your cluster is created and assigned a state of **Provisioning.** Rancher is standing up your cluster.
You can access your cluster after its state is updated to **Active.**
-**Active** clusters are assigned two Projects:
+**Active** clusters are assigned two Projects:
- `Default`, containing the `default` namespace
- `System`, containing the `cattle-system`, `ingress-nginx`, `kube-public`, and `kube-system` namespaces
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/authentication-permissions-and-global-configuration.md b/versioned_docs/version-2.5/pages-for-subheaders/authentication-permissions-and-global-configuration.md
index 52a91d138a6..f893100e77c 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/authentication-permissions-and-global-configuration.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/authentication-permissions-and-global-configuration.md
@@ -1,13 +1,5 @@
---
title: Authentication, Permissions and Global Configuration
-weight: 6
-aliases:
- - /rancher/v2.5/en/concepts/global-configuration/
- - /rancher/v2.5/en/tasks/global-configuration/
- - /rancher/v2.5/en/concepts/global-configuration/server-url/
- - /rancher/v2.5/en/tasks/global-configuration/server-url/
- - /rancher/v2.5/en/admin-settings/log-in/
- - /rancher/v2.x/en/admin-settings/
---
After installation, the [system administrator](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md) should configure Rancher to configure authentication, authorization, security, default settings, security policies, drivers and global DNS entries.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/backup-restore-and-disaster-recovery.md b/versioned_docs/version-2.5/pages-for-subheaders/backup-restore-and-disaster-recovery.md
index c234903f94d..ec83bed609a 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/backup-restore-and-disaster-recovery.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/backup-restore-and-disaster-recovery.md
@@ -1,9 +1,5 @@
---
title: Backups and Disaster Recovery
-weight: 5
-aliases:
- - /rancher/v2.5/en/backups/v2.5
- - /rancher/v2.x/en/backups/v2.5/
---
In this section, you'll learn how to create backups of Rancher, how to restore Rancher from backup, and how to migrate Rancher to a new Kubernetes cluster.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/backup-restore-configuration.md b/versioned_docs/version-2.5/pages-for-subheaders/backup-restore-configuration.md
index a75e1288ff3..c6574b93600 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/backup-restore-configuration.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/backup-restore-configuration.md
@@ -1,10 +1,5 @@
---
title: Rancher Backup Configuration Reference
-shortTitle: Configuration
-weight: 4
-aliases:
- - /rancher/v2.5/en/backups/v2.5/configuration
- - /rancher/v2.x/en/backups/v2.5/configuration/
---
- [Backup configuration](../reference-guides/backup-restore-configuration/backup-configuration.md)
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/best-practices.md b/versioned_docs/version-2.5/pages-for-subheaders/best-practices.md
index 03b7c634f44..4a3fa51d285 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/best-practices.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/best-practices.md
@@ -1,10 +1,5 @@
---
title: Best Practices Guide
-weight: 4
-aliases:
- - /rancher/v2.5/en/best-practices/v2.5
- - /rancher/v2.x/en/best-practices/
- - /rancher/v2.x/en/best-practices/v2.5/
---
The purpose of this section is to consolidate best practices for Rancher implementations. This also includes recommendations for related technologies, such as Kubernetes, Docker, containers, and more. The objective is to improve the outcome of a Rancher implementation using the operational experience of Rancher and its customers.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/checklist-for-production-ready-clusters.md b/versioned_docs/version-2.5/pages-for-subheaders/checklist-for-production-ready-clusters.md
index cf5ca940d60..381e90cfe07 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/checklist-for-production-ready-clusters.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/checklist-for-production-ready-clusters.md
@@ -1,8 +1,5 @@
---
title: Checklist for Production-Ready Clusters
-weight: 2
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/production/
---
In this section, we recommend best practices for creating the production-ready Kubernetes clusters that will run your apps and services.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/cis-scans.md b/versioned_docs/version-2.5/pages-for-subheaders/cis-scans.md
index 4df6d184306..7e106a06518 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/cis-scans.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/cis-scans.md
@@ -1,10 +1,5 @@
---
title: CIS Scans
-weight: 17
-aliases:
- - /rancher/v2.5/en/cis-scans/v2.5
- - /rancher/v2.x/en/cis-scans/
- - /rancher/v2.x/en/cis-scans/v2.5/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/cluster-configuration.md b/versioned_docs/version-2.5/pages-for-subheaders/cluster-configuration.md
index 2172d5f6be7..8a65b275b36 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/cluster-configuration.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/cluster-configuration.md
@@ -1,9 +1,5 @@
---
title: Cluster Configuration
-weight: 2025
-aliases:
- - /rancher/v2.5/en/k8s-in-rancher/editing-clusters
- - /rancher/v2.x/en/cluster-admin/editing-clusters/
---
After you provision a Kubernetes cluster using Rancher, you can still edit options and settings for the cluster.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/configuration-options.md b/versioned_docs/version-2.5/pages-for-subheaders/configuration-options.md
index 9e26e643105..9e7ad6f0ccb 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/configuration-options.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/configuration-options.md
@@ -1,9 +1,5 @@
---
title: Configuration Options
-weight: 3
-aliases:
- - /rancher/v2.5/en/istio/v2.5/configuration-reference
- - /rancher/v2.x/en/istio/v2.5/configuration-reference/
---
### Egress Support
@@ -16,15 +12,15 @@ Automatic sidecar injection is disabled by default. To enable this, set the `sid
### Overlay File
-An Overlay File is designed to support extensive configuration of your Istio installation. It allows you to make changes to any values available in the [IstioOperator API](https://istio.io/latest/docs/reference/config/istio.operator.v1alpha1/). This will ensure you can customize the default installation to fit any scenario.
+An Overlay File is designed to support extensive configuration of your Istio installation. It allows you to make changes to any values available in the [IstioOperator API](https://istio.io/latest/docs/reference/config/istio.operator.v1alpha1/). This will ensure you can customize the default installation to fit any scenario.
-The Overlay File will add configuration on top of the default installation that is provided from the Istio chart installation. This means you do not need to redefine the components that already defined for installation.
+The Overlay File will add configuration on top of the default installation that is provided from the Istio chart installation. This means you do not need to redefine the components that already defined for installation.
For more information on Overlay Files, refer to the [Istio documentation.](https://istio.io/latest/docs/setup/install/istioctl/#configure-component-settings)
### Selectors and Scrape Configs
-The Monitoring app sets `prometheus.prometheusSpec.ignoreNamespaceSelectors=false` which enables monitoring across all namespaces by default. This ensures you can view traffic, metrics and graphs for resources deployed in a namespace with `istio-injection=enabled` label.
+The Monitoring app sets `prometheus.prometheusSpec.ignoreNamespaceSelectors=false` which enables monitoring across all namespaces by default. This ensures you can view traffic, metrics and graphs for resources deployed in a namespace with `istio-injection=enabled` label.
If you would like to limit Prometheus to specific namespaces, set `prometheus.prometheusSpec.ignoreNamespaceSelectors=true`. Once you do this, you will need to add additional configuration to continue to monitor your resources.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md b/versioned_docs/version-2.5/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
index d5585830f39..549f70444ef 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
@@ -1,8 +1,5 @@
---
title: Configuring Microsoft Active Directory Federation Service (SAML)
-weight: 1205
-aliases:
- - /rancher/v2.x/en/admin-settings/authentication/microsoft-adfs/
---
If your organization uses Microsoft Active Directory Federation Services (AD FS) for user authentication, you can configure Rancher to allow your users to log in using their AD FS credentials.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/configure-openldap.md b/versioned_docs/version-2.5/pages-for-subheaders/configure-openldap.md
index 8e64faf3b10..68210668ce9 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/configure-openldap.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/configure-openldap.md
@@ -1,12 +1,8 @@
---
title: Configuring OpenLDAP
-weight: 1113
-aliases:
- - /rancher/v2.5/en/tasks/global-configuration/authentication/openldap/
- - /rancher/v2.x/en/admin-settings/authentication/openldap/
---
-If your organization uses LDAP for user authentication, you can configure Rancher to communicate with an OpenLDAP server to authenticate users. This allows Rancher admins to control access to clusters and projects based on users and groups managed externally in the organisation's central user repository, while allowing end-users to authenticate with their LDAP credentials when logging in to the Rancher UI.
+If your organization uses LDAP for user authentication, you can configure Rancher to communicate with an OpenLDAP server to authenticate users. This allows Rancher admins to control access to clusters and projects based on users and groups managed externally in the organisation's central user repository, while allowing end-users to authenticate with their LDAP credentials when logging in to the Rancher UI.
## Prerequisites
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/configure-shibboleth-saml.md b/versioned_docs/version-2.5/pages-for-subheaders/configure-shibboleth-saml.md
index f7bdf272f9c..aac5cd72b94 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/configure-shibboleth-saml.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/configure-shibboleth-saml.md
@@ -1,8 +1,5 @@
---
title: Configuring Shibboleth (SAML)
-weight: 1210
-aliases:
- - /rancher/v2.x/en/admin-settings/authentication/shibboleth/
---
If your organization uses Shibboleth Identity Provider (IdP) for user authentication, you can configure Rancher to allow your users to log in to Rancher using their Shibboleth credentials.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/create-kubernetes-persistent-storage.md b/versioned_docs/version-2.5/pages-for-subheaders/create-kubernetes-persistent-storage.md
index eaea6f581ab..9313c92dc3e 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/create-kubernetes-persistent-storage.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/create-kubernetes-persistent-storage.md
@@ -1,12 +1,8 @@
---
title: "Kubernetes Persistent Storage: Volumes and Storage Classes"
description: "Learn about the two ways with which you can create persistent storage in Kubernetes: persistent volumes and storage classes"
-weight: 2031
-aliases:
- - /rancher/v2.5/en/tasks/clusters/adding-storage/
- - /rancher/v2.5/en/cluster-admin/volumes-and-storage/persistent-volume-claims/
- - /rancher/v2.x/en/cluster-admin/volumes-and-storage/
---
+
When deploying an application that needs to retain data, you'll need to create persistent storage. Persistent storage allows you to store application data external from the pod running your application. This storage practice allows you to maintain application data, even if the application's pod fails.
The documents in this section assume that you understand the Kubernetes concepts of persistent volumes, persistent volume claims, and storage classes. For more information, refer to the section on [how storage works.](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md)
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/custom-resource-configuration.md b/versioned_docs/version-2.5/pages-for-subheaders/custom-resource-configuration.md
index bb051c785d6..3358ebb8019 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/custom-resource-configuration.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/custom-resource-configuration.md
@@ -1,6 +1,5 @@
---
title: Custom Resource Configuration
-weight: 5
---
The following Custom Resource Definitions are used to configure logging:
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/deploy-apps-across-clusters.md b/versioned_docs/version-2.5/pages-for-subheaders/deploy-apps-across-clusters.md
index 0c02e3f03e8..c61725a774d 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/deploy-apps-across-clusters.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/deploy-apps-across-clusters.md
@@ -1,9 +1,7 @@
---
title: Deploying Applications across Clusters
-weight: 12
-aliases:
- - /rancher/v2.x/en/deploy-across-clusters/
---
+
### Fleet
Rancher v2.5 introduced Fleet, a new way to deploy applications across clusters.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/deploy-rancher-manager.md b/versioned_docs/version-2.5/pages-for-subheaders/deploy-rancher-manager.md
index 529762c62fc..051799f2b83 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/deploy-rancher-manager.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/deploy-rancher-manager.md
@@ -1,8 +1,5 @@
---
title: Deploying Rancher Server
-weight: 100
-aliases:
- - /rancher/v2.x/en/quick-start-guide/deployment/
---
Use one of the following guides to deploy and provision Rancher and a Kubernetes cluster in the provider of your choice.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/deploy-rancher-workloads.md b/versioned_docs/version-2.5/pages-for-subheaders/deploy-rancher-workloads.md
index e1b76ebb39b..3e86165a071 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/deploy-rancher-workloads.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/deploy-rancher-workloads.md
@@ -1,8 +1,5 @@
---
title: Deploying Workloads
-weight: 200
-aliases:
- - /rancher/v2.x/en/quick-start-guide/workload/
---
These guides walk you through the deployment of an application, including how to expose the application for use outside of the cluster.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/enable-experimental-features.md b/versioned_docs/version-2.5/pages-for-subheaders/enable-experimental-features.md
index 4e60d45ace4..0a46135b9b3 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/enable-experimental-features.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/enable-experimental-features.md
@@ -1,10 +1,5 @@
---
title: Enabling Experimental Features
-weight: 17
-aliases:
- - /rancher/v2.5/en/installation/options/feature-flags/
- - /rancher/v2.5/en/admin-settings/feature-flags/
- - /rancher/v2.x/en/installation/resources/feature-flags/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/gke-cluster-configuration.md b/versioned_docs/version-2.5/pages-for-subheaders/gke-cluster-configuration.md
index c876f9c2710..1b54868dbaa 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/gke-cluster-configuration.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/gke-cluster-configuration.md
@@ -1,7 +1,5 @@
---
title: GKE Cluster Configuration Reference
-shortTitle: GKE Cluster Configuration
-weight: 3
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/helm-charts-in-rancher.md b/versioned_docs/version-2.5/pages-for-subheaders/helm-charts-in-rancher.md
index 2ac2702e781..38fb4e8c619 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/helm-charts-in-rancher.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/helm-charts-in-rancher.md
@@ -1,23 +1,5 @@
---
title: Helm Charts in Rancher
-weight: 11
-aliases:
- - /rancher/v2.x/en/helm-charts/apps-marketplace
- - /rancher/v2.5/en/catalog/
- - /rancher/v2.5/en/catalog/apps
- - /rancher/v2.5/en/catalog/launching-apps
- - /rancher/v2.x/en/helm-charts/
- - /rancher/v2.x/en/helm-charts/legacy-catalogs/
- - /rancher/v2.x/en/helm-charts/legacy-catalogs/launching-apps/
- - /rancher/v2.x/en/helm-charts/legacy-catalogs/adding-catalogs/
- - /rancher/v2.x/en/helm-charts/legacy-catalogs/globaldns/
- - /rancher/v2.x/en/helm-charts/legacy-catalogs/built-in/
- - /rancher/v2.x/en/helm-charts/legacy-catalogs/creating-apps/
- - /rancher/v2.x/en/helm-charts/apps-marketplace/
- - /rancher/v2.x/en/helm-charts/legacy-catalogs/tutorial/
- - /rancher/v2.x/en/helm-charts/legacy-catalogs/managing-apps/
- - /rancher/v2.x/en/helm-charts/legacy-catalogs/catalog-config/
- - /rancher/v2.x/en/helm-charts/legacy-catalogs/multi-cluster-apps/
---
In this section, you'll learn how to manage Helm chart repositories and applications in Rancher.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/horizontal-pod-autoscaler.md b/versioned_docs/version-2.5/pages-for-subheaders/horizontal-pod-autoscaler.md
index 07c40f82119..5afecb6a3ae 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/horizontal-pod-autoscaler.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/horizontal-pod-autoscaler.md
@@ -1,15 +1,11 @@
---
title: The Horizontal Pod Autoscaler
description: Learn about the horizontal pod autoscaler (HPA). How to manage HPAs and how to test them with a service deployment
-weight: 3026
-aliases:
- - /rancher/v2.5/en/k8s-in-rancher/horizontal-pod-autoscaler
- - /rancher/v2.x/en/k8s-in-rancher/horitzontal-pod-autoscaler/
---
The [Horizontal Pod Autoscaler](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) (HPA) is a Kubernetes feature that allows you to configure your cluster to automatically scale the services it's running up or down.
-Rancher provides some additional features to help manage HPAs, depending on the version of Rancher.
+Rancher provides some additional features to help manage HPAs, depending on the version of Rancher.
You can create, manage, and delete HPAs using the Rancher UI. It only supports HPA in the `autoscaling/v2beta2` API.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/infrastructure-setup.md b/versioned_docs/version-2.5/pages-for-subheaders/infrastructure-setup.md
index f91750d70ea..f7b834992aa 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/infrastructure-setup.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/infrastructure-setup.md
@@ -1,9 +1,5 @@
---
title: Don't have infrastructure for your Kubernetes cluster? Try one of these tutorials.
-shortTitle: Infrastructure Tutorials
-weight: 5
-aliases:
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/infrastructure-tutorials/
---
To set up infrastructure for a high-availability K3s Kubernetes cluster with an external DB, refer to [this page.](../how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md)
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/install-cluster-autoscaler.md b/versioned_docs/version-2.5/pages-for-subheaders/install-cluster-autoscaler.md
index 5b7dd2a027e..0dcca143dd7 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/install-cluster-autoscaler.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/install-cluster-autoscaler.md
@@ -1,8 +1,5 @@
---
title: Cluster Autoscaler
-weight: 1
-aliases:
- - /rancher/v2.x/en/cluster-admin/cluster-autoscaler/
---
In this section, you'll learn how to install and use the [Kubernetes cluster-autoscaler](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/) on Rancher custom clusters using AWS EC2 Auto Scaling Groups.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/install-rancher-on-linux.md b/versioned_docs/version-2.5/pages-for-subheaders/install-rancher-on-linux.md
index 4e0e7f14712..69bef1d5a29 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/install-rancher-on-linux.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/install-rancher-on-linux.md
@@ -1,9 +1,5 @@
---
title: Install/Upgrade Rancher with RancherD
-weight: 3
-aliases:
- - /rancher/v2.5/en/installation/install-rancher-on-linux
- - /rancher/v2.x/en/installation/install-rancher-on-linux/
---
> **Note:** RancherD was an experimental feature available as part of Rancher v2.5.4 through v2.5.10 but is now deprecated and not available for recent releases.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md b/versioned_docs/version-2.5/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
index 4ba65074bd5..74e901527b1 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
@@ -1,14 +1,6 @@
---
title: Install/Upgrade Rancher on a Kubernetes Cluster
description: Learn how to install Rancher in development and production environments. Read about single node and high availability installation
-weight: 2
-aliases:
- - /rancher/v2.5/en/installation/k8s-install/
- - /rancher/v2.5/en/installation/k8s-install/helm-rancher
- - /rancher/v2.5/en/installation/k8s-install/kubernetes-rke
- - /rancher/v2.5/en/installation/ha-server-install
- - /rancher/v2.5/en/installation/install-rancher-on-k8s/install
- - /rancher/v2.x/en/installation/install-rancher-on-k8s/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/installation-and-upgrade.md b/versioned_docs/version-2.5/pages-for-subheaders/installation-and-upgrade.md
index 876d82ee439..ee43ee958e3 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/installation-and-upgrade.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/installation-and-upgrade.md
@@ -1,10 +1,6 @@
---
title: Installing/Upgrading Rancher
description: Learn how to install Rancher in development and production environments. Read about single node and high availability installation
-weight: 3
-aliases:
- - /rancher/v2.5/en/installation/how-ha-works/
- - /rancher/v2.x/en/installation/
---
This section provides an overview of the architecture options of installing Rancher, describing advantages of each option.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/installation-requirements.md b/versioned_docs/version-2.5/pages-for-subheaders/installation-requirements.md
index 3500dabfdc2..3225596b629 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/installation-requirements.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/installation-requirements.md
@@ -1,9 +1,6 @@
---
title: Installation Requirements
description: Learn the node requirements for each node running Rancher server when you’re configuring Rancher to run either in a Docker or Kubernetes setup
-weight: 1
-aliases:
- - /rancher/v2.x/en/installation/requirements/
---
This page describes the software, hardware, and networking requirements for the nodes where the Rancher server will be installed. The Rancher server can be installed on a single node or a high-availability Kubernetes cluster.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/istio-setup-guide.md b/versioned_docs/version-2.5/pages-for-subheaders/istio-setup-guide.md
index 8c8d4641d49..4b763ee612b 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/istio-setup-guide.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/istio-setup-guide.md
@@ -1,10 +1,5 @@
---
title: Setup Guide
-weight: 2
-aliases:
- - /rancher/v2.5/en/istio/setup
- - /rancher/v2.5/en/istio/v2.5/setup/
- - /rancher/v2.x/en/istio/v2.5/setup/
---
This section describes how to enable Istio and start using it in your projects.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/istio.md b/versioned_docs/version-2.5/pages-for-subheaders/istio.md
index 322f20063f1..7c359db2fb7 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/istio.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/istio.md
@@ -1,10 +1,5 @@
---
title: Istio
-weight: 14
-aliases:
- - /rancher/v2.5/en/dashboard/istio
- - /rancher/v2.x/en/istio/
- - /rancher/v2.x/en/istio/v2.5/
---
[Istio](https://istio.io/) is an open-source tool that makes it easier for DevOps teams to observe, secure, control, and troubleshoot the traffic within a complex network of microservices.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-cluster-setup.md b/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-cluster-setup.md
index d4d3765cb51..d4b5ef29e56 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-cluster-setup.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-cluster-setup.md
@@ -1,8 +1,5 @@
---
title: "Don't have a Kubernetes cluster? Try one of these tutorials."
-weight: 4
-aliases:
- - /rancher/v2.x/en/installation/resources/k8s-tutorials/
---
This section contains information on how to install a Kubernetes cluster that the Rancher server can be installed on.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md b/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
index 7a0776224b9..11f6f7f8848 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
@@ -1,12 +1,6 @@
---
title: Setting up Kubernetes Clusters in Rancher
description: Provisioning Kubernetes Clusters
-weight: 7
-aliases:
- - /rancher/v2.5/en/concepts/clusters/
- - /rancher/v2.5/en/concepts/clusters/cluster-providers/
- - /rancher/v2.5/en/tasks/clusters/
- - /rancher/v2.x/en/cluster-provisioning/
---
Rancher simplifies the creation of clusters by allowing you to create them through the Rancher UI rather than more complex alternatives. Rancher provides multiple options for launching a cluster. Use the option that best fits your use case.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-components.md b/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-components.md
index b4cd4b25b66..e93dd6bc8fd 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-components.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-components.md
@@ -1,8 +1,5 @@
---
title: Kubernetes Components
-weight: 100
-aliases:
- - /rancher/v2.x/en/troubleshooting/kubernetes-components/
---
The commands and steps listed in this section apply to the core Kubernetes components on [Rancher Launched Kubernetes](launch-kubernetes-with-rancher.md) clusters.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-resources-setup.md b/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-resources-setup.md
index 816dfd2eeef..4df1e24bae9 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-resources-setup.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/kubernetes-resources-setup.md
@@ -1,11 +1,5 @@
---
title: Kubernetes Resources
-weight: 18
-aliases:
- - /rancher/v2.5/en/concepts/
- - /rancher/v2.5/en/tasks/
- - /rancher/v2.5/en/concepts/resources/
- - /rancher/v2.x/en/k8s-in-rancher/
---
> The Cluster Explorer is a new feature in Rancher v2.5 that allows you to view and manipulate all of the custom resources and CRDs in a Kubernetes cluster from the Rancher UI. This section will be updated to reflect the way that Kubernetes resources are handled in Rancher v2.5.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/launch-kubernetes-with-rancher.md b/versioned_docs/version-2.5/pages-for-subheaders/launch-kubernetes-with-rancher.md
index c741178b686..b5910af9b69 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/launch-kubernetes-with-rancher.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/launch-kubernetes-with-rancher.md
@@ -1,8 +1,5 @@
---
title: Launching Kubernetes with Rancher
-weight: 4
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/
---
You can have Rancher launch a Kubernetes cluster using any nodes you want. When Rancher deploys Kubernetes onto these nodes, it uses [Rancher Kubernetes Engine](https://rancher.com/docs/rke/latest/en/) (RKE), which is Rancher's own lightweight Kubernetes installer. It can launch Kubernetes on any computers, including:
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/load-balancer-and-ingress-controller.md b/versioned_docs/version-2.5/pages-for-subheaders/load-balancer-and-ingress-controller.md
index e79744f1c01..77a7838cde8 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/load-balancer-and-ingress-controller.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/load-balancer-and-ingress-controller.md
@@ -1,10 +1,6 @@
---
title: Set Up Load Balancer and Ingress Controller within Rancher
description: Learn how you can set up load balancers and ingress controllers to redirect service requests within Rancher, and learn about the limitations of load balancers
-weight: 3040
-aliases:
- - /rancher/v2.5/en/k8s-in-rancher/load-balancers-and-ingress
- - /rancher/v2.x/en/k8s-in-rancher/load-balancers-and-ingress/
---
Within Rancher, you can set up load balancers and ingress controllers to redirect service requests.
@@ -43,7 +39,7 @@ As mentioned in the limitations above, the disadvantages of using a load balance
- If you run multiple services in your cluster, you must have a load balancer for each service.
- It can be expensive to have a load balancer for every service.
-In contrast, when an ingress is used as the entrypoint into a cluster, the ingress can route traffic to multiple services with greater flexibility. It can map multiple HTTP requests to services without individual IP addresses for each service.
+In contrast, when an ingress is used as the entrypoint into a cluster, the ingress can route traffic to multiple services with greater flexibility. It can map multiple HTTP requests to services without individual IP addresses for each service.
Therefore, it is useful to have an ingress if you want multiple services to be exposed with the same IP address, the same Layer 7 protocol, or the same privileged node-ports: 80 and 443.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/logging.md b/versioned_docs/version-2.5/pages-for-subheaders/logging.md
index 03fd61e1b69..79cbe3cd1bf 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/logging.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/logging.md
@@ -1,15 +1,6 @@
---
title: Rancher Integration with Logging Services
-shortTitle: Logging
description: Rancher integrates with popular logging services. Learn the requirements and benefits of integrating with logging services, and enable logging on your cluster.
-metaDescription: "Rancher integrates with popular logging services. Learn the requirements and benefits of integrating with logging services, and enable logging on your cluster."
-weight: 15
-aliases:
- - /rancher/v2.5/en/dashboard/logging
- - /rancher/v2.5/en/logging/v2.5
- - /rancher/v2.5/en/cluster-admin/tools/logging
- - /rancher/v2.x/en/logging/
- - /rancher/v2.x/en/logging/v2.5/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/manage-clusters.md b/versioned_docs/version-2.5/pages-for-subheaders/manage-clusters.md
index ed8ceebd4af..67941b22779 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/manage-clusters.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/manage-clusters.md
@@ -1,8 +1,5 @@
---
title: Cluster Administration
-weight: 8
-aliases:
- - /rancher/v2.x/en/cluster-admin/
---
After you provision a cluster in Rancher, you can begin using powerful Kubernetes features to deploy and scale your containerized applications in development, testing, or production environments.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/manage-project-resource-quotas.md b/versioned_docs/version-2.5/pages-for-subheaders/manage-project-resource-quotas.md
index 5db30c266e5..7d452fcb423 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/manage-project-resource-quotas.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/manage-project-resource-quotas.md
@@ -1,9 +1,5 @@
---
title: Project Resource Quotas
-weight: 2515
-aliases:
- - /rancher/v2.5/en/cluster-admin/projects-and-namespaces/resource-quotas
- - /rancher/v2.x/en/project-admin/resource-quotas/
---
In situations where several teams share a cluster, one team may overconsume the resources available: CPU, memory, storage, services, Kubernetes objects like pods or secrets, and so on. To prevent this overconsumption, you can apply a _resource quota_, which is a Rancher feature that limits the resources available to a project or namespace.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/manage-projects.md b/versioned_docs/version-2.5/pages-for-subheaders/manage-projects.md
index 33ef225f85c..8a025b89935 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/manage-projects.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/manage-projects.md
@@ -1,9 +1,5 @@
---
title: Project Administration
-weight: 9
-aliases:
- - /rancher/v2.5/en/project-admin/editing-projects/
- - /rancher/v2.x/en/project-admin/
---
_Projects_ are objects introduced in Rancher that help organize namespaces in your Kubernetes cluster. You can use projects to create multi-tenant clusters, which allows a group of users to share the same underlying resources without interacting with each other's applications.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/manage-role-based-access-control-rbac.md b/versioned_docs/version-2.5/pages-for-subheaders/manage-role-based-access-control-rbac.md
index 4271ab6bcef..8d63e7ad740 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/manage-role-based-access-control-rbac.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/manage-role-based-access-control-rbac.md
@@ -1,9 +1,5 @@
---
title: Role-Based Access Control (RBAC)
-weight: 1120
-aliases:
- - /rancher/v2.5/en/concepts/global-configuration/users-permissions-roles/
- - /rancher/v2.x/en/admin-settings/rbac/
---
Within Rancher, each person authenticates as a _user_, which is a login that grants you access to Rancher. As mentioned in [Authentication](about-authentication.md), users can either be local or external.
@@ -16,7 +12,7 @@ After you configure external authentication, the users that display on the **Use
## Users and Roles
-Once the user logs in to Rancher, their _authorization_, or their access rights within the system, is determined by _global permissions_, and _cluster and project roles_.
+Once the user logs in to Rancher, their _authorization_, or their access rights within the system, is determined by _global permissions_, and _cluster and project roles_.
- [Global Permissions](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md):
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/monitoring-alerting-guides.md b/versioned_docs/version-2.5/pages-for-subheaders/monitoring-alerting-guides.md
index 3aa725064be..ce9f991fc84 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/monitoring-alerting-guides.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/monitoring-alerting-guides.md
@@ -1,7 +1,5 @@
---
title: Monitoring Guides
-shortTitle: Guides
-weight: 4
---
- [Enable monitoring](../how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md)
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/monitoring-and-alerting.md b/versioned_docs/version-2.5/pages-for-subheaders/monitoring-and-alerting.md
index aaf0e72f7d7..d41356fa60c 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/monitoring-and-alerting.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/monitoring-and-alerting.md
@@ -1,11 +1,6 @@
---
title: Monitoring and Alerting
-shortTitle: Monitoring/Alerting
description: Prometheus lets you view metrics from your different Rancher and Kubernetes objects. Learn about the scope of monitoring and how to enable cluster monitoring
-weight: 13
-aliases:
- - /rancher/v2.x/en/monitoring-alerting/
- - /rancher/v2.x/en/monitoring-alerting/v2.5/
---
Using the `rancher-monitoring` application, you can quickly deploy leading open-source monitoring and alerting solutions onto your cluster.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/monitoring-v2-configuration-guides.md b/versioned_docs/version-2.5/pages-for-subheaders/monitoring-v2-configuration-guides.md
index 28253c73a72..3324a7daa10 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/monitoring-v2-configuration-guides.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/monitoring-v2-configuration-guides.md
@@ -1,15 +1,10 @@
---
title: Configuration
-weight: 5
-aliases:
- - /rancher/v2.5/en/monitoring-alerting/configuration
- - /rancher/v2.x/en/monitoring-alerting/v2.5/configuration/
- - /rancher/v2.x/en/monitoring-alerting/v2.5/configuration/alertmanager/
---
This page captures some of the most important options for configuring Monitoring V2 in the Rancher UI.
-For information on configuring custom scrape targets and rules for Prometheus, please refer to the upstream documentation for the [Prometheus Operator.](https://github.com/prometheus-operator/prometheus-operator) Some of the most important custom resources are explained in the Prometheus Operator [design documentation.](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/design.md) The Prometheus Operator documentation can help also you set up RBAC, Thanos, or custom configuration.
+For information on configuring custom scrape targets and rules for Prometheus, please refer to the upstream documentation for the [Prometheus Operator.](https://github.com/prometheus-operator/prometheus-operator) Some of the most important custom resources are explained in the Prometheus Operator [design documentation.](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/design.md) The Prometheus Operator documentation can help also you set up RBAC, Thanos, or custom configuration.
# Setting Resource Limits and Requests
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/other-installation-methods.md b/versioned_docs/version-2.5/pages-for-subheaders/other-installation-methods.md
index 9c82aff2bac..e765865e4f9 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/other-installation-methods.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/other-installation-methods.md
@@ -1,8 +1,5 @@
---
title: Other Installation Methods
-weight: 3
-aliases:
- - /rancher/v2.x/en/installation/other-installation-methods/
---
### Air Gapped Installations
@@ -15,7 +12,7 @@ An air gapped environment could be where Rancher server will be installed offlin
The [single-node Docker installation](rancher-on-a-single-node-with-docker.md) is for Rancher users that are wanting to test out Rancher. Instead of running on a Kubernetes cluster using Helm, you install the Rancher server component on a single node using a `docker run` command.
-The Docker installation is for development and testing environments only.
+The Docker installation is for development and testing environments only.
Since there is only one node and a single Docker container, if the node goes down, there is no copy of the etcd data available on other nodes and you will lose all the data of your Rancher server.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/pipelines.md b/versioned_docs/version-2.5/pages-for-subheaders/pipelines.md
index a8831ef5670..6d5a2432769 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/pipelines.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/pipelines.md
@@ -1,9 +1,5 @@
---
title: Pipelines
-weight: 10
-aliases:
- - /rancher/v2.5/en/k8s-in-rancher/pipelines
- - /rancher/v2.x/en/pipelines/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/provisioning-storage-examples.md b/versioned_docs/version-2.5/pages-for-subheaders/provisioning-storage-examples.md
index 9fd931737aa..72d452efcc1 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/provisioning-storage-examples.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/provisioning-storage-examples.md
@@ -1,10 +1,5 @@
---
title: Provisioning Storage Examples
-weight: 3053
-aliases:
- - /rancher/v2.5/en/tasks/clusters/adding-storage/provisioning-storage/
- - /rancher/v2.5/en/k8s-in-rancher/volumes-and-storage/examples/
- - /rancher/v2.x/en/cluster-admin/volumes-and-storage/examples/
---
Rancher supports persistent storage with a variety of volume plugins. However, before you use any of these plugins to bind persistent storage to your workloads, you have to configure the storage itself, whether its a cloud-based solution from a service-provider or an on-prem solution that you manage yourself.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/quick-start-guides.md b/versioned_docs/version-2.5/pages-for-subheaders/quick-start-guides.md
index 45d0281d220..1e83fb023f0 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/quick-start-guides.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/quick-start-guides.md
@@ -1,8 +1,5 @@
---
title: Rancher Deployment Quick Start Guides
-metaDescription: Use this section to jump start your Rancher deployment and testing. It contains instructions for a simple Rancher setup and some common use cases.
-short title: Use this section to jump start your Rancher deployment and testing. It contains instructions for a simple Rancher setup and some common use cases.
-weight: 2
---
>**Note:** The intent of these guides is to quickly launch a sandbox that you can use to evaluate Rancher. These guides are not intended for production environments. For comprehensive setup instructions, see [Installation](installation-and-upgrade.md).
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/rancher-behind-an-http-proxy.md b/versioned_docs/version-2.5/pages-for-subheaders/rancher-behind-an-http-proxy.md
index 49dc0fc9229..ef0d4acbe8e 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/rancher-behind-an-http-proxy.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/rancher-behind-an-http-proxy.md
@@ -1,8 +1,5 @@
---
title: Installing Rancher behind an HTTP Proxy
-weight: 4
-aliases:
- - /rancher/v2.x/en/installation/other-installation-methods/behind-proxy/
---
In a lot of enterprise environments, servers or VMs running on premise do not have direct Internet access, but must connect to external services through a HTTP(S) proxy for security reasons. This tutorial shows step by step how to set up a highly available Rancher installation in such an environment.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/rancher-managed-clusters.md b/versioned_docs/version-2.5/pages-for-subheaders/rancher-managed-clusters.md
index 89eeeeb9801..2fc25c09150 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/rancher-managed-clusters.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/rancher-managed-clusters.md
@@ -1,10 +1,5 @@
---
title: Best Practices for Rancher Managed Clusters
-shortTitle: Rancher Managed Clusters
-weight: 2
-aliases:
- - /rancher/v2.5/en/best-practices/v2.5/rancher-managed
- - /rancher/v2.x/en/best-practices/v2.5/rancher-managed/
---
### Logging
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/rancher-manager-architecture.md b/versioned_docs/version-2.5/pages-for-subheaders/rancher-manager-architecture.md
index 7dd24b62c61..a9295751cab 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/rancher-manager-architecture.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/rancher-manager-architecture.md
@@ -1,8 +1,5 @@
---
title: Architecture
-weight: 1
-aliases:
- - /rancher/v2.x/en/overview/architecture/
---
This section focuses on the [Rancher server and its components](../reference-guides/rancher-manager-architecture/rancher-server-and-components.md) and how [Rancher communicates with downstream Kubernetes clusters](../reference-guides/rancher-manager-architecture/communicating-with-downstream-user-clusters.md).
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/rancher-on-a-single-node-with-docker.md b/versioned_docs/version-2.5/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
index ba7020947b6..44d64ff1149 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
@@ -1,13 +1,6 @@
---
title: Installing Rancher on a Single Node Using Docker
description: For development and testing environments only, use a Docker install. Install Docker on a single Linux host, and deploy Rancher with a single Docker container.
-weight: 2
-aliases:
- - /rancher/v2.5/en/installation/single-node-install/
- - /rancher/v2.5/en/installation/single-node
- - /rancher/v2.5/en/installation/other-installation-methods/single-node
- - /rancher/v2.x/en/installation/requirements/installing-docker/
- - /rancher/v2.x/en/installation/other-installation-methods/single-node-docker/
---
Rancher can be installed by running a single Docker container.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/rancher-security.md b/versioned_docs/version-2.5/pages-for-subheaders/rancher-security.md
index ba2ce241353..628515eadcc 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/rancher-security.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/rancher-security.md
@@ -1,8 +1,5 @@
---
title: Security
-weight: 20
-aliases:
- - /rancher/v2.x/en/security/rancher-2.5/
---
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/rancher-server.md b/versioned_docs/version-2.5/pages-for-subheaders/rancher-server.md
index 3ff8dfc7d2e..c8984d9c447 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/rancher-server.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/rancher-server.md
@@ -1,10 +1,5 @@
---
title: Best Practices for the Rancher Server
-shortTitle: Rancher Server
-weight: 1
-aliases:
- - /rancher/v2.5/en/best-practices/v2.5/rancher-server
- - /rancher/v2.x/en/best-practices/v2.5/rancher-server/
---
This guide contains our recommendations for running the Rancher server, and is intended to be used in situations in which Rancher manages downstream Kubernetes clusters.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/rancher-v2.5-hardening-guides.md b/versioned_docs/version-2.5/pages-for-subheaders/rancher-v2.5-hardening-guides.md
index 42786d17a3a..3c5c68e0350 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/rancher-v2.5-hardening-guides.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/rancher-v2.5-hardening-guides.md
@@ -1,7 +1,5 @@
---
title: Self-Assessment and Hardening Guides for Rancher v2.5
-shortTitle: Rancher v2.5 Guides
-weight: 1
---
Rancher v2.5 introduced the capability to deploy Rancher on any Kubernetes cluster. For that reason, we now provide separate security hardening guides for Rancher deployments on each of Rancher's Kubernetes distributions.
@@ -10,7 +8,7 @@ Rancher v2.5 introduced the capability to deploy Rancher on any Kubernetes clust
Rancher has the following Kubernetes distributions:
-- [**RKE,**](https://rancher.com/docs/rke/latest/en/) Rancher Kubernetes Engine, is a CNCF-certified Kubernetes distribution that runs entirely within Docker containers.
+- [**RKE,**](https://rancher.com/docs/rke/latest/en/) Rancher Kubernetes Engine, is a CNCF-certified Kubernetes distribution that runs entirely within Docker containers.
- [**K3s,**](https://rancher.com/docs/k3s/latest/en/) is a fully conformant, lightweight Kubernetes distribution. It is easy to install, with half the memory of upstream Kubernetes, all in a binary of less than 100 MB.
- [**RKE2**](https://docs.rke2.io/) is a fully conformant Kubernetes distribution that focuses on security and compliance within the U.S. Federal Government sector.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/resources.md b/versioned_docs/version-2.5/pages-for-subheaders/resources.md
index 6dba2a5194a..5954506a0dc 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/resources.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/resources.md
@@ -1,9 +1,5 @@
---
title: Resources
-weight: 5
-aliases:
- - /rancher/v2.5/en/installation/options
- - /rancher/v2.x/en/installation/resources/
---
### Docker Installations
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/set-up-cloud-providers.md b/versioned_docs/version-2.5/pages-for-subheaders/set-up-cloud-providers.md
index be4a4e7d5dd..b26be09828d 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/set-up-cloud-providers.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/set-up-cloud-providers.md
@@ -1,11 +1,7 @@
---
title: Setting up Cloud Providers
-weight: 2300
-aliases:
- - /rancher/v2.5/en/concepts/clusters/cloud-providers/
- - /rancher/v2.5/en/cluster-provisioning/rke-clusters/options/cloud-providers
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/cloud-providers/
---
+
A _cloud provider_ is a module in Kubernetes that provides an interface for managing nodes, load balancers, and networking routes.
When a cloud provider is set up in Rancher, the Rancher server can automatically provision new nodes, load balancers or persistent storage devices when launching Kubernetes definitions, if the cloud provider you're using supports such automation.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md b/versioned_docs/version-2.5/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md
index ce472758e95..edb8cc1b211 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md
@@ -1,8 +1,5 @@
---
title: Setting up Clusters from Hosted Kubernetes Providers
-weight: 3
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/hosted-kubernetes-clusters/
---
In this scenario, Rancher does not provision Kubernetes because it is installed by providers such as Google Kubernetes Engine (GKE), Amazon Elastic Container Service for Kubernetes, or Azure Kubernetes Service.
@@ -15,8 +12,8 @@ Rancher supports the following Kubernetes providers:
- [Google GKE (Google Kubernetes Engine)](https://cloud.google.com/kubernetes-engine/)
- [Amazon EKS (Amazon Elastic Container Service for Kubernetes)](https://aws.amazon.com/eks/)
-- [Microsoft AKS (Azure Kubernetes Service)](https://azure.microsoft.com/en-us/services/kubernetes-service/)
-- [Alibaba ACK (Alibaba Cloud Container Service for Kubernetes)](https://www.alibabacloud.com/product/kubernetes)
+- [Microsoft AKS (Azure Kubernetes Service)](https://azure.microsoft.com/en-us/services/kubernetes-service/)
+- [Alibaba ACK (Alibaba Cloud Container Service for Kubernetes)](https://www.alibabacloud.com/product/kubernetes)
- [Tencent TKE (Tencent Kubernetes Engine)](https://intl.cloud.tencent.com/product/tke)
- [Huawei CCE (Huawei Cloud Container Engine)](https://www.huaweicloud.com/en-us/product/cce.html)
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/use-existing-nodes.md b/versioned_docs/version-2.5/pages-for-subheaders/use-existing-nodes.md
index 0ff2041e5cb..18510024a25 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/use-existing-nodes.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/use-existing-nodes.md
@@ -1,12 +1,6 @@
---
title: Launching Kubernetes on Existing Custom Nodes
description: To create a cluster with custom nodes, you’ll need to access servers in your cluster and provision them according to Rancher requirements
-metaDescription: "To create a cluster with custom nodes, you’ll need to access servers in your cluster and provision them according to Rancher requirements"
-weight: 2225
-aliases:
- - /rancher/v2.5/en/tasks/clusters/creating-a-cluster/create-cluster-custom/
- - /rancher/v2.5/en/cluster-provisioning/custom-clusters/
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/custom-nodes/
---
When you create a custom cluster, Rancher uses RKE (the Rancher Kubernetes Engine) to create a Kubernetes cluster in on-prem bare-metal servers, on-prem virtual machines, or in any node hosted by an infrastructure provider.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md b/versioned_docs/version-2.5/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md
index 57f11eef5c6..e46ffe7226f 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md
@@ -1,9 +1,5 @@
---
title: Launching Kubernetes on New Nodes in an Infrastructure Provider
-weight: 2205
-aliases:
- - /rancher/v2.5/en/concepts/global-configuration/node-templates/
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/
---
Using Rancher, you can create pools of nodes based on a [node template](use-new-nodes-in-an-infra-provider.md#node-templates). This node template defines the parameters you want to use to launch nodes in your infrastructure providers or cloud providers.
@@ -44,13 +40,13 @@ To access all node templates, an administrator will need to do the following:
# Node Pools
-Using Rancher, you can create pools of nodes based on a [node template](#node-templates).
+Using Rancher, you can create pools of nodes based on a [node template](#node-templates).
A node template defines the configuration of a node, like what operating system to use, number of CPUs and amount of memory.
The benefit of using a node pool is that if a node is destroyed or deleted, you can increase the number of live nodes to compensate for the node that was lost. The node pool helps you ensure that the count of the node pool is as expected.
-Each node pool must have one or more nodes roles assigned.
+Each node pool must have one or more nodes roles assigned.
Each node role (i.e. etcd, control plane, and worker) should be assigned to a distinct node pool. Although it is possible to assign multiple node roles to a node pool, this should not be done for production clusters.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/use-windows-clusters.md b/versioned_docs/version-2.5/pages-for-subheaders/use-windows-clusters.md
index d0292c27d5a..bf73c5ac1c6 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/use-windows-clusters.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/use-windows-clusters.md
@@ -1,8 +1,5 @@
---
title: Launching Kubernetes on Windows Clusters
-weight: 2240
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/windows-clusters/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/user-settings.md b/versioned_docs/version-2.5/pages-for-subheaders/user-settings.md
index 254e80e3e7f..9b5db2f3278 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/user-settings.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/user-settings.md
@@ -1,9 +1,5 @@
---
title: User Settings
-weight: 23
-aliases:
- - /rancher/v2.5/en/tasks/user-settings/
- - /rancher/v2.x/en/user-settings/
---
Within Rancher, each user has a number of settings associated with their login: personal preferences, API keys, etc. You can configure these settings by choosing from the **User Settings** menu. You can open this menu by clicking your avatar, located within the main menu.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/vsphere-cloud-provider.md b/versioned_docs/version-2.5/pages-for-subheaders/vsphere-cloud-provider.md
index b14b140fd71..4f193f98fa2 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/vsphere-cloud-provider.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/vsphere-cloud-provider.md
@@ -1,8 +1,5 @@
---
title: Setting up the vSphere Cloud Provider
-weight: 4
-aliases:
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/cloud-providers/vsphere/
---
In this section, you'll learn how to set up a vSphere cloud provider for a Rancher managed RKE Kubernetes cluster in vSphere.
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/vsphere.md b/versioned_docs/version-2.5/pages-for-subheaders/vsphere.md
index 6ab183c78ee..c778357c6df 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/vsphere.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/vsphere.md
@@ -1,12 +1,6 @@
---
title: Creating a vSphere Cluster
-shortTitle: vSphere
description: Use Rancher to create a vSphere cluster. It may consist of groups of VMs with distinct properties which allow for fine-grained control over the sizing of nodes.
-metaDescription: Use Rancher to create a vSphere cluster. It may consist of groups of VMs with distinct properties which allow for fine-grained control over the sizing of nodes.
-weight: 2225
-aliases:
- - /rancher/v2.5/en/tasks/clusters/creating-a-cluster/create-cluster-vsphere/
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/node-pools/vsphere/
---
import YouTube from '@site/src/components/YouTube'
diff --git a/versioned_docs/version-2.5/pages-for-subheaders/workloads-and-pods.md b/versioned_docs/version-2.5/pages-for-subheaders/workloads-and-pods.md
index f51184afeb5..94ac0881d6d 100644
--- a/versioned_docs/version-2.5/pages-for-subheaders/workloads-and-pods.md
+++ b/versioned_docs/version-2.5/pages-for-subheaders/workloads-and-pods.md
@@ -1,12 +1,6 @@
---
title: "Kubernetes Workloads and Pods"
description: "Learn about the two constructs with which you can build any complex containerized application in Kubernetes: Kubernetes workloads and pods"
-weight: 3025
-aliases:
- - /rancher/v2.5/en/concepts/workloads/
- - /rancher/v2.5/en/tasks/workloads/
- - /rancher/v2.5/en/k8s-in-rancher/workloads
- - /rancher/v2.x/en/k8s-in-rancher/workloads/
---
You can build any complex containerized application in Kubernetes using two basic constructs: pods and workloads. Once you build an application, you can expose it for access either within the same cluster or on the Internet using a third construct: services.
diff --git a/versioned_docs/version-2.5/rancher-manager.md b/versioned_docs/version-2.5/rancher-manager.md
index 37e9bfae31f..61301b036ef 100644
--- a/versioned_docs/version-2.5/rancher-manager.md
+++ b/versioned_docs/version-2.5/rancher-manager.md
@@ -1,12 +1,6 @@
---
title: "Rancher 2.5"
-shortTitle: "Rancher 2.5"
description: "Rancher adds significant value on top of Kubernetes: managing hundreds of clusters from one interface, centralizing RBAC, enabling monitoring and alerting. Read more."
-metaTitle: "Rancher 2.5 Docs: What is New?"
-metaDescription: "Rancher 2 adds significant value on top of Kubernetes: managing hundreds of clusters from one interface, centralizing RBAC, enabling monitoring and alerting. Read more."
-insertOneSix: false
-weight: 2
-ctaBanner: 0
slug: /
---
Rancher was originally built to work with multiple orchestrators, and it included its own orchestrator called Cattle. With the rise of Kubernetes in the marketplace, Rancher 2 exclusively deploys and manages Kubernetes clusters running anywhere, on any provider.
diff --git a/versioned_docs/version-2.5/reference-guides/about-the-api/api-tokens.md b/versioned_docs/version-2.5/reference-guides/about-the-api/api-tokens.md
index 1625c301071..73e2713c02e 100644
--- a/versioned_docs/version-2.5/reference-guides/about-the-api/api-tokens.md
+++ b/versioned_docs/version-2.5/reference-guides/about-the-api/api-tokens.md
@@ -1,9 +1,5 @@
---
title: API Tokens
-weight: 1
-aliases:
- - /rancher/v2.5/en/cluster-admin/api/api-tokens/
- - /rancher/v2.x/en/api/api-tokens/
---
By default, some cluster-level API tokens are generated with infinite time-to-live (`ttl=0`). In other words, API tokens with `ttl=0` never expire unless you invalidate them. Tokens are not invalidated by changing a password.
@@ -23,7 +19,7 @@ Here is the complete list of tokens that are generated with `ttl=0`:
| Token | Description |
|-------|-------------|
-| `kubeconfig-*` | Kubeconfig token |
+| `kubeconfig-*` | Kubeconfig token |
| `kubectl-shell-*` | Access to `kubectl` shell in the browser |
| `agent-*` | Token for agent deployment |
| `compose-token-*` | Token for compose |
@@ -39,7 +35,7 @@ Admins can set a global TTL on Kubeconfig tokens. Once the token expires the kub
1. Disable the kubeconfig-generate-token setting in the Rancher API view at `https:// **Note:** RancherD was an experimental feature available as part of Rancher v2.5.4 through v2.5.10 but is now deprecated and not available for recent releases.
@@ -230,7 +226,7 @@ It can be run with the following options:
| `--server value, -s value` | Server to connect to, used to join a cluster |
| `--cluster-reset` | Forget all peers and become sole member of a new cluster |
| `--secrets-encryption` | Enable Secret encryption at rest |
-
+
# RancherD Agent CLI Options
diff --git a/versioned_docs/version-2.5/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md b/versioned_docs/version-2.5/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
index f2296cb054f..d06281e1f2e 100644
--- a/versioned_docs/version-2.5/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
+++ b/versioned_docs/version-2.5/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
@@ -1,6 +1,5 @@
---
title: RKE Cluster Configuration
-weight: 1
---
In [clusters launched by RKE](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md), you can edit any of the remaining options that follow.
diff --git a/versioned_docs/version-2.5/reference-guides/cluster-configuration/rancher-server-configuration/sync-clusters.md b/versioned_docs/version-2.5/reference-guides/cluster-configuration/rancher-server-configuration/sync-clusters.md
index 13a6b1e7f98..a62893ccb45 100644
--- a/versioned_docs/version-2.5/reference-guides/cluster-configuration/rancher-server-configuration/sync-clusters.md
+++ b/versioned_docs/version-2.5/reference-guides/cluster-configuration/rancher-server-configuration/sync-clusters.md
@@ -1,8 +1,5 @@
---
title: Syncing
-weight: 10
-aliases:
- - /rancher/v2.5/en/cluster-provisioning/hosted-kubernetes-clusters/syncing
---
Syncing is the feature for EKS and GKE clusters that causes Rancher to update the clusters' values so they are up to date with their corresponding cluster object in the hosted Kubernetes provider. This enables Rancher to not be the sole owner of a hosted cluster’s state. Its largest limitation is that processing an update from Rancher and another source at the same time or within 5 minutes of one finishing may cause the state from one source to completely overwrite the other.
diff --git a/versioned_docs/version-2.5/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md b/versioned_docs/version-2.5/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md
index ca2d507c4a2..39e33306ea9 100644
--- a/versioned_docs/version-2.5/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md
+++ b/versioned_docs/version-2.5/reference-guides/cluster-configuration/rancher-server-configuration/use-existing-nodes/rancher-agent-options.md
@@ -1,10 +1,5 @@
---
title: Rancher Agent Options
-weight: 2500
-aliases:
- - /rancher/v2.5/en/admin-settings/agent-options/
- - /rancher/v2.5/en/cluster-provisioning/custom-clusters/agent-options
- - /rancher/v2.x/en/cluster-provisioning/rke-clusters/custom-nodes/agent-options/
---
Rancher deploys an agent on each node to communicate with the node. This pages describes the options that can be passed to the agent. To use these options, you will need to [create a cluster with custom nodes](../../../../pages-for-subheaders/use-existing-nodes.md) and add the options to the generated `docker run` command when adding a node.
diff --git a/versioned_docs/version-2.5/reference-guides/configure-openldap/openldap-config-reference.md b/versioned_docs/version-2.5/reference-guides/configure-openldap/openldap-config-reference.md
index 06b2d82c04d..9e0b5ce1ad8 100644
--- a/versioned_docs/version-2.5/reference-guides/configure-openldap/openldap-config-reference.md
+++ b/versioned_docs/version-2.5/reference-guides/configure-openldap/openldap-config-reference.md
@@ -1,8 +1,5 @@
---
title: OpenLDAP Configuration Reference
-weight: 2
-aliases:
- - /rancher/v2.x/en/admin-settings/authentication/openldap/openldap-config/
---
This section is intended to be used as a reference when setting up an OpenLDAP authentication provider in Rancher.
diff --git a/versioned_docs/version-2.5/reference-guides/installation-references/helm-chart-options.md b/versioned_docs/version-2.5/reference-guides/installation-references/helm-chart-options.md
index af770124b70..7cc55d1a3da 100644
--- a/versioned_docs/version-2.5/reference-guides/installation-references/helm-chart-options.md
+++ b/versioned_docs/version-2.5/reference-guides/installation-references/helm-chart-options.md
@@ -1,12 +1,5 @@
---
title: Rancher Helm Chart Options
-weight: 1
-aliases:
- - /rancher/v2.5/en/installation/options/
- - /rancher/v2.5/en/installation/options/chart-options/
- - /rancher/v2.5/en/installation/options/helm2/helm-rancher/chart-options/
- - /rancher/v2.5/en/installation/resources/chart-options
- - /rancher/v2.x/en/installation/install-rancher-on-k8s/chart-options/
---
This page is a configuration reference for the Rancher Helm chart.
diff --git a/versioned_docs/version-2.5/reference-guides/installation-references/tls-settings.md b/versioned_docs/version-2.5/reference-guides/installation-references/tls-settings.md
index b691e069d55..807a8227b24 100644
--- a/versioned_docs/version-2.5/reference-guides/installation-references/tls-settings.md
+++ b/versioned_docs/version-2.5/reference-guides/installation-references/tls-settings.md
@@ -1,11 +1,5 @@
---
title: TLS Settings
-weight: 3
-aliases:
- - /rancher/v2.5/en/installation/options/tls-settings/
- - /rancher/v2.5/en/admin-settings/tls-settings
- - /rancher/v2.5/en/installation/resources/encryption/tls-settings
- - /rancher/v2.x/en/installation/resources/tls-settings/
---
Changing the default TLS settings depends on the chosen installation method.
diff --git a/versioned_docs/version-2.5/reference-guides/kubernetes-concepts.md b/versioned_docs/version-2.5/reference-guides/kubernetes-concepts.md
index 9c13e9e7a72..c2918cc6de7 100644
--- a/versioned_docs/version-2.5/reference-guides/kubernetes-concepts.md
+++ b/versioned_docs/version-2.5/reference-guides/kubernetes-concepts.md
@@ -1,8 +1,5 @@
---
title: Kubernetes Concepts
-weight: 4
-aliases:
- - /rancher/v2.x/en/overview/concepts/
---
This page explains concepts related to Kubernetes that are important for understanding how Rancher works. The descriptions below provide a simplified interview of Kubernetes components. For more details, refer to the [official documentation on Kubernetes components.](https://kubernetes.io/docs/concepts/overview/components/)
@@ -36,7 +33,7 @@ Rancher uses etcd as a data store in both single node and high-availability inst
The state of a Kubernetes cluster is maintained in [etcd.](https://kubernetes.io/docs/concepts/overview/components/#etcd) The etcd nodes run the etcd database.
-The etcd database component is a distributed key-value store used as Kubernetes storage for all cluster data, such as cluster coordination and state management. It is recommended to run etcd on multiple nodes so that there's always a backup available for failover.
+The etcd database component is a distributed key-value store used as Kubernetes storage for all cluster data, such as cluster coordination and state management. It is recommended to run etcd on multiple nodes so that there's always a backup available for failover.
Although you can run etcd on just one node, etcd requires a majority of nodes, a quorum, to agree on updates to the cluster state. The cluster should always contain enough healthy etcd nodes to form a quorum. For a cluster with n members, a quorum is (n/2)+1. For any odd-sized cluster, adding one node will always increase the number of nodes necessary for a quorum.
@@ -47,7 +44,7 @@ Three etcd nodes is generally sufficient for smaller clusters and five etcd node
Controlplane nodes run the Kubernetes API server, scheduler, and controller manager. These nodes take care of routine tasks to ensure that your cluster maintains your configuration. Because all cluster data is stored on your etcd nodes, control plane nodes are stateless. You can run control plane on a single node, although three or more nodes are recommended for redundancy. Additionally, a single node can share the control plane and etcd roles.
### Worker Nodes
-
+
Each [worker node](https://kubernetes.io/docs/concepts/architecture/nodes/) runs the following:
- **Kubelets:** An agent that monitors the state of the node, ensuring your containers are healthy.
diff --git a/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/examples.md b/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/examples.md
index f62dfb976b6..b679075728d 100644
--- a/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/examples.md
+++ b/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/examples.md
@@ -1,11 +1,10 @@
---
title: Examples
-weight: 400
---
### ServiceMonitor
-An example ServiceMonitor custom resource can be found [here.](https://github.com/prometheus-operator/prometheus-operator/blob/master/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml)
+An example ServiceMonitor custom resource can be found [here.](https://github.com/prometheus-operator/prometheus-operator/blob/master/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml)
### PodMonitor
diff --git a/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/helm-chart-options.md b/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/helm-chart-options.md
index 685be35b20d..dcffb775ef4 100644
--- a/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/helm-chart-options.md
+++ b/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/helm-chart-options.md
@@ -1,6 +1,5 @@
---
title: Helm Chart Options
-weight: 8
---
diff --git a/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/receivers.md b/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/receivers.md
index 7e526e25431..39c86293e7c 100644
--- a/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/receivers.md
+++ b/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/receivers.md
@@ -1,13 +1,5 @@
---
title: Receiver Configuration
-shortTitle: Receivers
-weight: 1
-aliases:
- - /rancher/v2.5/en/monitoring-alerting/configuration/alertmanager
- - rancher/v2.5/en/monitoring-alerting/legacy/notifiers/
- - /rancher/v2.5/en/cluster-admin/tools/notifiers
- - /rancher/v2.5/en/cluster-admin/tools/alerts
- - /rancher/v2.5/en/monitoring-alerting/configuration/alertmanager
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/routes.md b/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/routes.md
index 3f673b4a6b5..07ebfe0f703 100644
--- a/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/routes.md
+++ b/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/routes.md
@@ -1,7 +1,5 @@
---
title: Route Configuration
-shortTitle: Routes
-weight: 5
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md b/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
index e237469615a..d7bbb0aaa67 100644
--- a/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
+++ b/versioned_docs/version-2.5/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
@@ -1,7 +1,5 @@
---
title: ServiceMonitor and PodMonitor Configuration
-shortTitle: ServiceMonitors and PodMonitors
-weight: 7
---
ServiceMonitors and PodMonitors are both pseudo-CRDs that map the scrape configuration of the Prometheus custom resource.
@@ -14,7 +12,7 @@ ServiceMonitors are more commonly used than PodMonitors, and we recommend them f
### ServiceMonitors
-This pseudo-CRD maps to a section of the Prometheus custom resource configuration. It declaratively specifies how groups of Kubernetes services should be monitored.
+This pseudo-CRD maps to a section of the Prometheus custom resource configuration. It declaratively specifies how groups of Kubernetes services should be monitored.
When a ServiceMonitor is created, the Prometheus Operator updates the Prometheus scrape configuration to include the ServiceMonitor configuration. Then Prometheus begins scraping metrics from the endpoint defined in the ServiceMonitor.
@@ -24,7 +22,7 @@ For more information about how ServiceMonitors work, refer to the [Prometheus Op
### PodMonitors
-This pseudo-CRD maps to a section of the Prometheus custom resource configuration. It declaratively specifies how group of pods should be monitored.
+This pseudo-CRD maps to a section of the Prometheus custom resource configuration. It declaratively specifies how group of pods should be monitored.
When a PodMonitor is created, the Prometheus Operator updates the Prometheus scrape configuration to include the PodMonitor configuration. Then Prometheus begins scraping metrics from the endpoint defined in the PodMonitor.
diff --git a/versioned_docs/version-2.5/reference-guides/pipelines/concepts.md b/versioned_docs/version-2.5/reference-guides/pipelines/concepts.md
index 40285989b11..f3df3cdc9d8 100644
--- a/versioned_docs/version-2.5/reference-guides/pipelines/concepts.md
+++ b/versioned_docs/version-2.5/reference-guides/pipelines/concepts.md
@@ -1,9 +1,5 @@
---
title: Concepts
-weight: 1
-aliases:
- - /rancher/v2.5/en/k8s-in-rancher/pipelines/concepts
- - /rancher/v2.x/en/pipelines/concepts/
---
The purpose of this page is to explain common concepts and terminology related to pipelines.
diff --git a/versioned_docs/version-2.5/reference-guides/pipelines/configure-persistent-data.md b/versioned_docs/version-2.5/reference-guides/pipelines/configure-persistent-data.md
index af00970c431..3a43012a175 100644
--- a/versioned_docs/version-2.5/reference-guides/pipelines/configure-persistent-data.md
+++ b/versioned_docs/version-2.5/reference-guides/pipelines/configure-persistent-data.md
@@ -1,9 +1,5 @@
---
title: Configuring Persistent Data for Pipeline Components
-weight: 600
-aliases:
- - /rancher/v2.5/en/k8s-in-rancher/pipelines/storage
- - /rancher/v2.x/en/pipelines/storage/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/reference-guides/pipelines/example-repositories.md b/versioned_docs/version-2.5/reference-guides/pipelines/example-repositories.md
index 032c18aa1c8..02697840bf7 100644
--- a/versioned_docs/version-2.5/reference-guides/pipelines/example-repositories.md
+++ b/versioned_docs/version-2.5/reference-guides/pipelines/example-repositories.md
@@ -1,10 +1,5 @@
---
title: Example Repositories
-weight: 500
-aliases:
- - /rancher/v2.5/en/tools/pipelines/quick-start-guide/
- - /rancher/v2.5/en/k8s-in-rancher/pipelines/example-repos
- - /rancher/v2.x/en/pipelines/example-repos/
---
Rancher ships with several example repositories that you can use to familiarize yourself with pipelines. We recommend configuring and testing the example repository that most resembles your environment before using pipelines with your own repositories in a production environment. Use this example repository as a sandbox for repo configuration, build demonstration, etc. Rancher includes example repositories for:
diff --git a/versioned_docs/version-2.5/reference-guides/pipelines/example-yaml.md b/versioned_docs/version-2.5/reference-guides/pipelines/example-yaml.md
index cbb1ee77bcf..7392323385f 100644
--- a/versioned_docs/version-2.5/reference-guides/pipelines/example-yaml.md
+++ b/versioned_docs/version-2.5/reference-guides/pipelines/example-yaml.md
@@ -1,10 +1,5 @@
---
title: Example YAML File
-weight: 501
-aliases:
- - /rancher/v2.5/en/tools/pipelines/reference/
- - /rancher/v2.5/en/k8s-in-rancher/pipelines/example
- - /rancher/v2.x/en/pipelines/example/
---
Pipelines can be configured either through the UI or using a yaml file in the repository, i.e. `.rancher-pipeline.yml` or `.rancher-pipeline.yaml`.
diff --git a/versioned_docs/version-2.5/reference-guides/pipelines/pipeline-configuration.md b/versioned_docs/version-2.5/reference-guides/pipelines/pipeline-configuration.md
index 0a3b673a505..d4e3ccc841b 100644
--- a/versioned_docs/version-2.5/reference-guides/pipelines/pipeline-configuration.md
+++ b/versioned_docs/version-2.5/reference-guides/pipelines/pipeline-configuration.md
@@ -1,9 +1,5 @@
---
title: Pipeline Configuration Reference
-weight: 1
-aliases:
- - /rancher/v2.5/en/k8s-in-rancher/pipelines/config
- - /rancher/v2.x/en/pipelines/config/
---
In this section, you'll learn how to configure pipelines.
diff --git a/versioned_docs/version-2.5/reference-guides/rancher-cluster-tools.md b/versioned_docs/version-2.5/reference-guides/rancher-cluster-tools.md
index 02d7cbf1de3..b3560923a1b 100644
--- a/versioned_docs/version-2.5/reference-guides/rancher-cluster-tools.md
+++ b/versioned_docs/version-2.5/reference-guides/rancher-cluster-tools.md
@@ -1,9 +1,5 @@
---
title: Tools for Logging, Monitoring, and Visibility
-weight: 2033
-aliases:
- - /rancher/v2.5/en/tools/notifiers-and-alerts/
- - /rancher/v2.x/en/cluster-admin/tools/
---
Rancher contains a variety of tools that aren't included in Kubernetes to assist in your DevOps operations. Rancher can integrate with external services to help your clusters run more efficiently.
diff --git a/versioned_docs/version-2.5/reference-guides/rancher-manager-architecture/architecture-recommendations.md b/versioned_docs/version-2.5/reference-guides/rancher-manager-architecture/architecture-recommendations.md
index 705b813b75e..ad036fe5ea9 100644
--- a/versioned_docs/version-2.5/reference-guides/rancher-manager-architecture/architecture-recommendations.md
+++ b/versioned_docs/version-2.5/reference-guides/rancher-manager-architecture/architecture-recommendations.md
@@ -1,8 +1,5 @@
---
title: Architecture Recommendations
-weight: 3
-aliases:
- - /rancher/v2.x/en/overview/architecture-recommendations/
---
Kubernetes cluster. If you are installing Rancher on a single node, the main architecture recommendation that applies to your installation is that the node running Rancher should be [separate from downstream clusters.](#separation-of-rancher-and-user-clusters)
diff --git a/versioned_docs/version-2.5/reference-guides/rancher-project-tools.md b/versioned_docs/version-2.5/reference-guides/rancher-project-tools.md
index 7ad8a13f8a3..3a16e45b0b9 100644
--- a/versioned_docs/version-2.5/reference-guides/rancher-project-tools.md
+++ b/versioned_docs/version-2.5/reference-guides/rancher-project-tools.md
@@ -1,8 +1,5 @@
---
title: Tools for Logging, Monitoring, and Visibility
-weight: 2525
-aliases:
- - /rancher/v2.x/en/project-admin/tools/
---
Rancher contains a variety of tools that aren't included in Kubernetes to assist in your DevOps operations. Rancher can integrate with external services to help your clusters run more efficiently.
diff --git a/versioned_docs/version-2.5/reference-guides/rancher-security/kubernetes-security-best-practices.md b/versioned_docs/version-2.5/reference-guides/rancher-security/kubernetes-security-best-practices.md
index 4dc70b3d510..a863dd44e52 100644
--- a/versioned_docs/version-2.5/reference-guides/rancher-security/kubernetes-security-best-practices.md
+++ b/versioned_docs/version-2.5/reference-guides/rancher-security/kubernetes-security-best-practices.md
@@ -1,6 +1,5 @@
---
title: Kubernetes Security Best Practices
-weight: 5
---
### Restricting cloud metadata API access
diff --git a/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/hardening-guide-with-cis-v1.5-benchmark.md b/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/hardening-guide-with-cis-v1.5-benchmark.md
index 28c57fd70be..4306af7d3d4 100644
--- a/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/hardening-guide-with-cis-v1.5-benchmark.md
+++ b/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/hardening-guide-with-cis-v1.5-benchmark.md
@@ -1,8 +1,5 @@
---
title: Hardening Guide with CIS 1.5 Benchmark
-weight: 200
-aliases:
- - /rancher/v2.x/en/security/rancher-2.5/1.5-hardening-2.5/
---
This document provides prescriptive guidance for hardening a production installation of a RKE cluster to be used with Rancher v2.5. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS).
@@ -65,7 +62,7 @@ services:
```
#### Set `automountServiceAccountToken` to `false` for `default` service accounts
-Kubernetes provides a default service account which is used by cluster workloads where no specific service account is assigned to the pod. Where access to the Kubernetes API from a pod is required, a specific service account should be created for that pod, and rights granted to that service account. The default service account should be configured such that it does not provide a service account token and does not have any explicit rights assignments.
+Kubernetes provides a default service account which is used by cluster workloads where no specific service account is assigned to the pod. Where access to the Kubernetes API from a pod is required, a specific service account should be created for that pod, and rights granted to that service account. The default service account should be configured such that it does not provide a service account token and does not have any explicit rights assignments.
For each namespace including **default** and **kube-system** on a standard RKE install the **default** service account must include this value:
diff --git a/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/hardening-guide-with-cis-v1.6-benchmark.md b/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/hardening-guide-with-cis-v1.6-benchmark.md
index 448babc1ce2..cfb0822798e 100644
--- a/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/hardening-guide-with-cis-v1.6-benchmark.md
+++ b/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/hardening-guide-with-cis-v1.6-benchmark.md
@@ -1,8 +1,5 @@
---
title: Hardening Guide with CIS 1.6 Benchmark
-weight: 100
-aliases:
- - /rancher/v2.x/en/security/rancher-2.5/1.6-hardening-2.5/
---
This document provides prescriptive guidance for hardening a production installation of a RKE cluster to be used with Rancher v2.5.4. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS).
@@ -67,7 +64,7 @@ services:
```
#### Set `automountServiceAccountToken` to `false` for `default` service accounts
-Kubernetes provides a default service account which is used by cluster workloads where no specific service account is assigned to the pod. Where access to the Kubernetes API from a pod is required, a specific service account should be created for that pod, and rights granted to that service account. The default service account should be configured such that it does not provide a service account token and does not have any explicit rights assignments.
+Kubernetes provides a default service account which is used by cluster workloads where no specific service account is assigned to the pod. Where access to the Kubernetes API from a pod is required, a specific service account should be created for that pod, and rights granted to that service account. The default service account should be configured such that it does not provide a service account token and does not have any explicit rights assignments.
For each namespace including **default** and **kube-system** on a standard RKE install the **default** service account must include this value:
@@ -431,48 +428,48 @@ RKE Templates are used to provision Kubernetes and define Rancher settings. Foll
[documentaion](https://rancher.com/docs/rancher/v2.5/en/installation) for additional installation and RKE Template details.
```yaml
-#
+#
# Cluster Config
-#
+#
default_pod_security_policy_template_id: restricted
docker_root_dir: /var/lib/docker
enable_cluster_alerting: false
enable_cluster_monitoring: false
enable_network_policy: true
-#
+#
# Rancher Config
-#
+#
rancher_kubernetes_engine_config:
addon_job_timeout: 45
ignore_docker_version: true
kubernetes_version: v1.18.12-rancher1-1
-#
+#
# If you are using calico on AWS
-#
+#
# network:
# plugin: calico
# calico_network_provider:
# cloud_provider: aws
-#
+#
# # To specify flannel interface
-#
+#
# network:
# plugin: flannel
# flannel_network_provider:
# iface: eth1
-#
+#
# # To specify flannel interface for canal plugin
-#
+#
# network:
# plugin: canal
# canal_network_provider:
# iface: eth1
-#
+#
network:
mtu: 0
plugin: canal
rotate_encryption_key: false
-#
+#
# services:
# kube-api:
# service_cluster_ip_range: 10.43.0.0/16
@@ -482,7 +479,7 @@ rancher_kubernetes_engine_config:
# kubelet:
# cluster_domain: cluster.local
# cluster_dns_server: 10.43.0.10
-#
+#
services:
etcd:
backup_config:
diff --git a/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/self-assessment-guide-with-cis-v1.5-benchmark.md b/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/self-assessment-guide-with-cis-v1.5-benchmark.md
index 07859da7ca8..c39f35e1121 100644
--- a/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/self-assessment-guide-with-cis-v1.5-benchmark.md
+++ b/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/self-assessment-guide-with-cis-v1.5-benchmark.md
@@ -1,8 +1,5 @@
---
title: CIS 1.5 Benchmark - Self-Assessment Guide - Rancher v2.5
-weight: 201
-aliases:
- - /rancher/v2.x/en/security/rancher-2.5/1.5-benchmark-2.5/
---
### CIS v1.5 Kubernetes Benchmark - Rancher v2.5 with Kubernetes v1.15
diff --git a/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/self-assessment-guide-with-cis-v1.6-benchmark.md b/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/self-assessment-guide-with-cis-v1.6-benchmark.md
index f34e1ba7984..326c427a7fc 100644
--- a/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/self-assessment-guide-with-cis-v1.6-benchmark.md
+++ b/versioned_docs/version-2.5/reference-guides/rancher-security/rancher-v2.5-hardening-guides/self-assessment-guide-with-cis-v1.6-benchmark.md
@@ -1,8 +1,5 @@
---
title: CIS 1.6 Benchmark - Self-Assessment Guide - Rancher v2.5.4
-weight: 101
-aliases:
- - /rancher/v2.x/en/security/rancher-2.5/1.6-benchmark-2.5/
---
### CIS 1.6 Kubernetes Benchmark - Rancher v2.5.4 with Kubernetes v1.18
diff --git a/versioned_docs/version-2.5/reference-guides/rancher-security/security-advisories-and-cves.md b/versioned_docs/version-2.5/reference-guides/rancher-security/security-advisories-and-cves.md
index 616db48dba7..2e28da93979 100644
--- a/versioned_docs/version-2.5/reference-guides/rancher-security/security-advisories-and-cves.md
+++ b/versioned_docs/version-2.5/reference-guides/rancher-security/security-advisories-and-cves.md
@@ -1,6 +1,5 @@
---
title: Security Advisories and CVEs
-weight: 300
---
Rancher is committed to informing the community of security issues in our products. Rancher will publish security advisories and CVEs (Common Vulnerabilities and Exposures) for issues we have resolved. New security advisories are also published in Rancher's GitHub [security page](https://github.com/rancher/rancher/security/advisories).
diff --git a/versioned_docs/version-2.5/reference-guides/rke1-template-example-yaml.md b/versioned_docs/version-2.5/reference-guides/rke1-template-example-yaml.md
index a8461993993..d14e3863ff9 100644
--- a/versioned_docs/version-2.5/reference-guides/rke1-template-example-yaml.md
+++ b/versioned_docs/version-2.5/reference-guides/rke1-template-example-yaml.md
@@ -1,8 +1,5 @@
---
title: RKE1 Example YAML
-weight: 60
-aliases:
- - /rancher/v2.x/en/admin-settings/rke-templates/example-yaml/
---
Below is an example RKE template configuration file for reference.
@@ -10,9 +7,9 @@ Below is an example RKE template configuration file for reference.
The YAML in the RKE template uses the same customization that is used when you create an RKE cluster. However, since the YAML is within the context of a Rancher provisioned RKE cluster, the customization from the RKE docs needs to be nested under the `rancher_kubernetes_engine` directive.
```yaml
-#
+#
# Cluster Config
-#
+#
docker_root_dir: /var/lib/docker
enable_cluster_alerting: false
@@ -22,7 +19,7 @@ enable_cluster_alerting: false
# but end users could still turn alerting
# on or off.
-enable_cluster_monitoring: true
+enable_cluster_monitoring: true
# This setting is not enforced. Clusters
# created with this sample template
# would have monitoring turned on
@@ -32,54 +29,54 @@ enable_cluster_monitoring: true
enable_network_policy: false
local_cluster_auth_endpoint:
enabled: true
-#
+#
# Rancher Config
-#
+#
rancher_kubernetes_engine_config: # Your RKE template config goes here.
addon_job_timeout: 30
authentication:
strategy: x509
ignore_docker_version: true
-#
+#
# # Currently only nginx ingress provider is supported.
# # To disable ingress controller, set `provider: none`
# # To enable ingress on specific nodes, use the node_selector, eg:
# provider: nginx
# node_selector:
# app: ingress
-#
+#
ingress:
provider: nginx
kubernetes_version: v1.15.3-rancher3-1
monitoring:
provider: metrics-server
-#
+#
# If you are using calico on AWS
-#
+#
# network:
# plugin: calico
# calico_network_provider:
# cloud_provider: aws
-#
+#
# # To specify flannel interface
-#
+#
# network:
# plugin: flannel
# flannel_network_provider:
# iface: eth1
-#
+#
# # To specify flannel interface for canal plugin
-#
+#
# network:
# plugin: canal
# canal_network_provider:
# iface: eth1
-#
+#
network:
options:
flannel_backend_type: vxlan
plugin: canal
-#
+#
# services:
# kube-api:
# service_cluster_ip_range: 10.43.0.0/16
@@ -89,7 +86,7 @@ rancher_kubernetes_engine_config: # Your RKE template config goes here.
# kubelet:
# cluster_domain: cluster.local
# cluster_dns_server: 10.43.0.10
-#
+#
services:
etcd:
backup_config:
diff --git a/versioned_docs/version-2.5/reference-guides/single-node-rancher-in-docker/advanced-options.md b/versioned_docs/version-2.5/reference-guides/single-node-rancher-in-docker/advanced-options.md
index b258c89743d..c4a1cd469d9 100644
--- a/versioned_docs/version-2.5/reference-guides/single-node-rancher-in-docker/advanced-options.md
+++ b/versioned_docs/version-2.5/reference-guides/single-node-rancher-in-docker/advanced-options.md
@@ -1,8 +1,5 @@
---
title: Advanced Options for Docker Installs
-weight: 5
-aliases:
- - /rancher/v2.x/en/installation/other-installation-methods/single-node-docker/advanced/
---
When installing Rancher, there are several [advanced options](../../pages-for-subheaders/resources.md) that can be enabled:
diff --git a/versioned_docs/version-2.5/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md b/versioned_docs/version-2.5/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md
index 6d36af6c34a..ec8876fa237 100644
--- a/versioned_docs/version-2.5/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md
+++ b/versioned_docs/version-2.5/reference-guides/single-node-rancher-in-docker/http-proxy-configuration.md
@@ -1,10 +1,5 @@
---
title: HTTP Proxy Configuration
-weight: 251
-aliases:
- - /rancher/v2.5/en/installation/proxy-configuration/
- - /rancher/v2.5/en/installation/single-node/proxy
- - /rancher/v2.x/en/installation/other-installation-methods/single-node-docker/proxy/
---
If you operate Rancher behind a proxy and you want to access services through the proxy (such as retrieving catalogs), you must provide Rancher information about your proxy. As Rancher is written in Go, it uses the common proxy environment variables as shown below.
diff --git a/versioned_docs/version-2.5/reference-guides/system-tools.md b/versioned_docs/version-2.5/reference-guides/system-tools.md
index 717e292c173..96add4fc939 100644
--- a/versioned_docs/version-2.5/reference-guides/system-tools.md
+++ b/versioned_docs/version-2.5/reference-guides/system-tools.md
@@ -1,8 +1,5 @@
---
title: System Tools
-weight: 22
-aliases:
- - /rancher/v2.x/en/system-tools/
---
System Tools is a tool to perform operational tasks on [Rancher Launched Kubernetes](../pages-for-subheaders/launch-kubernetes-with-rancher.md) clusters or [installations of Rancher on an RKE cluster.](../pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md) The tasks include:
diff --git a/versioned_docs/version-2.5/reference-guides/user-settings/api-keys.md b/versioned_docs/version-2.5/reference-guides/user-settings/api-keys.md
index e7edf999535..f55cb995366 100644
--- a/versioned_docs/version-2.5/reference-guides/user-settings/api-keys.md
+++ b/versioned_docs/version-2.5/reference-guides/user-settings/api-keys.md
@@ -1,10 +1,5 @@
---
title: API Keys
-weight: 7005
-aliases:
- - /rancher/v2.5/en/concepts/api-keys/
- - /rancher/v2.5/en/tasks/user-settings/api-keys/
- - /rancher/v2.x/en/user-settings/api-keys/
---
## API Keys and User Authentication
@@ -31,7 +26,7 @@ API Keys are composed of four components:
The API key won't be valid after expiration. Shorter expiration periods are more secure.
Expiration period will be bound by `v3/settings/auth-token-max-ttl-minutes`. If it exceeds the max-ttl, API key will be created with max-ttl as the expiration period.
-
+
A scope will limit the API key so that it will only work against the Kubernetes API of the specified cluster. If the cluster is configured with an Authorized Cluster Endpoint, you will be able to use a scoped token directly against the cluster's API without proxying through the Rancher server. See [Authorized Cluster Endpoints](../../pages-for-subheaders/rancher-manager-architecture.md#4-authorized-cluster-endpoint) for more information.
4. Click **Create**.
diff --git a/versioned_docs/version-2.5/reference-guides/user-settings/manage-cloud-credentials.md b/versioned_docs/version-2.5/reference-guides/user-settings/manage-cloud-credentials.md
index c82026fe6b0..0932d726a76 100644
--- a/versioned_docs/version-2.5/reference-guides/user-settings/manage-cloud-credentials.md
+++ b/versioned_docs/version-2.5/reference-guides/user-settings/manage-cloud-credentials.md
@@ -1,8 +1,5 @@
---
title: Managing Cloud Credentials
-weight: 7011
-aliases:
- - /rancher/v2.x/en/user-settings/cloud-credentials/
---
When you create a cluster [hosted by an infrastructure provider](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md), [node templates](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) are used to provision the cluster nodes. These templates use Docker Machine configuration options to define an operating system image and settings/parameters for the node.
@@ -31,7 +28,7 @@ All cloud credentials are bound to the user profile of who created it. They **ca
## Updating a Cloud Credential
-When access credentials are changed or compromised, updating a cloud credential allows you to rotate those credentials while keeping the same node template.
+When access credentials are changed or compromised, updating a cloud credential allows you to rotate those credentials while keeping the same node template.
1. From your user settings, select **User Avatar > Cloud Credentials**.
1. Choose the cloud credential you want to edit and click the **⋮ > Edit**.
diff --git a/versioned_docs/version-2.5/reference-guides/user-settings/manage-node-templates.md b/versioned_docs/version-2.5/reference-guides/user-settings/manage-node-templates.md
index 96e9a7f43c8..be9e6b32133 100644
--- a/versioned_docs/version-2.5/reference-guides/user-settings/manage-node-templates.md
+++ b/versioned_docs/version-2.5/reference-guides/user-settings/manage-node-templates.md
@@ -1,8 +1,5 @@
---
title: Managing Node Templates
-weight: 7010
-aliases:
- - /rancher/v2.x/en/user-settings/node-templates/
---
When you provision a cluster [hosted by an infrastructure provider](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md), [node templates](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) are used to provision the cluster nodes. These templates use Docker Machine configuration options to define an operating system image and settings/parameters for the node. You can create node templates in two contexts:
@@ -26,7 +23,7 @@ When you create a node template, it is bound to your user profile. Node template
1. Choose the node template that you want to edit and click the **⋮ > Edit**.
:::note
-
+
As of v2.2.0, the default `active` [node drivers](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md) and any node driver, that has fields marked as `password`, are required to use [cloud credentials](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#cloud-credentials). If you have upgraded to v2.2.0, existing node templates will continue to work with the previous account access information, but when you edit the node template, you will be required to create a cloud credential and the node template will start using it.
:::
diff --git a/versioned_docs/version-2.5/reference-guides/user-settings/user-preferences.md b/versioned_docs/version-2.5/reference-guides/user-settings/user-preferences.md
index 679376e6086..4b56443103f 100644
--- a/versioned_docs/version-2.5/reference-guides/user-settings/user-preferences.md
+++ b/versioned_docs/version-2.5/reference-guides/user-settings/user-preferences.md
@@ -1,8 +1,5 @@
---
title: User Preferences
-weight: 7012
-aliases:
- - /rancher/v2.x/en/user-settings/preferences/
---
import Tabs from '@theme/Tabs';
diff --git a/versioned_docs/version-2.5/security/security-scan/security-scan.md b/versioned_docs/version-2.5/security/security-scan/security-scan.md
index 28e59b6b0d2..7c9c5a3ce48 100644
--- a/versioned_docs/version-2.5/security/security-scan/security-scan.md
+++ b/versioned_docs/version-2.5/security/security-scan/security-scan.md
@@ -1,6 +1,5 @@
---
title: Security Scans
-weight: 299
---
The documentation about CIS security scans has moved [here.](../../pages-for-subheaders/cis-scan-guides.md)
diff --git a/versioned_docs/version-2.5/troubleshooting.md b/versioned_docs/version-2.5/troubleshooting.md
index d280c7459fc..426109d6a3a 100644
--- a/versioned_docs/version-2.5/troubleshooting.md
+++ b/versioned_docs/version-2.5/troubleshooting.md
@@ -1,8 +1,5 @@
---
title: Troubleshooting
-weight: 26
-aliases:
- - /rancher/v2.x/en/troubleshooting/
---
This section contains information to help you troubleshoot issues when using Rancher.
diff --git a/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md b/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md
index 4e1425e7706..6f45a7a5b86 100644
--- a/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md
+++ b/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-controlplane-nodes.md
@@ -1,8 +1,5 @@
---
title: Troubleshooting Controlplane Nodes
-weight: 2
-aliases:
- - /rancher/v2.x/en/troubleshooting/kubernetes-components/controlplane/
---
This section applies to nodes with the `controlplane` role.
diff --git a/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md b/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md
index 4b7171724f8..aaf9fcc493d 100644
--- a/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md
+++ b/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-etcd-nodes.md
@@ -1,8 +1,5 @@
---
title: Troubleshooting etcd Nodes
-weight: 1
-aliases:
- - /rancher/v2.x/en/troubleshooting/kubernetes-components/etcd/
---
This section contains commands and tips for troubleshooting nodes with the `etcd` role.
diff --git a/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md b/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md
index 7f9a61ba1db..d7cde4f794e 100644
--- a/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md
+++ b/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-nginx-proxy.md
@@ -1,8 +1,5 @@
---
title: Troubleshooting nginx-proxy
-weight: 3
-aliases:
- - /rancher/v2.x/en/troubleshooting/kubernetes-components/nginx-proxy/
---
The `nginx-proxy` container is deployed on every node that does not have the `controlplane` role. It provides access to all the nodes with the `controlplane` role by dynamically generating the NGINX configuration based on available nodes with the `controlplane` role.
@@ -44,11 +41,11 @@ events {
stream {
upstream kube_apiserver {
-
+
server ip_of_controlplane_node1:6443;
-
+
server ip_of_controlplane_node2:6443;
-
+
}
server {
diff --git a/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md b/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md
index 133d452428f..6d3a8bd7fcd 100644
--- a/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md
+++ b/versioned_docs/version-2.5/troubleshooting/kubernetes-components/troubleshooting-worker-nodes-and-generic-components.md
@@ -1,8 +1,5 @@
---
title: Troubleshooting Worker Nodes and Generic Components
-weight: 4
-aliases:
- - /rancher/v2.x/en/troubleshooting/kubernetes-components/worker-and-generic/
---
This section applies to every node as it includes components that run on nodes with any role.
diff --git a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/dns.md b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/dns.md
index 344343007a4..f6dd580a5a2 100644
--- a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/dns.md
+++ b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/dns.md
@@ -1,8 +1,5 @@
---
title: DNS
-weight: 103
-aliases:
- - /rancher/v2.x/en/troubleshooting/dns/
---
The commands/steps listed on this page can be used to check name resolution issues in your cluster.
diff --git a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md
index 8e586f81ae2..bd090b57a55 100644
--- a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md
+++ b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md
@@ -1,6 +1,5 @@
---
title: Rotation of Expired Webhook Certificates
-weight: 120
---
For Rancher versions that have `rancher-webhook` installed, certain versions created certificates that will expire after one year. It will be necessary for you to rotate your webhook certificate if the certificate did not renew.
diff --git a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md
index 2ea4cf628ba..849fba9dd57 100644
--- a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md
+++ b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/kubernetes-resources.md
@@ -1,8 +1,5 @@
---
title: Kubernetes resources
-weight: 101
-aliases:
- - /rancher/v2.x/en/troubleshooting/kubernetes-resources/
---
The commands/steps listed on this page can be used to check the most important Kubernetes resources and apply to [Rancher Launched Kubernetes](../../pages-for-subheaders/launch-kubernetes-with-rancher.md) clusters.
@@ -24,7 +21,7 @@ Run the command below and check the following:
```
kubectl get nodes -o wide
-```
+```
Example output:
diff --git a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/logging.md b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/logging.md
index 64326f15a15..89bfb3098db 100644
--- a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/logging.md
+++ b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/logging.md
@@ -1,8 +1,5 @@
---
title: Logging
-weight: 110
-aliases:
- - /rancher/v2.x/en/troubleshooting/logging/
---
The following log levels are used in Rancher:
diff --git a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/networking.md b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/networking.md
index ff1efadd61b..629a18bb127 100644
--- a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/networking.md
+++ b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/networking.md
@@ -1,8 +1,5 @@
---
title: Networking
-weight: 102
-aliases:
- - /rancher/v2.x/en/troubleshooting/networking/
---
The commands/steps listed on this page can be used to check networking related issues in your cluster.
@@ -54,7 +51,7 @@ To test the overlay network, you can launch the following `DaemonSet` definition
#!/bin/bash
echo "=> Start network overlay test"
kubectl get pods -l name=overlaytest -o jsonpath='{range .items[*]}{@.metadata.name}{" "}{@.spec.nodeName}{"\n"}{end}' |
- while read spod shost
+ while read spod shost
do kubectl get pods -l name=overlaytest -o jsonpath='{range .items[*]}{@.status.podIP}{" "}{@.spec.nodeName}{"\n"}{end}' |
while read tip thost
do kubectl --request-timeout='10s' exec $spod -c overlaytest -- /bin/sh -c "ping -c2 $tip > /dev/null 2>&1"
diff --git a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/rancher-ha.md b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/rancher-ha.md
index a7f74be3f5c..6bfef988bd4 100644
--- a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/rancher-ha.md
+++ b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/rancher-ha.md
@@ -1,8 +1,5 @@
---
title: Rancher HA
-weight: 104
-aliases:
- - /rancher/v2.x/en/troubleshooting/rancherha/
---
The commands/steps listed on this page can be used to check your Rancher Kubernetes Installation.
@@ -28,7 +25,7 @@ rancher-7dbd7875f7-qbj5k 1/1 Running 0 8m x.x.x.x x.x.x.
rancher-7dbd7875f7-qw7wb 1/1 Running 0 8m x.x.x.x x.x.x.x
```
-If a pod is unable to run (Status is not **Running**, Ready status is not showing `1/1` or you see a high count of Restarts), check the pod details, logs and namespace events.
+If a pod is unable to run (Status is not **Running**, Ready status is not showing `1/1` or you see a high count of Restarts), check the pod details, logs and namespace events.
#### Pod details
diff --git a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/registered-clusters.md b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/registered-clusters.md
index 533771973b9..fcea8fb6634 100644
--- a/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/registered-clusters.md
+++ b/versioned_docs/version-2.5/troubleshooting/other-troubleshooting-tips/registered-clusters.md
@@ -1,8 +1,5 @@
---
title: Registered clusters
-weight: 105
-aliases:
- - /rancher/v2.x/en/troubleshooting/imported-clusters/
---
The commands/steps listed on this page can be used to check clusters that you are registering or that are registered in Rancher.
@@ -13,7 +10,7 @@ Make sure you configured the correct kubeconfig (for example, `export KUBECONFIG
Communication to the cluster (Kubernetes API via cattle-cluster-agent) and communication to the nodes is done through Rancher agents.
-If the cattle-cluster-agent cannot connect to the configured `server-url`, the cluster will remain in **Pending** state, showing `Waiting for full cluster configuration`.
+If the cattle-cluster-agent cannot connect to the configured `server-url`, the cluster will remain in **Pending** state, showing `Waiting for full cluster configuration`.
#### cattle-node-agent