From 7a0c509006d820efe2177c962f7589bc055820d3 Mon Sep 17 00:00:00 2001 From: Kevin A Date: Fri, 10 Feb 2023 08:53:06 -0800 Subject: [PATCH 01/36] Updated aws-marketplace.md description and links to include GSG and Video --- .../deploy-rancher-manager/aws-marketplace.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 495ce94086a..409ab859f36 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 @@ -3,4 +3,4 @@ title: Rancher AWS Marketplace Quick Start description: Use Amazon EKS to deploy Rancher server. --- -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-go7ent7goo5ae). +You can now quickly deploy Rancher server in AWS by using Amazon EKS. To learn more, see our [Amazon Marketplace listing](https://aws.amazon.com/marketplace/pp/prodview-go7ent7goo5ae) or review the [Getting Started Guide] (https://documentation.suse.com/trd/kubernetes/single-html/gs_rancher_aws-marketplace/) in SUSE official docs, or watch the [Demo Video] (https://youtu.be/9dznJ7Ons0M) to be walked through the process. From 918fcc9d13cf56a8cdb0aa6041866128fce7da73 Mon Sep 17 00:00:00 2001 From: Marty Hernandez Avedon Date: Mon, 13 Feb 2023 13:50:52 -0500 Subject: [PATCH 02/36] copyedit of proposed content --- .../deploy-rancher-manager/aws-marketplace.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 409ab859f36..dad10f65d1d 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 @@ -3,4 +3,4 @@ title: Rancher AWS Marketplace Quick Start description: Use Amazon EKS to deploy Rancher server. --- -You can now quickly deploy Rancher server in AWS by using Amazon EKS. To learn more, see our [Amazon Marketplace listing](https://aws.amazon.com/marketplace/pp/prodview-go7ent7goo5ae) or review the [Getting Started Guide] (https://documentation.suse.com/trd/kubernetes/single-html/gs_rancher_aws-marketplace/) in SUSE official docs, or watch the [Demo Video] (https://youtu.be/9dznJ7Ons0M) to be walked through the process. +Amazon Elastic Kubernetes Service (EKS) can quickly [deploy Rancher to Amazon Web Services (AWS)](https://documentation.suse.com/trd/kubernetes/single-html/gs_rancher_aws-marketplace/). To learn more, see our [Amazon Marketplace listing](https://aws.amazon.com/marketplace/pp/prodview-go7ent7goo5ae). Watch the [demo] (https://youtu.be/9dznJ7Ons0M) for a walkthrough of AWS Marketplace SUSE Rancher setup. From 2ebd008bf2df28bfa4c4258cf6569262c84c9929 Mon Sep 17 00:00:00 2001 From: martyav Date: Wed, 15 Feb 2023 14:37:17 -0500 Subject: [PATCH 03/36] #403 - Clarifying steps for setting resource quota --- .../manage-project-resource-quotas.md | 10 +++++++++- ...-project-config-for-resource-quotas-dots.png | Bin 0 -> 41230 bytes ...fig-for-resource-quotas-group-by-project.png | Bin 0 -> 40951 bytes 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100755 static/img/edit-project-config-for-resource-quotas-dots.png create mode 100755 static/img/edit-project-config-for-resource-quotas-group-by-project.png diff --git a/docs/pages-for-subheaders/manage-project-resource-quotas.md b/docs/pages-for-subheaders/manage-project-resource-quotas.md index 7110306ba7a..f0fba6aeac8 100644 --- a/docs/pages-for-subheaders/manage-project-resource-quotas.md +++ b/docs/pages-for-subheaders/manage-project-resource-quotas.md @@ -20,7 +20,15 @@ Edit resource quotas when: 1. In the upper left corner, click **☰ > Cluster Management**. 1. On the **Clusters** page, go to the cluster where you want to apply a resource quota and click **Explore**. 1. Click **Cluster > Projects/Namespaces**. -1. Find the project that you want to add a resource quota to. From that project, select **⋮ > Edit Config**. +1. Make sure that the **Projects/Namespaces** page is in **Group by Project** view mode. ++ +![Screenshot highlighting the "Group by Project" icon, above the list of projects. It resembles a folder.](/img/edit-project-config-for-resource-quotas-group-by-project.png) + +1. Find the project that you want to add a resource quota to, and select the **⋮** that's on the same row as the project's name. ++ +![Screenshot highlighting triple dots icon at the end of the same row as the project name.](/img/edit-project-config-for-resource-quotas-dots.png) + +1. Select **Edit Config**. 1. Expand **Resource Quotas** and click **Add Resource**. Alternatively, you can edit existing quotas. diff --git a/static/img/edit-project-config-for-resource-quotas-dots.png b/static/img/edit-project-config-for-resource-quotas-dots.png new file mode 100755 index 0000000000000000000000000000000000000000..dbaad675cc6a33d0ddb875cdb6b4d9985f459e20 GIT binary patch literal 41230 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

hp+KiH;|6w{s`0H52ED=XCEKmPQ{ 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 Date: Wed, 15 Feb 2023 14:43:15 -0500 Subject: [PATCH 04/36] renumber for image interupts --- .../manage-project-resource-quotas.md | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pages-for-subheaders/manage-project-resource-quotas.md b/docs/pages-for-subheaders/manage-project-resource-quotas.md index f0fba6aeac8..4d20b20cb41 100644 --- a/docs/pages-for-subheaders/manage-project-resource-quotas.md +++ b/docs/pages-for-subheaders/manage-project-resource-quotas.md @@ -18,31 +18,31 @@ Edit resource quotas when: - You want to scale the resources available to a project up or down when a research quota is already in effect. 1. In the upper left corner, click **☰ > Cluster Management**. -1. On the **Clusters** page, go to the cluster where you want to apply a resource quota and click **Explore**. -1. Click **Cluster > Projects/Namespaces**. -1. Make sure that the **Projects/Namespaces** page is in **Group by Project** view mode. -+ +2. On the **Clusters** page, go to the cluster where you want to apply a resource quota and click **Explore**. +3. Click **Cluster > Projects/Namespaces**. +4. Make sure that the **Projects/Namespaces** page is in **Group by Project** view mode. + ![Screenshot highlighting the "Group by Project" icon, above the list of projects. It resembles a folder.](/img/edit-project-config-for-resource-quotas-group-by-project.png) -1. Find the project that you want to add a resource quota to, and select the **⋮** that's on the same row as the project's name. -+ +5. Find the project that you want to add a resource quota to, and select the **⋮** that's on the same row as the project's name. + ![Screenshot highlighting triple dots icon at the end of the same row as the project name.](/img/edit-project-config-for-resource-quotas-dots.png) -1. Select **Edit Config**. +6. Select **Edit Config**. -1. Expand **Resource Quotas** and click **Add Resource**. Alternatively, you can edit existing quotas. +6. Expand **Resource Quotas** and click **Add Resource**. Alternatively, you can edit existing quotas. -1. Select a Resource Type. For more information on types, see the [quota type reference.](../how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md) +7. Select a Resource Type. For more information on types, see the [quota type reference.](../how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md) -1. Enter values for the **Project Limit** and the **Namespace Default Limit**. +8. Enter values for the **Project Limit** and the **Namespace Default Limit**. | Field | Description | | ----------------------- | -------------------------------------------------------------------------------------------------------- | | Project Limit | The overall resource limit for the project. | | Namespace Default Limit | The default resource limit available for each namespace. This limit is propagated to each namespace in the project. The combined limit of all project namespaces shouldn't exceed the project limit. | -1. **Optional:** Add more quotas. +9. **Optional:** Add more quotas. -1. Click **Create**. +10. Click **Create**. **Result:** The resource quota is applied to your project and namespaces. When you add more namespaces in the future, Rancher validates that the project can accommodate the namespace. If the project can't allocate the resources, you may still create namespaces, but they will be given a resource quota of 0. Subsequently, Rancher will not allow you to create any resources restricted by this quota. From 231ae9c2d3331e48c48df035b8aee8eada2a5ae9 Mon Sep 17 00:00:00 2001 From: martyav Date: Wed, 15 Feb 2023 14:48:28 -0500 Subject: [PATCH 05/36] indenting images to continue list --- .../manage-project-resource-quotas.md | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/docs/pages-for-subheaders/manage-project-resource-quotas.md b/docs/pages-for-subheaders/manage-project-resource-quotas.md index 4d20b20cb41..f6023c0f608 100644 --- a/docs/pages-for-subheaders/manage-project-resource-quotas.md +++ b/docs/pages-for-subheaders/manage-project-resource-quotas.md @@ -18,31 +18,29 @@ Edit resource quotas when: - You want to scale the resources available to a project up or down when a research quota is already in effect. 1. In the upper left corner, click **☰ > Cluster Management**. -2. On the **Clusters** page, go to the cluster where you want to apply a resource quota and click **Explore**. -3. Click **Cluster > Projects/Namespaces**. -4. Make sure that the **Projects/Namespaces** page is in **Group by Project** view mode. +1. On the **Clusters** page, go to the cluster where you want to apply a resource quota and click **Explore**. +1. Click **Cluster > Projects/Namespaces**. +1. Make sure that the **Projects/Namespaces** page is in **Group by Project** view mode. + ![Screenshot highlighting the "Group by Project" icon, above the list of projects. It resembles a folder.](/img/edit-project-config-for-resource-quotas-group-by-project.png) -![Screenshot highlighting the "Group by Project" icon, above the list of projects. It resembles a folder.](/img/edit-project-config-for-resource-quotas-group-by-project.png) +1. Find the project that you want to add a resource quota to, and select the **⋮** that's on the same row as the project's name. + ![Screenshot highlighting triple dots icon at the end of the same row as the project name.](/img/edit-project-config-for-resource-quotas-dots.png) -5. Find the project that you want to add a resource quota to, and select the **⋮** that's on the same row as the project's name. +1. Select **Edit Config**. -![Screenshot highlighting triple dots icon at the end of the same row as the project name.](/img/edit-project-config-for-resource-quotas-dots.png) +1. Expand **Resource Quotas** and click **Add Resource**. Alternatively, you can edit existing quotas. -6. Select **Edit Config**. +1. Select a Resource Type. For more information on types, see the [quota type reference.](../how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md) -6. Expand **Resource Quotas** and click **Add Resource**. Alternatively, you can edit existing quotas. - -7. Select a Resource Type. For more information on types, see the [quota type reference.](../how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types.md) - -8. Enter values for the **Project Limit** and the **Namespace Default Limit**. +1. Enter values for the **Project Limit** and the **Namespace Default Limit**. | Field | Description | | ----------------------- | -------------------------------------------------------------------------------------------------------- | | Project Limit | The overall resource limit for the project. | | Namespace Default Limit | The default resource limit available for each namespace. This limit is propagated to each namespace in the project. The combined limit of all project namespaces shouldn't exceed the project limit. | -9. **Optional:** Add more quotas. +1. **Optional:** Add more quotas. -10. Click **Create**. +1. Click **Create**. **Result:** The resource quota is applied to your project and namespaces. When you add more namespaces in the future, Rancher validates that the project can accommodate the namespace. If the project can't allocate the resources, you may still create namespaces, but they will be given a resource quota of 0. Subsequently, Rancher will not allow you to create any resources restricted by this quota. From 1fd6a63c3aed3e5dd902d5ce280bd569170f7aae Mon Sep 17 00:00:00 2001 From: Gabriel Blais-Duchesne <113549084+suse-gabrielblais@users.noreply.github.com> Date: Thu, 16 Feb 2023 11:23:12 -0500 Subject: [PATCH 06/36] Add details for empty folder field in S3 backups --- .../backup-restore-configuration/backup-configuration.md | 4 ++-- .../backup-restore-configuration/storage-configuration.md | 2 +- .../backup-restore-configuration/backup-configuration.md | 4 ++-- .../backup-restore-configuration/storage-configuration.md | 2 +- .../backup-restore-configuration/backup-configuration.md | 4 ++-- .../backup-restore-configuration/storage-configuration.md | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/reference-guides/backup-restore-configuration/backup-configuration.md b/docs/reference-guides/backup-restore-configuration/backup-configuration.md index 9b544f3777f..b549941c6a6 100644 --- a/docs/reference-guides/backup-restore-configuration/backup-configuration.md +++ b/docs/reference-guides/backup-restore-configuration/backup-configuration.md @@ -73,7 +73,7 @@ The S3 storage location contains the following configuration fields: 1. **Credential Secret** (optional): If you need to use the AWS Access keys Secret keys to access s3 bucket, create a secret with your credentials with keys and the directives `accessKey` and `secretKey`. It can be in any namespace. An example secret is [here.](#example-credentialsecret) This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) The Credential Secret dropdown lists the secrets in all namespaces. 1. **Bucket Name**: The name of the S3 bucket where backup files will be stored. 1. **Region** (optional): The AWS [region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. This field isn't needed for configuring MinIO. -1. **Folder** (optional): The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. +1. **Folder** (optional): The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. An empty value will store the backup files in the root folder of the S3 bucket. 1. **Endpoint**: The [endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) that is used to access S3 in the region of your bucket. 1. **Endpoint CA** (optional): This should be the Base64 encoded CA cert. For an example, refer to the [example S3 compatible configuration.](#example-s3-storage-configuration) 1. **Skip TLS Verifications** (optional): Set to true if you are not using TLS. @@ -84,7 +84,7 @@ The S3 storage location contains the following configuration fields: | `credentialSecretName` | If you need to use the AWS Access keys Secret keys to access s3 bucket, create a secret with your credentials with keys and the directives `accessKey` and `secretKey`. It can be in any namespace as long as you provide that namespace in `credentialSecretNamespace`. An example secret is [here.](#example-credentialsecret) This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) | | | `credentialSecretNamespace` | The namespace of the secret containing the credentials to access S3. This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) | | | `bucketName` | The name of the S3 bucket where backup files will be stored. | ✓ | -| `folder` | The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. | | +| `folder` | The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. An empty value will store the backup files in the root folder of the S3 bucket. | | | `region` | The AWS [region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. | ✓ | | `endpoint` | The [endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) that is used to access S3 in the region of your bucket. | ✓ | | `endpointCA` | This should be the Base64 encoded CA cert. For an example, refer to the [example S3 compatible configuration.](#example-s3-storage-configuration) | | diff --git a/docs/reference-guides/backup-restore-configuration/storage-configuration.md b/docs/reference-guides/backup-restore-configuration/storage-configuration.md index 96271a64862..f29a424dc06 100644 --- a/docs/reference-guides/backup-restore-configuration/storage-configuration.md +++ b/docs/reference-guides/backup-restore-configuration/storage-configuration.md @@ -20,7 +20,7 @@ You can choose to not have any operator-level storage location configured. If yo | Credential Secret | Choose the credentials for S3 from your secrets in Rancher. [Example](examples.md#example-credential-secret-for-storing-backups-in-s3). | | Bucket Name | Enter the name of the [S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html) where the backups will be stored. Default: `rancherbackups`. | | Region | The [AWS region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. | -| Folder | The [folder in the S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html) where the backups will be stored. | +| Folder | The [folder in the S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html) where the backups will be stored. An empty value will store the backup files in the root folder of the S3 bucket. | | Endpoint | The [S3 endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) For example, `s3.us-west-2.amazonaws.com`. | | Endpoint CA | The CA cert used to for the S3 endpoint. Default: base64 encoded CA cert | | insecureTLSSkipVerify | Set to true if you are not using TLS. | diff --git a/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/backup-configuration.md b/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/backup-configuration.md index f542ba2065a..63a704f8e7c 100644 --- a/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/backup-configuration.md +++ b/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/backup-configuration.md @@ -74,7 +74,7 @@ The S3 storage location contains the following configuration fields: 1. **Credential Secret** (optional): If you need to use the AWS Access keys Secret keys to access s3 bucket, create a secret with your credentials with keys and the directives `accessKey` and `secretKey`. It can be in any namespace. An example secret is [here.](#example-credentialsecret) This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) The Credential Secret dropdown lists the secrets in all namespaces. 1. **Bucket Name**: The name of the S3 bucket where backup files will be stored. 1. **Region** (optional): The AWS [region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. This field isn't needed for configuring MinIO. -1. **Folder** (optional): The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. +1. **Folder** (optional): The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. An empty value will store the backup files in the root folder of the S3 bucket. 1. **Endpoint**: The [endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) that is used to access S3 in the region of your bucket. 1. **Endpoint CA** (optional): This should be the Base64 encoded CA cert. For an example, refer to the [example S3 compatible configuration.](#example-s3-storage-configuration) 1. **Skip TLS Verifications** (optional): Set to true if you are not using TLS. @@ -85,7 +85,7 @@ The S3 storage location contains the following configuration fields: | `credentialSecretName` | If you need to use the AWS Access keys Secret keys to access s3 bucket, create a secret with your credentials with keys and the directives `accessKey` and `secretKey`. It can be in any namespace as long as you provide that namespace in `credentialSecretNamespace`. An example secret is [here.](#example-credentialsecret) This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) | | | `credentialSecretNamespace` | The namespace of the secret containing the credentials to access S3. This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) | | | `bucketName` | The name of the S3 bucket where backup files will be stored. | ✓ | -| `folder` | The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. | | +| `folder` | The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. An empty value will store the backup files in the root folder of the S3 bucket. | | | `region` | The AWS [region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. | ✓ | | `endpoint` | The [endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) that is used to access S3 in the region of your bucket. | ✓ | | `endpointCA` | This should be the Base64 encoded CA cert. For an example, refer to the [example S3 compatible configuration.](#example-s3-storage-configuration) | | diff --git a/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/storage-configuration.md b/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/storage-configuration.md index e5dc39c8dd1..d1108acbabf 100644 --- a/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/storage-configuration.md +++ b/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/storage-configuration.md @@ -20,7 +20,7 @@ You can choose to not have any operator-level storage location configured. If yo | Credential Secret | Choose the credentials for S3 from your secrets in Rancher. [Example](./examples.md#example-credential-secret-for-storing-backups-in-s3). | | Bucket Name | Enter the name of the [S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html) where the backups will be stored. Default: `rancherbackups`. | | Region | The [AWS region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. | -| Folder | The [folder in the S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html) where the backups will be stored. | +| Folder | The [folder in the S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html) where the backups will be stored. An empty value will store the backup files in the root folder of the S3 bucket. | | Endpoint | The [S3 endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) For example, `s3.us-west-2.amazonaws.com`. | | Endpoint CA | The CA cert used to for the S3 endpoint. Default: base64 encoded CA cert | | insecureTLSSkipVerify | Set to true if you are not using TLS. | diff --git a/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md b/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md index 9b544f3777f..b549941c6a6 100644 --- a/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md +++ b/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md @@ -73,7 +73,7 @@ The S3 storage location contains the following configuration fields: 1. **Credential Secret** (optional): If you need to use the AWS Access keys Secret keys to access s3 bucket, create a secret with your credentials with keys and the directives `accessKey` and `secretKey`. It can be in any namespace. An example secret is [here.](#example-credentialsecret) This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) The Credential Secret dropdown lists the secrets in all namespaces. 1. **Bucket Name**: The name of the S3 bucket where backup files will be stored. 1. **Region** (optional): The AWS [region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. This field isn't needed for configuring MinIO. -1. **Folder** (optional): The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. +1. **Folder** (optional): The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. An empty value will store the backup files in the root folder of the S3 bucket. 1. **Endpoint**: The [endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) that is used to access S3 in the region of your bucket. 1. **Endpoint CA** (optional): This should be the Base64 encoded CA cert. For an example, refer to the [example S3 compatible configuration.](#example-s3-storage-configuration) 1. **Skip TLS Verifications** (optional): Set to true if you are not using TLS. @@ -84,7 +84,7 @@ The S3 storage location contains the following configuration fields: | `credentialSecretName` | If you need to use the AWS Access keys Secret keys to access s3 bucket, create a secret with your credentials with keys and the directives `accessKey` and `secretKey`. It can be in any namespace as long as you provide that namespace in `credentialSecretNamespace`. An example secret is [here.](#example-credentialsecret) This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) | | | `credentialSecretNamespace` | The namespace of the secret containing the credentials to access S3. This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) | | | `bucketName` | The name of the S3 bucket where backup files will be stored. | ✓ | -| `folder` | The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. | | +| `folder` | The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. An empty value will store the backup files in the root folder of the S3 bucket. | | | `region` | The AWS [region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. | ✓ | | `endpoint` | The [endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) that is used to access S3 in the region of your bucket. | ✓ | | `endpointCA` | This should be the Base64 encoded CA cert. For an example, refer to the [example S3 compatible configuration.](#example-s3-storage-configuration) | | diff --git a/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/storage-configuration.md b/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/storage-configuration.md index 96271a64862..f29a424dc06 100644 --- a/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/storage-configuration.md +++ b/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/storage-configuration.md @@ -20,7 +20,7 @@ You can choose to not have any operator-level storage location configured. If yo | Credential Secret | Choose the credentials for S3 from your secrets in Rancher. [Example](examples.md#example-credential-secret-for-storing-backups-in-s3). | | Bucket Name | Enter the name of the [S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html) where the backups will be stored. Default: `rancherbackups`. | | Region | The [AWS region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. | -| Folder | The [folder in the S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html) where the backups will be stored. | +| Folder | The [folder in the S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html) where the backups will be stored. An empty value will store the backup files in the root folder of the S3 bucket. | | Endpoint | The [S3 endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) For example, `s3.us-west-2.amazonaws.com`. | | Endpoint CA | The CA cert used to for the S3 endpoint. Default: base64 encoded CA cert | | insecureTLSSkipVerify | Set to true if you are not using TLS. | From 28d09737d8689b87d28eaa6908d5f46dfae9deed Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Thu, 16 Feb 2023 16:23:04 -0800 Subject: [PATCH 07/36] Fix broken links --- .../custom-resource-configuration/flows-and-clusterflows.md | 2 +- .../custom-resource-configuration/outputs-and-clusteroutputs.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 befa4c698bc..343b4188a42 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 @@ -4,7 +4,7 @@ title: Flows and ClusterFlows See the [Banzai Cloud Logging operator documentation](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. -See [Rancher Integration with Logging Services: Troubleshooting](../../../pages-for-subheaders/logging.md#The-Logging-Buffer-Overloads-Pods) for how to resolve memory problems with the logging buffer. +See [Rancher Integration with Logging Services: Troubleshooting](../../../../pages-for-subheaders/logging.md#The-Logging-Buffer-Overloads-Pods) for how to resolve memory problems with the logging buffer. - [Configuration](#configuration) - [YAML Example](#yaml-example) 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 773b7819c5f..4caba1247b2 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 @@ -4,7 +4,7 @@ title: Outputs and ClusterOutputs See the [Banzai Cloud Logging operator documentation](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. -See [Rancher Integration with Logging Services: Troubleshooting](../../../pages-for-subheaders/logging.md#The-Logging-Buffer-Overloads-Pods) for how to resolve memory problems with the logging buffer. +See [Rancher Integration with Logging Services: Troubleshooting](../../../../pages-for-subheaders/logging.md#The-Logging-Buffer-Overloads-Pods) for how to resolve memory problems with the logging buffer. ## Configuration From 4191187c09d440563a831cb7b41705cbb86dc1a2 Mon Sep 17 00:00:00 2001 From: Gabriel Blais-Duchesne Date: Fri, 17 Feb 2023 08:27:37 -0500 Subject: [PATCH 08/36] Apply rephrasing suggestion from code review Co-authored-by: Marty Hernandez Avedon --- .../backup-restore-configuration/backup-configuration.md | 2 +- .../backup-restore-configuration/storage-configuration.md | 2 +- .../backup-restore-configuration/backup-configuration.md | 2 +- .../backup-restore-configuration/storage-configuration.md | 2 +- .../backup-restore-configuration/backup-configuration.md | 2 +- .../backup-restore-configuration/storage-configuration.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/reference-guides/backup-restore-configuration/backup-configuration.md b/docs/reference-guides/backup-restore-configuration/backup-configuration.md index b549941c6a6..caa507debf8 100644 --- a/docs/reference-guides/backup-restore-configuration/backup-configuration.md +++ b/docs/reference-guides/backup-restore-configuration/backup-configuration.md @@ -73,7 +73,7 @@ The S3 storage location contains the following configuration fields: 1. **Credential Secret** (optional): If you need to use the AWS Access keys Secret keys to access s3 bucket, create a secret with your credentials with keys and the directives `accessKey` and `secretKey`. It can be in any namespace. An example secret is [here.](#example-credentialsecret) This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) The Credential Secret dropdown lists the secrets in all namespaces. 1. **Bucket Name**: The name of the S3 bucket where backup files will be stored. 1. **Region** (optional): The AWS [region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. This field isn't needed for configuring MinIO. -1. **Folder** (optional): The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. An empty value will store the backup files in the root folder of the S3 bucket. +1. **Folder** (optional): The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. If this field is left empty, the default behavior is to store the backup files in the root folder of the S3 bucket. 1. **Endpoint**: The [endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) that is used to access S3 in the region of your bucket. 1. **Endpoint CA** (optional): This should be the Base64 encoded CA cert. For an example, refer to the [example S3 compatible configuration.](#example-s3-storage-configuration) 1. **Skip TLS Verifications** (optional): Set to true if you are not using TLS. diff --git a/docs/reference-guides/backup-restore-configuration/storage-configuration.md b/docs/reference-guides/backup-restore-configuration/storage-configuration.md index f29a424dc06..e47c783458e 100644 --- a/docs/reference-guides/backup-restore-configuration/storage-configuration.md +++ b/docs/reference-guides/backup-restore-configuration/storage-configuration.md @@ -20,7 +20,7 @@ You can choose to not have any operator-level storage location configured. If yo | Credential Secret | Choose the credentials for S3 from your secrets in Rancher. [Example](examples.md#example-credential-secret-for-storing-backups-in-s3). | | Bucket Name | Enter the name of the [S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html) where the backups will be stored. Default: `rancherbackups`. | | Region | The [AWS region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. | -| Folder | The [folder in the S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html) where the backups will be stored. An empty value will store the backup files in the root folder of the S3 bucket. | +| Folder | The [folder in the S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html) where the backups will be stored. If this field is left empty, the default behavior is to store the backup files in the root folder of the S3 bucket. | | Endpoint | The [S3 endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) For example, `s3.us-west-2.amazonaws.com`. | | Endpoint CA | The CA cert used to for the S3 endpoint. Default: base64 encoded CA cert | | insecureTLSSkipVerify | Set to true if you are not using TLS. | diff --git a/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/backup-configuration.md b/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/backup-configuration.md index 63a704f8e7c..e7da7b91731 100644 --- a/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/backup-configuration.md +++ b/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/backup-configuration.md @@ -74,7 +74,7 @@ The S3 storage location contains the following configuration fields: 1. **Credential Secret** (optional): If you need to use the AWS Access keys Secret keys to access s3 bucket, create a secret with your credentials with keys and the directives `accessKey` and `secretKey`. It can be in any namespace. An example secret is [here.](#example-credentialsecret) This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) The Credential Secret dropdown lists the secrets in all namespaces. 1. **Bucket Name**: The name of the S3 bucket where backup files will be stored. 1. **Region** (optional): The AWS [region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. This field isn't needed for configuring MinIO. -1. **Folder** (optional): The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. An empty value will store the backup files in the root folder of the S3 bucket. +1. **Folder** (optional): The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. If this field is left empty, the default behavior is to store the backup files in the root folder of the S3 bucket. 1. **Endpoint**: The [endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) that is used to access S3 in the region of your bucket. 1. **Endpoint CA** (optional): This should be the Base64 encoded CA cert. For an example, refer to the [example S3 compatible configuration.](#example-s3-storage-configuration) 1. **Skip TLS Verifications** (optional): Set to true if you are not using TLS. diff --git a/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/storage-configuration.md b/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/storage-configuration.md index d1108acbabf..1fd4abf34c5 100644 --- a/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/storage-configuration.md +++ b/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/storage-configuration.md @@ -20,7 +20,7 @@ You can choose to not have any operator-level storage location configured. If yo | Credential Secret | Choose the credentials for S3 from your secrets in Rancher. [Example](./examples.md#example-credential-secret-for-storing-backups-in-s3). | | Bucket Name | Enter the name of the [S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html) where the backups will be stored. Default: `rancherbackups`. | | Region | The [AWS region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. | -| Folder | The [folder in the S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html) where the backups will be stored. An empty value will store the backup files in the root folder of the S3 bucket. | +| Folder | The [folder in the S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html) where the backups will be stored. If this field is left empty, the default behavior is to store the backup files in the root folder of the S3 bucket. | | Endpoint | The [S3 endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) For example, `s3.us-west-2.amazonaws.com`. | | Endpoint CA | The CA cert used to for the S3 endpoint. Default: base64 encoded CA cert | | insecureTLSSkipVerify | Set to true if you are not using TLS. | diff --git a/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md b/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md index b549941c6a6..caa507debf8 100644 --- a/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md +++ b/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md @@ -73,7 +73,7 @@ The S3 storage location contains the following configuration fields: 1. **Credential Secret** (optional): If you need to use the AWS Access keys Secret keys to access s3 bucket, create a secret with your credentials with keys and the directives `accessKey` and `secretKey`. It can be in any namespace. An example secret is [here.](#example-credentialsecret) This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) The Credential Secret dropdown lists the secrets in all namespaces. 1. **Bucket Name**: The name of the S3 bucket where backup files will be stored. 1. **Region** (optional): The AWS [region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. This field isn't needed for configuring MinIO. -1. **Folder** (optional): The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. An empty value will store the backup files in the root folder of the S3 bucket. +1. **Folder** (optional): The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. If this field is left empty, the default behavior is to store the backup files in the root folder of the S3 bucket. 1. **Endpoint**: The [endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) that is used to access S3 in the region of your bucket. 1. **Endpoint CA** (optional): This should be the Base64 encoded CA cert. For an example, refer to the [example S3 compatible configuration.](#example-s3-storage-configuration) 1. **Skip TLS Verifications** (optional): Set to true if you are not using TLS. diff --git a/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/storage-configuration.md b/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/storage-configuration.md index f29a424dc06..e47c783458e 100644 --- a/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/storage-configuration.md +++ b/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/storage-configuration.md @@ -20,7 +20,7 @@ You can choose to not have any operator-level storage location configured. If yo | Credential Secret | Choose the credentials for S3 from your secrets in Rancher. [Example](examples.md#example-credential-secret-for-storing-backups-in-s3). | | Bucket Name | Enter the name of the [S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html) where the backups will be stored. Default: `rancherbackups`. | | Region | The [AWS region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. | -| Folder | The [folder in the S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html) where the backups will be stored. An empty value will store the backup files in the root folder of the S3 bucket. | +| Folder | The [folder in the S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html) where the backups will be stored. If this field is left empty, the default behavior is to store the backup files in the root folder of the S3 bucket. | | Endpoint | The [S3 endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) For example, `s3.us-west-2.amazonaws.com`. | | Endpoint CA | The CA cert used to for the S3 endpoint. Default: base64 encoded CA cert | | insecureTLSSkipVerify | Set to true if you are not using TLS. | From ad1b948b80966ba08d775a0ef10da819b8c5ed38 Mon Sep 17 00:00:00 2001 From: Gabriel Blais-Duchesne Date: Fri, 17 Feb 2023 08:48:21 -0500 Subject: [PATCH 09/36] Apply the remaining suggestions from code review Co-authored-by: Marty Hernandez Avedon --- .../backup-restore-configuration/backup-configuration.md | 2 +- .../backup-restore-configuration/backup-configuration.md | 2 +- .../backup-restore-configuration/backup-configuration.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/reference-guides/backup-restore-configuration/backup-configuration.md b/docs/reference-guides/backup-restore-configuration/backup-configuration.md index caa507debf8..dcf4d2bbd91 100644 --- a/docs/reference-guides/backup-restore-configuration/backup-configuration.md +++ b/docs/reference-guides/backup-restore-configuration/backup-configuration.md @@ -84,7 +84,7 @@ The S3 storage location contains the following configuration fields: | `credentialSecretName` | If you need to use the AWS Access keys Secret keys to access s3 bucket, create a secret with your credentials with keys and the directives `accessKey` and `secretKey`. It can be in any namespace as long as you provide that namespace in `credentialSecretNamespace`. An example secret is [here.](#example-credentialsecret) This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) | | | `credentialSecretNamespace` | The namespace of the secret containing the credentials to access S3. This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) | | | `bucketName` | The name of the S3 bucket where backup files will be stored. | ✓ | -| `folder` | The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. An empty value will store the backup files in the root folder of the S3 bucket. | | +| `folder` | The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. If this field is left empty, the default behavior is to store the backup files in the root folder of the S3 bucket. | | | `region` | The AWS [region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. | ✓ | | `endpoint` | The [endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) that is used to access S3 in the region of your bucket. | ✓ | | `endpointCA` | This should be the Base64 encoded CA cert. For an example, refer to the [example S3 compatible configuration.](#example-s3-storage-configuration) | | diff --git a/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/backup-configuration.md b/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/backup-configuration.md index e7da7b91731..5e52181ce1a 100644 --- a/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/backup-configuration.md +++ b/versioned_docs/version-2.5/reference-guides/backup-restore-configuration/backup-configuration.md @@ -85,7 +85,7 @@ The S3 storage location contains the following configuration fields: | `credentialSecretName` | If you need to use the AWS Access keys Secret keys to access s3 bucket, create a secret with your credentials with keys and the directives `accessKey` and `secretKey`. It can be in any namespace as long as you provide that namespace in `credentialSecretNamespace`. An example secret is [here.](#example-credentialsecret) This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) | | | `credentialSecretNamespace` | The namespace of the secret containing the credentials to access S3. This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) | | | `bucketName` | The name of the S3 bucket where backup files will be stored. | ✓ | -| `folder` | The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. An empty value will store the backup files in the root folder of the S3 bucket. | | +| `folder` | The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. If this field is left empty, the default behavior is to store the backup files in the root folder of the S3 bucket. | | | `region` | The AWS [region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. | ✓ | | `endpoint` | The [endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) that is used to access S3 in the region of your bucket. | ✓ | | `endpointCA` | This should be the Base64 encoded CA cert. For an example, refer to the [example S3 compatible configuration.](#example-s3-storage-configuration) | | diff --git a/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md b/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md index caa507debf8..dcf4d2bbd91 100644 --- a/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md +++ b/versioned_docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md @@ -84,7 +84,7 @@ The S3 storage location contains the following configuration fields: | `credentialSecretName` | If you need to use the AWS Access keys Secret keys to access s3 bucket, create a secret with your credentials with keys and the directives `accessKey` and `secretKey`. It can be in any namespace as long as you provide that namespace in `credentialSecretNamespace`. An example secret is [here.](#example-credentialsecret) This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) | | | `credentialSecretNamespace` | The namespace of the secret containing the credentials to access S3. This directive is unnecessary if the nodes running your operator are in EC2 and set up with IAM permissions that allow them to access S3, as described in [this section.](#iam-permissions-for-ec2-nodes-to-access-s3) | | | `bucketName` | The name of the S3 bucket where backup files will be stored. | ✓ | -| `folder` | The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. An empty value will store the backup files in the root folder of the S3 bucket. | | +| `folder` | The name of the folder in the S3 bucket where backup files will be stored. Nested folders (e.g., `rancher/cluster1`) are not supported. If this field is left empty, the default behavior is to store the backup files in the root folder of the S3 bucket. | | | `region` | The AWS [region](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/) where the S3 bucket is located. | ✓ | | `endpoint` | The [endpoint](https://docs.aws.amazon.com/general/latest/gr/s3.html) that is used to access S3 in the region of your bucket. | ✓ | | `endpointCA` | This should be the Base64 encoded CA cert. For an example, refer to the [example S3 compatible configuration.](#example-s3-storage-configuration) | | From 68cdb02b3361128313353031849496d101120c0f Mon Sep 17 00:00:00 2001 From: Lucas Saintarbor Date: Fri, 17 Feb 2023 11:13:40 -0800 Subject: [PATCH 10/36] Update create-credentials.md In reference to (https://github.com/rancher/rancher-docs/issues/398 and https://github.com/kubernetes-sigs/vsphere-csi-driver/issues/2143), users hit an issue while creating a new role (RabcgerRole) in the vSphere Web Client. The solution is to add the following privilege when creating the new role: Cns.searchable. I added the (Privilege Group, Cns Privileges) and (Operations, Searchable) to the table referencing (https://docs.vmware.com/en/VMware-vSphere/8.0/vsphere-security/GUID-C04F1605-D158-4B65-810F-6F5B109BCDEC.html). Note: The screenshot showing the list of privileges when creating a new role in the vSphere Client does not show "Cns Privileges." This privilege was added in vSphere 7.0. Looks like the screenshot is from vSphere 6.0. Connect with someone who provide updated screenshots for "Creating Credentials in the vSphere Console." --- .../vsphere/create-credentials.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md index 968b5845050..976f6ddf083 100644 --- a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md +++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md @@ -12,6 +12,7 @@ The following table lists the permissions required for the vSphere user account: | Global | Set custom attribute | | Network | Assign | | Resource | AssignVMToPool | +| Cns Privileges | Searchable | | Virtual Machine | Config (All)
GuestOperations (All)
Interact (All)
Inventory (All)
Provisioning (All) | | vSphere Tagging | Assign or Unassign vSphere Tag
Assign or Unassign vSphere Tag on Object | From aa9c5b35b980c3a81729a7101011164c8c8b3d13 Mon Sep 17 00:00:00 2001 From: Lucas Saintarbor Date: Fri, 17 Feb 2023 15:16:56 -0800 Subject: [PATCH 11/36] Update create-credentials.md --- .../vsphere/create-credentials.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/versioned_docs/version-2.6/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md b/versioned_docs/version-2.6/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md index 968b5845050..28384bac57a 100644 --- a/versioned_docs/version-2.6/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md +++ b/versioned_docs/version-2.6/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md @@ -8,10 +8,12 @@ The following table lists the permissions required for the vSphere user account: | Privilege Group | Operations | |:----------------------|:-----------------------------------------------------------------------| +| Cns Privileges | Searchable | | Datastore | AllocateSpace
Browse
FileManagement (Low level file operations)
UpdateVirtualMachineFiles
UpdateVirtualMachineMetadata | | Global | Set custom attribute | | Network | Assign | | Resource | AssignVMToPool | + | Virtual Machine | Config (All)
GuestOperations (All)
Interact (All)
Inventory (All)
Provisioning (All) | | vSphere Tagging | Assign or Unassign vSphere Tag
Assign or Unassign vSphere Tag on Object | From 53fd0c4cf7a48742f9dd2f7b0cb131a5f2043e79 Mon Sep 17 00:00:00 2001 From: Lucas Saintarbor Date: Fri, 17 Feb 2023 15:17:21 -0800 Subject: [PATCH 12/36] Update create-credentials.md --- .../vsphere/create-credentials.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md index 976f6ddf083..b4e4279c569 100644 --- a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md +++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md @@ -8,11 +8,11 @@ The following table lists the permissions required for the vSphere user account: | Privilege Group | Operations | |:----------------------|:-----------------------------------------------------------------------| +| Cns Privileges | Searchable | | Datastore | AllocateSpace
Browse
FileManagement (Low level file operations)
UpdateVirtualMachineFiles
UpdateVirtualMachineMetadata | | Global | Set custom attribute | | Network | Assign | | Resource | AssignVMToPool | -| Cns Privileges | Searchable | | Virtual Machine | Config (All)
GuestOperations (All)
Interact (All)
Inventory (All)
Provisioning (All) | | vSphere Tagging | Assign or Unassign vSphere Tag
Assign or Unassign vSphere Tag on Object | From 986fe0b71e562264dcec6643eae121ba26c77946 Mon Sep 17 00:00:00 2001 From: martyav Date: Tue, 21 Feb 2023 15:56:45 -0500 Subject: [PATCH 13/36] updated 2.6 page --- .../manage-project-resource-quotas.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/versioned_docs/version-2.6/pages-for-subheaders/manage-project-resource-quotas.md b/versioned_docs/version-2.6/pages-for-subheaders/manage-project-resource-quotas.md index 7110306ba7a..f6023c0f608 100644 --- a/versioned_docs/version-2.6/pages-for-subheaders/manage-project-resource-quotas.md +++ b/versioned_docs/version-2.6/pages-for-subheaders/manage-project-resource-quotas.md @@ -20,7 +20,13 @@ Edit resource quotas when: 1. In the upper left corner, click **☰ > Cluster Management**. 1. On the **Clusters** page, go to the cluster where you want to apply a resource quota and click **Explore**. 1. Click **Cluster > Projects/Namespaces**. -1. Find the project that you want to add a resource quota to. From that project, select **⋮ > Edit Config**. +1. Make sure that the **Projects/Namespaces** page is in **Group by Project** view mode. + ![Screenshot highlighting the "Group by Project" icon, above the list of projects. It resembles a folder.](/img/edit-project-config-for-resource-quotas-group-by-project.png) + +1. Find the project that you want to add a resource quota to, and select the **⋮** that's on the same row as the project's name. + ![Screenshot highlighting triple dots icon at the end of the same row as the project name.](/img/edit-project-config-for-resource-quotas-dots.png) + +1. Select **Edit Config**. 1. Expand **Resource Quotas** and click **Add Resource**. Alternatively, you can edit existing quotas. From c3c887268bc8724bff0070bf6f3875c177529b06 Mon Sep 17 00:00:00 2001 From: Lucas Saintarbor Date: Tue, 21 Feb 2023 13:15:20 -0800 Subject: [PATCH 14/36] Update vsphere-storage.md Updating this page in reference to https://github.com/rancher/rancher-docs/issues/274 --- .../provisioning-storage-examples/vsphere-storage.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md b/docs/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md index 4214af2eac5..5095e892d77 100644 --- a/docs/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md +++ b/docs/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md @@ -20,8 +20,8 @@ The following steps can also be performed using the `kubectl` command line tool. ::: 1. Click **☰ > Cluster Management**. -1. Go to the cluster where you want to provide vSphere storage. -1. In the left navigation bar, click **Storage > StorageClasses**. +1. Choose the cluster you want to provide vSphere storage to and click **Exlpore**. +1. In the left navigation bar, select **Storage > StorageClasses**. 1. Click **Create**. 3. Enter a **Name** for the StorageClass. 4. Under **Provisioner**, select **VMWare vSphere Volume**. From c1dd182c291c83bf692688ebdc9e90ba79e6b77b Mon Sep 17 00:00:00 2001 From: Lucas Saintarbor Date: Tue, 21 Feb 2023 13:25:49 -0800 Subject: [PATCH 15/36] Update vsphere-storage.md Updating this page in reference to rancher#274 --- .../provisioning-storage-examples/vsphere-storage.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versioned_docs/version-2.6/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md b/versioned_docs/version-2.6/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md index 4214af2eac5..5095e892d77 100644 --- a/versioned_docs/version-2.6/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md +++ b/versioned_docs/version-2.6/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md @@ -20,8 +20,8 @@ The following steps can also be performed using the `kubectl` command line tool. ::: 1. Click **☰ > Cluster Management**. -1. Go to the cluster where you want to provide vSphere storage. -1. In the left navigation bar, click **Storage > StorageClasses**. +1. Choose the cluster you want to provide vSphere storage to and click **Exlpore**. +1. In the left navigation bar, select **Storage > StorageClasses**. 1. Click **Create**. 3. Enter a **Name** for the StorageClass. 4. Under **Provisioner**, select **VMWare vSphere Volume**. From f7f15639caa6baa68b68f16955b2f84360189aa7 Mon Sep 17 00:00:00 2001 From: Marty Hernandez Avedon Date: Wed, 22 Feb 2023 18:01:24 -0500 Subject: [PATCH 16/36] Updated misleading Docker command in README (#440) * updated confusing command * typo fix * rewording --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ec1f5cb9a0..d0780d95d13 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,15 @@ This command generates static content into the `build` directory and can be serv ### Launch With Docker -Use [Docker](https://www.docker.com/) to launch the website without needing to install and configure Yarn: +You can also use [Docker](https://www.docker.com/) to launch the website. + +The first time you launch the site this way, use this command to install Yarn and start the server: + +``` +docker run --rm -it -v $PWD:$PWD -w $PWD -p 3000:3000 node yarn install && yarn start -h 0.0.0.0 +``` + +On subsequent launches, use this command: ``` docker run --rm -it -v $PWD:$PWD -w $PWD -p 3000:3000 node yarn start -h 0.0.0.0 From 9fefbc7dffc9eb0233b6d59b6b50a49448778b94 Mon Sep 17 00:00:00 2001 From: Sunil Singh Date: Thu, 23 Feb 2023 15:37:46 -0800 Subject: [PATCH 17/36] Updating the versions list with current 2.7.1, 2.6.10, 2.5.17, and updating 2.5 as eol. (#447) Signed-off-by: Sunil Singh --- src/pages/versions.md | 78 ++++++++++++++++++++++++++++++------------- 1 file changed, 54 insertions(+), 24 deletions(-) diff --git a/src/pages/versions.md b/src/pages/versions.md index 9d29d9c15bc..6395406913b 100644 --- a/src/pages/versions.md +++ b/src/pages/versions.md @@ -8,6 +8,42 @@ title: Rancher Documentation Versions Below are the documentation and release notes for the currently released version of Rancher 2.7.x: + + + + + + + +
v2.7.1DocumentationRelease NotesSupport Matrix
+ +Below are the documentation and release notes for the currently released version of Rancher 2.6.x: + + + + + + + + +
v2.6.10DocumentationRelease NotesSupport Matrix
+ +Below are the documentation and release notes for the currently released version of Rancher 2.5.x: + + + + + + + +
v2.5.17DocumentationRelease Notes
+ +
+ +### Past versions + +Below are the documentation and release notes for previous versions of Rancher 2.7.x: + @@ -17,7 +53,9 @@ Below are the documentation and release notes for the currently released version
v2.7.0
-Below are the documentation and release notes for the currently released version of Rancher 2.6.x: +
+ +Below are the documentation and release notes for previous versions of Rancher 2.6.x: @@ -26,26 +64,6 @@ Below are the documentation and release notes for the currently released version -
Release Notes Support Matrix
- -Below are the documentation and release notes for the currently released version of Rancher 2.5.x: - - - - - - - - -
v2.5.16DocumentationRelease NotesSupport Matrix
- -
- -### Past versions - -Below are the documentation and release notes for previous versions of Rancher 2.6.x: - - @@ -104,9 +122,23 @@ Below are the documentation and release notes for previous versions of Rancher 2
-Below are the documentation and release notes for previous versions of Rancher 2.5.x: +### Legacy versions (EOL) + +Below are the documentation and release notes for legacy versions of Rancher 2.5.x:
v2.6.8 Documentation
+ + + + + + + + + + + + @@ -207,8 +239,6 @@ Below are the documentation and release notes for previous versions of Rancher 2
-### Legacy versions (EOL) - Below is the documentation for legacy versions of Rancher 2.0 - 2.4.x:
v2.5.17DocumentationRelease Notes
N / A
v2.5.16DocumentationRelease NotesSupport Matrix
v2.5.15 Documentation
From 81b576006fcc72a83f2c1ddf82e1e2fc6fc08eea Mon Sep 17 00:00:00 2001 From: Lucas Saintarbor Date: Thu, 23 Feb 2023 16:11:10 -0800 Subject: [PATCH 18/36] Update step 5 for configuring Azure AD in Rancher (#441) Add warning that the Azure AD account mapped to the Rancher local principle account will have admin privileges * Update configure-azure-ad.md * Update configure-azure-ad.md * Update docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md Co-authored-by: Marty Hernandez Avedon * Update docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md Co-authored-by: Marty Hernandez Avedon * Update docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md Co-authored-by: Marty Hernandez Avedon * Update versioned_docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md Co-authored-by: Marty Hernandez Avedon * Update versioned_docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md Co-authored-by: Marty Hernandez Avedon --------- Co-authored-by: Marty Hernandez Avedon --- .../configure-azure-ad.md | 31 +++++++++++----- .../configure-azure-ad.md | 37 +++++++++++-------- 2 files changed, 43 insertions(+), 25 deletions(-) diff --git a/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md index 14c2abcf6c8..2ed85b6f1cd 100644 --- a/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md +++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md @@ -160,11 +160,23 @@ You will need to also manually enter the Graph, Token, and Auth Endpoints. From the Rancher UI, enter information about your AD instance hosted in Azure to complete configuration. 1. Log into Rancher. + 1. In the top left corner, click **☰ > Users & Authentication**. + 1. In the left navigation menu, click **Auth Provider**. + 1. Click **AzureAD**. + 1. Complete the **Configure Azure AD Account** form using the information you copied while completing [Copy Azure Application Data](#4-copy-azure-application-data). + :::caution + + The Azure AD account will be granted administrator privileges, since its details will be mapped to the Rancher local principal account. Make sure that this level of privilege is appropriate before you continue. + + ::: + + **For Standard or China Enpoints:** + The following table maps the values you copied in the Azure portal to the fields in Rancher: | Rancher Field | Azure Value | @@ -174,20 +186,19 @@ From the Rancher UI, enter information about your AD instance hosted in Azure to | Application Secret | Key Value | | Endpoint | https://login.microsoftonline.com/ | + **For Custom Endpoints:** -**For Custom Endpoints:** + The following table maps your custom config values to Rancher fields: -The following table maps the custom config values you copied in the Azure portal to the fields in Rancher: + | Rancher Field | Azure Value | + | ------------------ | ------------------------------------- | + | Graph Endpoint | Microsoft Graph API Endpoint | + | Token Endpoint | OAuth 2.0 Token Endpoint | + | Auth Endpoint | OAuth 2.0 Authorization Endpoint | -| Rancher Field | Azure Value | -| ------------------ | ------------------------------------- | -| Graph Endpoint | Microsoft Graph API Endpoint | -| Token Endpoint | OAuth 2.0 Token Endpoint | -| Auth Endpoint | OAuth 2.0 Authorization Endpoint | + **Important:** When entering the Graph Endpoint in a custom config, remove the tenant ID from the URL: -**Important:** When entering the Graph Endpoint in a custom config, remove the tenant ID from the URL, like below: - -https://graph.microsoft.com/abb5adde-bee8-4821-8b03-e63efdc7701c + https://graph.microsoft.com/abb5adde-bee8-4821-8b03-e63efdc7701c 1. Click **Enable**. diff --git a/versioned_docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md b/versioned_docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md index afa1938f806..7291c840ca9 100644 --- a/versioned_docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md +++ b/versioned_docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md @@ -127,8 +127,6 @@ Ensure that you set the permissions of type Application and NOT Delegated. Other #### 4. Copy Azure Application Data -As your final step in Azure, copy the data that you'll use to configure Rancher for Azure AD authentication and paste it into an empty text file. - 1. Obtain your Rancher **Tenant ID**. 1. Use search to open **App registrations**. @@ -176,14 +174,24 @@ You will need to also manually enter the Graph, Token, and Auth Endpoints. From the Rancher UI, enter information about your AD instance hosted in Azure to complete configuration. -Enter the values that you copied to your [text file](#tip). - 1. Log into Rancher. + 1. In the top left corner, click **☰ > Users & Authentication**. + 1. In the left navigation menu, click **Auth Provider**. + 1. Click **AzureAD**. + 1. Complete the **Configure Azure AD Account** form using the information you copied while completing [Copy Azure Application Data](#4-copy-azure-application-data). + :::caution + + The Azure AD account will be granted administrator privileges, since its details will be mapped to the Rancher local principal account. Make sure that this level of privilege is appropriate before you continue. + + ::: + + **For Standard or China Enpoints:** + The following table maps the values you copied in the Azure portal to the fields in Rancher: | Rancher Field | Azure Value | @@ -193,20 +201,19 @@ Enter the values that you copied to your [text file](#tip). | Application Secret | Key Value | | Endpoint | https://login.microsoftonline.com/ | + **For Custom Endpoints:** -**For Custom Endpoints:** + The following table maps the custom config values you copied in the Azure portal to the fields in Rancher: -The following table maps the custom config values you copied in the Azure portal to the fields in Rancher: + | Rancher Field | Azure Value | + | ------------------ | ------------------------------------- | + | Graph Endpoint | Microsoft Graph API Endpoint | + | Token Endpoint | OAuth 2.0 Token Endpoint | + | Auth Endpoint | OAuth 2.0 Authorization Endpoint | -| Rancher Field | Azure Value | -| ------------------ | ------------------------------------- | -| Graph Endpoint | Microsoft Graph API Endpoint | -| Token Endpoint | OAuth 2.0 Token Endpoint | -| Auth Endpoint | OAuth 2.0 Authorization Endpoint | + **Important:** When entering the Graph Endpoint in a custom config, remove the tenant ID from the URL: -**Important:** When entering the Graph Endpoint in a custom config, remove the tenant ID from the URL, like below: - -https://graph.microsoft.com/abb5adde-bee8-4821-8b03-e63efdc7701c + https://graph.microsoft.com/abb5adde-bee8-4821-8b03-e63efdc7701c 1. Click **Enable**. @@ -309,4 +316,4 @@ Token Endpoint | https://login.partner.microsoftonline.cn/{tenantID}/oauth2/v2 - Use another third-party auth system and set that up in Rancher. Please see the [authentication docs](../../../../pages-for-subheaders/authentication-config.md) to learn how to configure other open authentication providers. - \ No newline at end of file + From 5fe37b9ee7c257d42e982f10a8caeb2e0e1191e3 Mon Sep 17 00:00:00 2001 From: martyav Date: Fri, 24 Feb 2023 15:40:10 -0500 Subject: [PATCH 19/36] #351 highlight the kubernetes-rancher support matrix and update links to the now removed support-maintainance-terms page --- .../installation-requirements.md | 38 +++++-------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/docs/pages-for-subheaders/installation-requirements.md b/docs/pages-for-subheaders/installation-requirements.md index da9db12a19f..30d7fee5e2b 100644 --- a/docs/pages-for-subheaders/installation-requirements.md +++ b/docs/pages-for-subheaders/installation-requirements.md @@ -11,42 +11,22 @@ If you install Rancher on a Kubernetes cluster, requirements are different from ::: -Make sure the node(s) for the Rancher server fulfill the following requirements: +For a list of best practices for running the Rancher server in production, refer to the [best practices section.](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md). -- [Operating Systems and Container Runtime Requirements](#operating-systems-and-container-runtime-requirements) - - [RKE Specific Requirements](#rke-specific-requirements) - - [K3s Specific Requirements](#k3s-specific-requirements) - - [RKE2 Specific Requirements](#rke2-specific-requirements) - - [Installing Docker](#installing-docker) -- [Hardware Requirements](#hardware-requirements) -- [CPU and Memory](#cpu-and-memory) - - [RKE and Hosted Kubernetes](#rke-and-hosted-kubernetes) - - [K3s Kubernetes](#k3s-kubernetes) - - [RKE2 Kubernetes](#rke2-kubernetes) - - [Docker](#docker) -- [Ingress](#ingress) -- [Disks](#disks) -- [Networking Requirements](#networking-requirements) - - [Node IP Addresses](#node-ip-addresses) - - [Port Requirements](#port-requirements) -- [Dockershim Support](#dockershim-support) +The Rancher UI works best in Firefox or Chromium based browsers (Chrome, Edge, Opera, Brave, etc). -For a list of best practices that we recommend for running the Rancher server in production, refer to the [best practices section.](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md) +## Kubernetes Compatibility with Rancher -The Rancher UI works best in Firefox or Chromium based browsers (Chrome, Edge, Opera, Brave, ...). +Rancher needs to be installed on a supported Kubernetes version. Consult the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix) to ensure that your intended version of Kubernetes is supported. ## Operating Systems and Container Runtime Requirements -Rancher should work with any modern Linux distribution. +All supported operating systems are 64-bit x86. Rancher should work with any modern Linux distribution. + +The [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix) lists which OS and Docker versions were tested for each Rancher version. Docker is required for nodes that will run RKE Kubernetes clusters. It is not required for RKE2 or K3s clusters. -Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) - -For details on which OS and Docker versions were tested with each Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) - -All supported operating systems are 64-bit x86. - The `ntp` (Network Time Protocol) package should be installed. This prevents errors with certificate validation that can occur when the time is not synchronized between the client and server. Some distributions of Linux may have default firewall rules that block communication within the Kubernetes cluster. Since Kubernetes v1.19, firewalld must be turned off, because it conflicts with the Kubernetes networking plugins. @@ -65,7 +45,7 @@ For more information see [Installing Docker,](../getting-started/installation-an For the container runtime, K3s bundles its own containerd by default. Alternatively, you can configure K3s to use an already installed Docker runtime. For more information on using K3s with Docker see the [K3s documentation.](https://docs.k3s.io/advanced#using-docker-as-the-container-runtime) -Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) To specify the K3s version, use the INSTALL_K3S_VERSION environment variable when running the K3s installation script. +Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix). To specify the K3s version, use the INSTALL_K3S_VERSION environment variable when running the K3s installation script. If you are installing Rancher on a K3s cluster with **Raspbian Buster**, follow [these steps](https://rancher.com/docs/k3s/latest/en/advanced/#enabling-legacy-iptables-on-raspbian-buster) to switch to legacy iptables. @@ -75,7 +55,7 @@ If you are installing Rancher on a K3s cluster with Alpine Linux, follow [these For the container runtime, RKE2 bundles its own containerd. Docker is not required for RKE2 installs. -For details on which OS versions were tested with RKE2, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) +For details on which OS versions were tested with RKE2, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix). ## Hardware Requirements From ac942b09c12591943029d3c2359efc17d8a2de75 Mon Sep 17 00:00:00 2001 From: martyav Date: Fri, 24 Feb 2023 15:46:03 -0500 Subject: [PATCH 20/36] rephrase --- docs/pages-for-subheaders/installation-requirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pages-for-subheaders/installation-requirements.md b/docs/pages-for-subheaders/installation-requirements.md index 30d7fee5e2b..ac84a78d703 100644 --- a/docs/pages-for-subheaders/installation-requirements.md +++ b/docs/pages-for-subheaders/installation-requirements.md @@ -11,7 +11,7 @@ If you install Rancher on a Kubernetes cluster, requirements are different from ::: -For a list of best practices for running the Rancher server in production, refer to the [best practices section.](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md). +See our page on [best practices](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md) for a list of recommendations for running a Rancher server in production. The Rancher UI works best in Firefox or Chromium based browsers (Chrome, Edge, Opera, Brave, etc). From 4341f46270008993c73eaed0d332f3c0f6fc13fc Mon Sep 17 00:00:00 2001 From: martyav Date: Fri, 24 Feb 2023 15:47:21 -0500 Subject: [PATCH 21/36] moved sentence up --- docs/pages-for-subheaders/installation-requirements.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/pages-for-subheaders/installation-requirements.md b/docs/pages-for-subheaders/installation-requirements.md index ac84a78d703..c1d55c55ee1 100644 --- a/docs/pages-for-subheaders/installation-requirements.md +++ b/docs/pages-for-subheaders/installation-requirements.md @@ -11,10 +11,10 @@ If you install Rancher on a Kubernetes cluster, requirements are different from ::: -See our page on [best practices](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md) for a list of recommendations for running a Rancher server in production. - The Rancher UI works best in Firefox or Chromium based browsers (Chrome, Edge, Opera, Brave, etc). +See our page on [best practices](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md) for a list of recommendations for running a Rancher server in production. + ## Kubernetes Compatibility with Rancher Rancher needs to be installed on a supported Kubernetes version. Consult the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix) to ensure that your intended version of Kubernetes is supported. From b4307d00453daa57f51486f943f9c9f3c675005a Mon Sep 17 00:00:00 2001 From: Marty Hernandez Avedon Date: Fri, 24 Feb 2023 16:23:48 -0500 Subject: [PATCH 22/36] Update docs/pages-for-subheaders/installation-requirements.md Co-authored-by: Billy Tat --- docs/pages-for-subheaders/installation-requirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pages-for-subheaders/installation-requirements.md b/docs/pages-for-subheaders/installation-requirements.md index c1d55c55ee1..8e3d3876100 100644 --- a/docs/pages-for-subheaders/installation-requirements.md +++ b/docs/pages-for-subheaders/installation-requirements.md @@ -25,7 +25,7 @@ All supported operating systems are 64-bit x86. Rancher should work with any mod The [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix) lists which OS and Docker versions were tested for each Rancher version. -Docker is required for nodes that will run RKE Kubernetes clusters. It is not required for RKE2 or K3s clusters. +Docker is required for nodes that will run RKE clusters. It is not required for RKE2 or K3s clusters. The `ntp` (Network Time Protocol) package should be installed. This prevents errors with certificate validation that can occur when the time is not synchronized between the client and server. From 4bd337bb154c7556004938721a8ddb169ebfef15 Mon Sep 17 00:00:00 2001 From: martyav Date: Fri, 24 Feb 2023 16:35:09 -0500 Subject: [PATCH 23/36] versioned pages updated to match latest --- .../installation-requirements.md | 48 ++++++------------- .../installation-requirements.md | 38 ++++----------- 2 files changed, 23 insertions(+), 63 deletions(-) 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 ec227c51773..c0cd5ac110b 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 @@ -5,47 +5,27 @@ description: Learn the node requirements for each node running Rancher server wh 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. -> It is important to note that if you install Rancher on a Kubernetes cluster, requirements are different from the [node requirements for downstream user clusters,](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md) which will run your apps and services. +:::note Important: -Make sure the node(s) for the Rancher server fulfill the following requirements: +If you install Rancher on a Kubernetes cluster, requirements are different from the [node requirements for downstream user clusters,](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md) which will run your apps and services. -- [Operating Systems and Container Runtime Requirements](#operating-systems-and-container-runtime-requirements) - - [RKE Specific Requirements](#rke-specific-requirements) - - [K3s Specific Requirements](#k3s-specific-requirements) - - [RancherD Specific Requirements](#rancherd-specific-requirements) - - [RKE2 Specific Requirements](#rke2-specific-requirements) - - [Installing Docker](#installing-docker) -- [Hardware Requirements](#hardware-requirements) -- [CPU and Memory](#cpu-and-memory) - - [RKE and Hosted Kubernetes](#rke-and-hosted-kubernetes) - - [K3s Kubernetes](#k3s-kubernetes) - - [RancherD](#rancherd) - - [RKE2 Kubernetes](#rke2-kubernetes) - - [Docker](#docker) -- [Ingress](#ingress) - - [Ingress for RKE2](#ingress-for-rke2) - - [Ingress for EKS](#ingress-for-eks) -- [Disks](#disks) -- [Networking Requirements](#networking-requirements) - - [Node IP Addresses](#node-ip-addresses) - - [Port Requirements](#port-requirements) -- [RancherD on SELinux Enforcing CentOS 8 or RHEL 8 Nodes](#rancherd-on-selinux-enforcing-centos-8-or-rhel-8-nodes) +::: -For a list of best practices that we recommend for running the Rancher server in production, refer to the [best practices section.](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md) +The Rancher UI works best in Firefox or Chromium based browsers (Chrome, Edge, Opera, Brave, etc). -The Rancher UI works best in Firefox or Chrome. +See our page on [best practices](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md) for a list of recommendations for running a Rancher server in production. + +## Kubernetes Compatibility with Rancher + +Rancher needs to be installed on a supported Kubernetes version. Consult the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-5-0/) to ensure that your intended version of Kubernetes is supported. ## Operating Systems and Container Runtime Requirements -Rancher should work with any modern Linux distribution. +All supported operating systems are 64-bit x86. Rancher should work with any modern Linux distribution. -Docker is required for nodes that will run RKE Kubernetes clusters. It is not required for RancherD or RKE2 Kubernetes installs. +The [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-5-0/) lists which OS and Docker versions were tested for each Rancher version. -Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) - -For details on which OS and Docker versions were tested with each Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) - -All supported operating systems are 64-bit x86. +Docker is required for nodes that will run RKE clusters. It is not required for RKE2 or K3s clusters. The `ntp` (Network Time Protocol) package should be installed. This prevents errors with certificate validation that can occur when the time is not synchronized between the client and server. @@ -69,7 +49,7 @@ net.bridge.bridge-nf-call-iptables=1 For the container runtime, K3s should work with any modern version of Docker or containerd. -Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) To specify the K3s version, use the INSTALL_K3S_VERSION environment variable when running the K3s installation script. +Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-5-0/). To specify the K3s version, use the INSTALL_K3S_VERSION environment variable when running the K3s installation script. If you are installing Rancher on a K3s cluster with **Raspbian Buster**, follow [these steps](https://rancher.com/docs/k3s/latest/en/advanced/#enabling-legacy-iptables-on-raspbian-buster) to switch to legacy iptables. @@ -89,7 +69,7 @@ Docker is not required for RancherD installs. _The RKE2 install is available as of v2.5.6._ -For details on which OS versions were tested with RKE2, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) +For details on which OS versions were tested with RKE2, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-5-0/). Docker is not required for RKE2 installs. diff --git a/versioned_docs/version-2.6/pages-for-subheaders/installation-requirements.md b/versioned_docs/version-2.6/pages-for-subheaders/installation-requirements.md index da9db12a19f..aeb8b016720 100644 --- a/versioned_docs/version-2.6/pages-for-subheaders/installation-requirements.md +++ b/versioned_docs/version-2.6/pages-for-subheaders/installation-requirements.md @@ -11,41 +11,21 @@ If you install Rancher on a Kubernetes cluster, requirements are different from ::: -Make sure the node(s) for the Rancher server fulfill the following requirements: +The Rancher UI works best in Firefox or Chromium based browsers (Chrome, Edge, Opera, Brave, etc). -- [Operating Systems and Container Runtime Requirements](#operating-systems-and-container-runtime-requirements) - - [RKE Specific Requirements](#rke-specific-requirements) - - [K3s Specific Requirements](#k3s-specific-requirements) - - [RKE2 Specific Requirements](#rke2-specific-requirements) - - [Installing Docker](#installing-docker) -- [Hardware Requirements](#hardware-requirements) -- [CPU and Memory](#cpu-and-memory) - - [RKE and Hosted Kubernetes](#rke-and-hosted-kubernetes) - - [K3s Kubernetes](#k3s-kubernetes) - - [RKE2 Kubernetes](#rke2-kubernetes) - - [Docker](#docker) -- [Ingress](#ingress) -- [Disks](#disks) -- [Networking Requirements](#networking-requirements) - - [Node IP Addresses](#node-ip-addresses) - - [Port Requirements](#port-requirements) -- [Dockershim Support](#dockershim-support) +See our page on [best practices](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md) for a list of recommendations for running a Rancher server in production. -For a list of best practices that we recommend for running the Rancher server in production, refer to the [best practices section.](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md) +## Kubernetes Compatibility with Rancher -The Rancher UI works best in Firefox or Chromium based browsers (Chrome, Edge, Opera, Brave, ...). +Rancher needs to be installed on a supported Kubernetes version. Consult the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-6-0/) to ensure that your intended version of Kubernetes is supported. ## Operating Systems and Container Runtime Requirements -Rancher should work with any modern Linux distribution. +All supported operating systems are 64-bit x86. Rancher should work with any modern Linux distribution. -Docker is required for nodes that will run RKE Kubernetes clusters. It is not required for RKE2 or K3s clusters. +The [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-6-0/) lists which OS and Docker versions were tested for each Rancher version. -Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) - -For details on which OS and Docker versions were tested with each Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) - -All supported operating systems are 64-bit x86. +Docker is required for nodes that will run RKE clusters. It is not required for RKE2 or K3s clusters. The `ntp` (Network Time Protocol) package should be installed. This prevents errors with certificate validation that can occur when the time is not synchronized between the client and server. @@ -65,7 +45,7 @@ For more information see [Installing Docker,](../getting-started/installation-an For the container runtime, K3s bundles its own containerd by default. Alternatively, you can configure K3s to use an already installed Docker runtime. For more information on using K3s with Docker see the [K3s documentation.](https://docs.k3s.io/advanced#using-docker-as-the-container-runtime) -Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) To specify the K3s version, use the INSTALL_K3S_VERSION environment variable when running the K3s installation script. +Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-6-0/). To specify the K3s version, use the INSTALL_K3S_VERSION environment variable when running the K3s installation script. If you are installing Rancher on a K3s cluster with **Raspbian Buster**, follow [these steps](https://rancher.com/docs/k3s/latest/en/advanced/#enabling-legacy-iptables-on-raspbian-buster) to switch to legacy iptables. @@ -75,7 +55,7 @@ If you are installing Rancher on a K3s cluster with Alpine Linux, follow [these For the container runtime, RKE2 bundles its own containerd. Docker is not required for RKE2 installs. -For details on which OS versions were tested with RKE2, refer to the [support maintenance terms.](https://rancher.com/support-maintenance-terms/) +For details on which OS versions were tested with RKE2, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-6-0/). ## Hardware Requirements From 120965b7668d46e15fc04a5aeeff07ad546f6f28 Mon Sep 17 00:00:00 2001 From: martyav Date: Fri, 24 Feb 2023 16:37:07 -0500 Subject: [PATCH 24/36] RKE2 Kubernetes rm'd on v2.5 --- .../pages-for-subheaders/installation-requirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c0cd5ac110b..1f404e6ac4f 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 @@ -156,7 +156,7 @@ The Ingress should be deployed as DaemonSet to ensure your load balancer can suc For RKE, K3s and RancherD installations, you don't have to install the Ingress manually because it is installed by default. -For hosted Kubernetes clusters (EKS, GKE, AKS) and RKE2 Kubernetes installations, you will need to set up the ingress. +For hosted Kubernetes clusters (EKS, GKE, AKS) and RKE2 installations, you will need to set up the ingress. ### Ingress for RKE2 From 7087134e398f54b28a72f6b643e9a18ed3b8c388 Mon Sep 17 00:00:00 2001 From: Marty Hernandez Avedon Date: Fri, 24 Feb 2023 18:00:20 -0500 Subject: [PATCH 25/36] updated links to match latest patch releases for 2.5 and 2.6 --- .../pages-for-subheaders/installation-requirements.md | 8 ++++---- .../pages-for-subheaders/installation-requirements.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) 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 1f404e6ac4f..fb199923aff 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 @@ -17,13 +17,13 @@ See our page on [best practices](../reference-guides/best-practices/rancher-serv ## Kubernetes Compatibility with Rancher -Rancher needs to be installed on a supported Kubernetes version. Consult the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-5-0/) to ensure that your intended version of Kubernetes is supported. +Rancher needs to be installed on a supported Kubernetes version. Consult the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-5-16/) to ensure that your intended version of Kubernetes is supported. ## Operating Systems and Container Runtime Requirements All supported operating systems are 64-bit x86. Rancher should work with any modern Linux distribution. -The [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-5-0/) lists which OS and Docker versions were tested for each Rancher version. +The [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-5-16/) lists which OS and Docker versions were tested for each Rancher version. Docker is required for nodes that will run RKE clusters. It is not required for RKE2 or K3s clusters. @@ -49,7 +49,7 @@ net.bridge.bridge-nf-call-iptables=1 For the container runtime, K3s should work with any modern version of Docker or containerd. -Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-5-0/). To specify the K3s version, use the INSTALL_K3S_VERSION environment variable when running the K3s installation script. +Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-5-16/). To specify the K3s version, use the INSTALL_K3S_VERSION environment variable when running the K3s installation script. If you are installing Rancher on a K3s cluster with **Raspbian Buster**, follow [these steps](https://rancher.com/docs/k3s/latest/en/advanced/#enabling-legacy-iptables-on-raspbian-buster) to switch to legacy iptables. @@ -69,7 +69,7 @@ Docker is not required for RancherD installs. _The RKE2 install is available as of v2.5.6._ -For details on which OS versions were tested with RKE2, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-5-0/). +For details on which OS versions were tested with RKE2, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-5-16/). Docker is not required for RKE2 installs. diff --git a/versioned_docs/version-2.6/pages-for-subheaders/installation-requirements.md b/versioned_docs/version-2.6/pages-for-subheaders/installation-requirements.md index aeb8b016720..f5675137718 100644 --- a/versioned_docs/version-2.6/pages-for-subheaders/installation-requirements.md +++ b/versioned_docs/version-2.6/pages-for-subheaders/installation-requirements.md @@ -17,13 +17,13 @@ See our page on [best practices](../reference-guides/best-practices/rancher-serv ## Kubernetes Compatibility with Rancher -Rancher needs to be installed on a supported Kubernetes version. Consult the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-6-0/) to ensure that your intended version of Kubernetes is supported. +Rancher needs to be installed on a supported Kubernetes version. Consult the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-6-10/) to ensure that your intended version of Kubernetes is supported. ## Operating Systems and Container Runtime Requirements All supported operating systems are 64-bit x86. Rancher should work with any modern Linux distribution. -The [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-6-0/) lists which OS and Docker versions were tested for each Rancher version. +The [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-6-10/) lists which OS and Docker versions were tested for each Rancher version. Docker is required for nodes that will run RKE clusters. It is not required for RKE2 or K3s clusters. @@ -45,7 +45,7 @@ For more information see [Installing Docker,](../getting-started/installation-an For the container runtime, K3s bundles its own containerd by default. Alternatively, you can configure K3s to use an already installed Docker runtime. For more information on using K3s with Docker see the [K3s documentation.](https://docs.k3s.io/advanced#using-docker-as-the-container-runtime) -Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-6-0/). To specify the K3s version, use the INSTALL_K3S_VERSION environment variable when running the K3s installation script. +Rancher needs to be installed on a supported Kubernetes version. To find out which versions of Kubernetes are supported for your Rancher version, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-6-10/). To specify the K3s version, use the INSTALL_K3S_VERSION environment variable when running the K3s installation script. If you are installing Rancher on a K3s cluster with **Raspbian Buster**, follow [these steps](https://rancher.com/docs/k3s/latest/en/advanced/#enabling-legacy-iptables-on-raspbian-buster) to switch to legacy iptables. @@ -55,7 +55,7 @@ If you are installing Rancher on a K3s cluster with Alpine Linux, follow [these For the container runtime, RKE2 bundles its own containerd. Docker is not required for RKE2 installs. -For details on which OS versions were tested with RKE2, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/rancher-v2-6-0/). +For details on which OS versions were tested with RKE2, refer to the [Rancher support matrix](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-6-10/). ## Hardware Requirements From 7e4b392bed3d5385a3077c2854a155930c620dab Mon Sep 17 00:00:00 2001 From: vickyhella Date: Wed, 22 Feb 2023 14:28:54 +0800 Subject: [PATCH 26/36] Update Chinese translation for v2.7 --- .../configure-azure-ad.md | 31 +++++++++++++------ .../vsphere/create-credentials.md | 1 + .../vsphere-storage.md | 4 +-- .../manage-project-resource-quotas.md | 8 ++++- .../backup-configuration.md | 4 +-- .../storage-configuration.md | 2 +- 6 files changed, 34 insertions(+), 16 deletions(-) diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md index 056259a44f9..f422df8b3f0 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md @@ -159,11 +159,23 @@ Rancher 不会验证你授予 Azure 应用程序的权限。我们仅支持使 在 Rancher UI 中，输入托管在 Azure 中的 AD 实例的信息以完成配置。 1. 登录到 Rancher。 + 1. 在左上角，单击 **☰ > 用户 & 认证**。 + 1. 在左侧导航栏，单击**认证**。 + 1. 单击 **AzureAD**。 + 1. 使用你在[复制 Azure 应用数据](#4-复制-azure-应用数据)时复制的信息，填写**配置 Azure AD 账号**的表单。 + :::caution + + Azure AD 帐户将被授予管理员权限，因为其详细信息将映射到 Rancher 本地主体帐户。在继续之前确保此权限级别是适当的。 + + ::: + + **对于标准或中国端点：** + 下表介绍了你在 Azure 门户中复制的值与 Rancher 中字段的映射： | Rancher 字段 | Azure 值 | @@ -173,20 +185,19 @@ Rancher 不会验证你授予 Azure 应用程序的权限。我们仅支持使 | 应用密文 | Key Value | | 端点 | https://login.microsoftonline.com/ | + **对于自定义端点**： -**对于自定义端点**： + 下表将你的自定义配置值映射到 Rancher 字段： -下表介绍了你在 Azure 门户中复制的自定义配置值与 Rancher 中字段的映射： + | Rancher 字段 | Azure 值 | + | ------------------ | ------------------------------------- | + | Graph 端点 | Microsoft Graph API Endpoint | + | Token 端点 | OAuth 2.0 Token Endpoint | + | Auth 端点 | OAuth 2.0 Authorization Endpoint | -| Rancher 字段 | Azure 值 | -| ------------------ | ------------------------------------- | -| Graph 端点 | Microsoft Graph API Endpoint | -| Token 端点 | OAuth 2.0 Token Endpoint | -| Auth 端点 | OAuth 2.0 Authorization Endpoint | + **重要提示**：在自定义配置中输入 Graph Endpoint 时，请从 URL 中删除 Tenant ID： -**重要提示**：在自定义配置中输入 Graph Endpoint 时，请从 URL 中删除 Tenant ID，如下所示： - -https://graph.microsoft.com/abb5adde-bee8-4821-8b03-e63efdc7701c + https://graph.microsoft.com/abb5adde-bee8-4821-8b03-e63efdc7701c 1. 点击**启用**。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/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/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md index 87db9f2e07f..acf45cd85b0 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/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/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md @@ -8,6 +8,7 @@ title: 在 vSphere 控制台中创建凭证 | 特权组 | 操作 | |:----------------------|:-----------------------------------------------------------------------| +| Cns Privileges | Searchable | | Datastore | AllocateSpace
Browse
FileManagement (Low level file operations)
UpdateVirtualMachineFiles
UpdateVirtualMachineMetadata | | 全局 | Set custom attribute | | 网络 | Assign | diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md index a5d85285ce3..c36f3d7acf2 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md @@ -20,8 +20,8 @@ title: vSphere 存储 ::: 1. 点击 **☰ > 集群管理**。 -1. 转到要配置 vSphere 存储的集群。 -1. 在左侧导航栏中，单击**存储 > 存储类**。 +1. 选择要使用 vSphere 存储的集群，然后单击**浏览**。 +1. 在左侧导航栏中，选择**存储 > StorageClass**。 1. 单击**创建**。 3. 输入存储类的**名称**。 4. 在 **Provisioner**下，选择 **VMWare vSphere 卷**。 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 880b4d1516c..89c8a760f5e 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 @@ -20,7 +20,13 @@ Rancher 中的资源配额包含与 [Kubernetes 原生版本](https://kubernetes 1. 在左上角，单击 **☰ > 集群管理**。 1. 在**集群**页面，进入要应用资源配额的集群，然后单击 **Explore**。 1. 单击**集群 > 项目/命名空间**。 -1. 找到要添加资源配额的项目。在该项目中选择 **⋮ > 编辑配置**。 +1. 确保 **Projects/Namespaces** 页面处于 **Group by Project** 视图模式。 + ![Screenshot highlighting the "Group by Project" icon, above the list of projects. It resembles a folder.](/img/edit-project-config-for-resource-quotas-group-by-project.png) + +1. 找到要添加资源配额的项目，选择与项目名称同行的 **⋮**。 + ![Screenshot highlighting triple dots icon at the end of the same row as the project name.](/img/edit-project-config-for-resource-quotas-dots.png) + +1. 选择**编辑配置**。 1. 展开**资源限额**并单击**添加资源**。你也可以编辑现有配额。 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 bdc2b3545c0..24505753d86 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 @@ -73,7 +73,7 @@ S3 存储位置包含以下配置字段： 1. **凭证密文**（可选）：如果你需要使用 AWS 访问密钥（access key）和密文密钥（secret key）来访问 S3 存储桶，请使用带有密钥和指令 `accessKey` 和 `secretKey` 的凭证来创建密文。它可以是任意一个命名空间。你可以点击[此处](#credentialsecret-示例)查看示例密文。如果运行 operator 的节点在 EC2 中，并且设置了允许它们访问 S3 的 IAM 权限，则此指令是不必要的（如[本节](#ec2-节点访问-s3-的-iam-权限)所述）。凭证密文下拉菜单列出了所有命名空间的密文。 1. **存储桶名称**：存储备份文件的 S3 存储桶的名称。 1. **区域**（可选）：S3 存储桶所在的 AWS [区域](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/)。配置 MinIO 时不需要该字段。 -1. **文件夹**（可选）：S3 存储桶中存储备份文件的文件夹名称。不支持嵌套文件夹（例如， `rancher/cluster1`）。 +1. **文件夹**（可选）：S3 存储桶中存储备份文件的文件夹名称。不支持嵌套文件夹（例如， `rancher/cluster1`）。如果此字段留空，则默认将备份文件存储在 S3 存储桶的根文件夹中。 1. **端点**：用于访问存储桶区域中的 S3 的[端点](https://docs.aws.amazon.com/general/latest/gr/s3.html)。 1. **端点 CA**（可选）：Base64 编码的 CA 证书。如需获取示例，请参见 [S3 兼容配置示例](#s3-存储配置示例)。 1. **跳过 TLS 验证**（可选）：如果你不使用 TLS，则设置为 `true`。 @@ -84,7 +84,7 @@ S3 存储位置包含以下配置字段： | `credentialSecretName` | 如果你需要使用 AWS 访问密钥（access key）和密文密钥（secret key）来访问 S3 存储桶，请使用带有密钥和指令 `accessKey` 和 `secretKey` 的凭证来创建密文。它可以在任何命名空间中，只要你在 `credentialSecretNamespace` 中提供该命名空间。点击[这里](#credentialsecret-示例)查看示例密文。如果运行 operator 的节点在 EC2 中，并且设置了允许它们访问 S3 的 IAM 权限，则此指令是不必要的（如[本节](#ec2-节点访问-s3-的-iam-权限)所述）。 | | | `credentialSecretNamespace` | 包含访问 S3 的凭证的密文的命名空间。如果运行 operator 的节点在 EC2 中，并且设置了允许它们访问 S3 的 IAM 权限，则此指令是不必要的（如[本节](#ec2-节点访问-s3-的-iam-权限)所述）。 | | | `bucketName` | 存储备份文件的 S3 存储桶的名称。 | ✓ | -| `folder` | S3 存储桶中存储备份文件的文件夹名称。不支持嵌套文件夹（例如， `rancher/cluster1`）。 | | +| `folder` | S3 存储桶中存储备份文件的文件夹名称。不支持嵌套文件夹（例如， `rancher/cluster1`）。如果此字段留空，则默认将备份文件存储在 S3 存储桶的根文件夹中。 | | | `region` | S3 存储桶所在的 AWS [区域](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/)。 | ✓ | | `endpoint` | 用于访问存储桶区域中的 S3 的[端点](https://docs.aws.amazon.com/general/latest/gr/s3.html)。 | ✓ | | `endpointCA` | Base64 编码的 CA 证书。如需获取示例，请参见 [S3 兼容配置示例](#s3-存储配置示例)。 | | 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 e7442d4c61f..2db4ed74ef5 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 @@ -20,7 +20,7 @@ title: 备份存储位置配置 | 凭证密文 | 从 Rancher 的密文中选择 S3 的凭证。[示例](examples.md#在-s3-中存储备份的凭证密文示例)。 | | 存储桶名称 | 存储备份的 [S3 存储桶](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html)的名称。默认值：`rancherbackups`。 | | 区域 | S3 存储桶所在的 [AWS 区域](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/)。 | -| 文件夹 | 存储备份的 [S3 存储桶中的文件夹](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html)。 | +| 文件夹 | 存储备份的 [S3 存储桶中的文件夹](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html)。如果此字段留空，则默认将备份文件存储在 S3 存储桶的根文件夹中。 | | 端点 | [S3 端点](https://docs.aws.amazon.com/general/latest/gr/s3.html)，例如 `s3.us-west-2.amazonaws.com`。 | | Endpoint CA | 用于 S3 端点的 CA 证书。默认值：base64 编码的 CA 证书。 | | insecureTLSSkipVerify | 如果你不使用 TLS，则设置为 `true`。 | From f3563f79018b7a0b85a6303a8d359a2c8314e60e Mon Sep 17 00:00:00 2001 From: vickyhella Date: Thu, 23 Feb 2023 18:13:26 +0800 Subject: [PATCH 27/36] Update Chinese translation for v2.6 --- .../configure-azure-ad.md | 37 +++++++++++-------- .../vsphere/create-credentials.md | 1 + .../vsphere-storage.md | 4 +- .../manage-project-resource-quotas.md | 8 +++- .../backup-configuration.md | 4 +- .../storage-configuration.md | 2 +- .../vsphere/create-credentials.md | 1 - 7 files changed, 35 insertions(+), 22 deletions(-) diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md index ff1c351a77e..7056e3b476d 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md @@ -127,8 +127,6 @@ Microsoft Graph API 现在是设置 Azure AD 的流程。下文将帮助[新用 #### 4. 复制 Azure 应用数据 -这是在 Azure 中执行的的最后一步。你需要复制用于配置 Rancher 以进行 Azure AD 身份验证的数据，并将其粘贴到一个空文本文件中。 - 1. 获取你的 Rancher **租户 ID**。 1. 使用搜索打开 **App registrations**。 @@ -176,14 +174,24 @@ Microsoft Graph API 现在是设置 Azure AD 的流程。下文将帮助[新用 在 Rancher UI 中，输入托管在 Azure 中的 AD 实例的信息以完成配置。 -输入你复制到[文本文件](#tip)的值。 - 1. 登录到 Rancher。 + 1. 在左上角，单击 **☰ > 用户 & 认证**。 + 1. 在左侧导航栏，单击**认证**。 + 1. 单击 **AzureAD**。 + 1. 使用你在[复制 Azure 应用数据](#4-复制-azure-应用数据)时复制的信息，填写**配置 Azure AD 账号**的表单。 + :::caution + + Azure AD 帐户将被授予管理员权限，因为其详细信息将映射到 Rancher 本地主体帐户。在继续之前确保此权限级别是适当的。 + + ::: + + **对于标准或中国端点：** + 下表介绍了你在 Azure 门户中复制的值与 Rancher 中字段的映射： | Rancher 字段 | Azure 值 | @@ -193,20 +201,19 @@ Microsoft Graph API 现在是设置 Azure AD 的流程。下文将帮助[新用 | 应用密文 | Key Value | | 端点 | https://login.microsoftonline.com/ | + **对于自定义端点**： -**对于自定义端点**： + 下表介绍了你在 Azure 门户中复制的自定义配置值与 Rancher 中字段的映射： -下表介绍了你在 Azure 门户中复制的自定义配置值与 Rancher 中字段的映射： + | Rancher 字段 | Azure 值 | + | ------------------ | ------------------------------------- | + | Graph 端点 | Microsoft Graph API Endpoint | + | Token 端点 | OAuth 2.0 Token Endpoint | + | Auth 端点 | OAuth 2.0 Authorization Endpoint | -| Rancher 字段 | Azure 值 | -| ------------------ | ------------------------------------- | -| Graph 端点 | Microsoft Graph API Endpoint | -| Token 端点 | OAuth 2.0 Token Endpoint | -| Auth 端点 | OAuth 2.0 Authorization Endpoint | + **重要提示**：在自定义配置中输入 Graph Endpoint 时，请从 URL 中删除 Tenant ID： -**重要提示**：在自定义配置中输入 Graph Endpoint 时，请从 URL 中删除 Tenant ID，如下所示： - -https://graph.microsoft.com/abb5adde-bee8-4821-8b03-e63efdc7701c + https://graph.microsoft.com/abb5adde-bee8-4821-8b03-e63efdc7701c 1. 点击**启用**。 @@ -309,4 +316,4 @@ Token 端点 | https://login.chinacloudapi.cn/{tenantID}/oauth2/token > - 使用另一个第三方身份验证系统并在 Rancher 中进行设置。请参阅[身份验证文档](../../../../pages-for-subheaders/authentication-config.md)，了解如何配置其他开放式身份验证提供程序。 - \ No newline at end of file + diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md index 87db9f2e07f..acf45cd85b0 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md @@ -8,6 +8,7 @@ title: 在 vSphere 控制台中创建凭证 | 特权组 | 操作 | |:----------------------|:-----------------------------------------------------------------------| +| Cns Privileges | Searchable | | Datastore | AllocateSpace
Browse
FileManagement (Low level file operations)
UpdateVirtualMachineFiles
UpdateVirtualMachineMetadata | | 全局 | Set custom attribute | | 网络 | Assign | diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md index a5d85285ce3..c36f3d7acf2 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md @@ -20,8 +20,8 @@ title: vSphere 存储 ::: 1. 点击 **☰ > 集群管理**。 -1. 转到要配置 vSphere 存储的集群。 -1. 在左侧导航栏中，单击**存储 > 存储类**。 +1. 选择要使用 vSphere 存储的集群，然后单击**浏览**。 +1. 在左侧导航栏中，选择**存储 > StorageClass**。 1. 单击**创建**。 3. 输入存储类的**名称**。 4. 在 **Provisioner**下，选择 **VMWare vSphere 卷**。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/manage-project-resource-quotas.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/manage-project-resource-quotas.md index 880b4d1516c..89c8a760f5e 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/manage-project-resource-quotas.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/manage-project-resource-quotas.md @@ -20,7 +20,13 @@ Rancher 中的资源配额包含与 [Kubernetes 原生版本](https://kubernetes 1. 在左上角，单击 **☰ > 集群管理**。 1. 在**集群**页面，进入要应用资源配额的集群，然后单击 **Explore**。 1. 单击**集群 > 项目/命名空间**。 -1. 找到要添加资源配额的项目。在该项目中选择 **⋮ > 编辑配置**。 +1. 确保 **Projects/Namespaces** 页面处于 **Group by Project** 视图模式。 + ![Screenshot highlighting the "Group by Project" icon, above the list of projects. It resembles a folder.](/img/edit-project-config-for-resource-quotas-group-by-project.png) + +1. 找到要添加资源配额的项目，选择与项目名称同行的 **⋮**。 + ![Screenshot highlighting triple dots icon at the end of the same row as the project name.](/img/edit-project-config-for-resource-quotas-dots.png) + +1. 选择**编辑配置**。 1. 展开**资源限额**并单击**添加资源**。你也可以编辑现有配额。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md index bdc2b3545c0..24505753d86 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/backup-restore-configuration/backup-configuration.md @@ -73,7 +73,7 @@ S3 存储位置包含以下配置字段： 1. **凭证密文**（可选）：如果你需要使用 AWS 访问密钥（access key）和密文密钥（secret key）来访问 S3 存储桶，请使用带有密钥和指令 `accessKey` 和 `secretKey` 的凭证来创建密文。它可以是任意一个命名空间。你可以点击[此处](#credentialsecret-示例)查看示例密文。如果运行 operator 的节点在 EC2 中，并且设置了允许它们访问 S3 的 IAM 权限，则此指令是不必要的（如[本节](#ec2-节点访问-s3-的-iam-权限)所述）。凭证密文下拉菜单列出了所有命名空间的密文。 1. **存储桶名称**：存储备份文件的 S3 存储桶的名称。 1. **区域**（可选）：S3 存储桶所在的 AWS [区域](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/)。配置 MinIO 时不需要该字段。 -1. **文件夹**（可选）：S3 存储桶中存储备份文件的文件夹名称。不支持嵌套文件夹（例如， `rancher/cluster1`）。 +1. **文件夹**（可选）：S3 存储桶中存储备份文件的文件夹名称。不支持嵌套文件夹（例如， `rancher/cluster1`）。如果此字段留空，则默认将备份文件存储在 S3 存储桶的根文件夹中。 1. **端点**：用于访问存储桶区域中的 S3 的[端点](https://docs.aws.amazon.com/general/latest/gr/s3.html)。 1. **端点 CA**（可选）：Base64 编码的 CA 证书。如需获取示例，请参见 [S3 兼容配置示例](#s3-存储配置示例)。 1. **跳过 TLS 验证**（可选）：如果你不使用 TLS，则设置为 `true`。 @@ -84,7 +84,7 @@ S3 存储位置包含以下配置字段： | `credentialSecretName` | 如果你需要使用 AWS 访问密钥（access key）和密文密钥（secret key）来访问 S3 存储桶，请使用带有密钥和指令 `accessKey` 和 `secretKey` 的凭证来创建密文。它可以在任何命名空间中，只要你在 `credentialSecretNamespace` 中提供该命名空间。点击[这里](#credentialsecret-示例)查看示例密文。如果运行 operator 的节点在 EC2 中，并且设置了允许它们访问 S3 的 IAM 权限，则此指令是不必要的（如[本节](#ec2-节点访问-s3-的-iam-权限)所述）。 | | | `credentialSecretNamespace` | 包含访问 S3 的凭证的密文的命名空间。如果运行 operator 的节点在 EC2 中，并且设置了允许它们访问 S3 的 IAM 权限，则此指令是不必要的（如[本节](#ec2-节点访问-s3-的-iam-权限)所述）。 | | | `bucketName` | 存储备份文件的 S3 存储桶的名称。 | ✓ | -| `folder` | S3 存储桶中存储备份文件的文件夹名称。不支持嵌套文件夹（例如， `rancher/cluster1`）。 | | +| `folder` | S3 存储桶中存储备份文件的文件夹名称。不支持嵌套文件夹（例如， `rancher/cluster1`）。如果此字段留空，则默认将备份文件存储在 S3 存储桶的根文件夹中。 | | | `region` | S3 存储桶所在的 AWS [区域](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/)。 | ✓ | | `endpoint` | 用于访问存储桶区域中的 S3 的[端点](https://docs.aws.amazon.com/general/latest/gr/s3.html)。 | ✓ | | `endpointCA` | Base64 编码的 CA 证书。如需获取示例，请参见 [S3 兼容配置示例](#s3-存储配置示例)。 | | diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/backup-restore-configuration/storage-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/backup-restore-configuration/storage-configuration.md index e7442d4c61f..2db4ed74ef5 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/backup-restore-configuration/storage-configuration.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/backup-restore-configuration/storage-configuration.md @@ -20,7 +20,7 @@ title: 备份存储位置配置 | 凭证密文 | 从 Rancher 的密文中选择 S3 的凭证。[示例](examples.md#在-s3-中存储备份的凭证密文示例)。 | | 存储桶名称 | 存储备份的 [S3 存储桶](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html)的名称。默认值：`rancherbackups`。 | | 区域 | S3 存储桶所在的 [AWS 区域](https://aws.amazon.com/about-aws/global-infrastructure/regions_az/)。 | -| 文件夹 | 存储备份的 [S3 存储桶中的文件夹](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html)。 | +| 文件夹 | 存储备份的 [S3 存储桶中的文件夹](https://docs.aws.amazon.com/AmazonS3/latest/user-guide/using-folders.html)。如果此字段留空，则默认将备份文件存储在 S3 存储桶的根文件夹中。 | | 端点 | [S3 端点](https://docs.aws.amazon.com/general/latest/gr/s3.html)，例如 `s3.us-west-2.amazonaws.com`。 | | Endpoint CA | 用于 S3 端点的 CA 证书。默认值：base64 编码的 CA 证书。 | | insecureTLSSkipVerify | 如果你不使用 TLS，则设置为 `true`。 | diff --git a/versioned_docs/version-2.6/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md b/versioned_docs/version-2.6/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md index 28384bac57a..b4e4279c569 100644 --- a/versioned_docs/version-2.6/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md +++ b/versioned_docs/version-2.6/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md @@ -13,7 +13,6 @@ The following table lists the permissions required for the vSphere user account: | Global | Set custom attribute | | Network | Assign | | Resource | AssignVMToPool | - | Virtual Machine | Config (All)
GuestOperations (All)
Interact (All)
Inventory (All)
Provisioning (All) | | vSphere Tagging | Assign or Unassign vSphere Tag
Assign or Unassign vSphere Tag on Object | From 68279874738cecf0e21191c252cba50fbda504fa Mon Sep 17 00:00:00 2001 From: vickyhella Date: Wed, 22 Feb 2023 14:24:17 +0800 Subject: [PATCH 28/36] Update sidebar translation --- i18n/zh/code.json | 124 +++ .../current.json | 753 +++++++++-------- .../version-2.5.json | 4 - .../version-2.6.json | 757 +++++++++--------- i18n/zh/docusaurus-theme-classic/navbar.json | 8 +- 5 files changed, 880 insertions(+), 766 deletions(-) diff --git a/i18n/zh/code.json b/i18n/zh/code.json index b1ff31bdea7..39bc0f03c4b 100644 --- a/i18n/zh/code.json +++ b/i18n/zh/code.json @@ -268,5 +268,129 @@ "theme.SearchPage.fetchingNewResults": { "message": "正在获取新的搜索结果...", "description": "The paragraph for fetching new search results" + }, + "theme.admonition.note": { + "message": "备注", + "description": "The default label used for the Note admonition (:::note)" + }, + "theme.admonition.tip": { + "message": "提示", + "description": "The default label used for the Tip admonition (:::tip)" + }, + "theme.admonition.danger": { + "message": "危险", + "description": "The default label used for the Danger admonition (:::danger)" + }, + "theme.admonition.info": { + "message": "信息", + "description": "The default label used for the Info admonition (:::info)" + }, + "theme.admonition.caution": { + "message": "警告", + "description": "The default label used for the Caution admonition (:::caution)" + }, + "theme.docs.sidebar.closeSidebarButtonAriaLabel": { + "message": "关闭导航栏", + "description": "The ARIA label for close button of mobile sidebar" + }, + "theme.docs.sidebar.toggleSidebarButtonAriaLabel": { + "message": "切换导航栏", + "description": "The ARIA label for hamburger menu button of mobile navigation" + }, + "theme.SearchModal.searchBox.resetButtonTitle": { + "message": "清除查询", + "description": "The label and ARIA label for search box reset button" + }, + "theme.SearchModal.searchBox.cancelButtonText": { + "message": "取消", + "description": "The label and ARIA label for search box cancel button" + }, + "theme.SearchModal.startScreen.recentSearchesTitle": { + "message": "最近搜索", + "description": "The title for recent searches" + }, + "theme.SearchModal.startScreen.noRecentSearchesText": { + "message": "没有最近搜索", + "description": "The text when no recent searches" + }, + "theme.SearchModal.startScreen.saveRecentSearchButtonTitle": { + "message": "保存这个搜索", + "description": "The label for save recent search button" + }, + "theme.SearchModal.startScreen.removeRecentSearchButtonTitle": { + "message": "从历史记录中删除这个搜索", + "description": "The label for remove recent search button" + }, + "theme.SearchModal.startScreen.favoriteSearchesTitle": { + "message": "收藏", + "description": "The title for favorite searches" + }, + "theme.SearchModal.startScreen.removeFavoriteSearchButtonTitle": { + "message": "从收藏列表中删除这个搜索", + "description": "The label for remove favorite search button" + }, + "theme.SearchModal.errorScreen.titleText": { + "message": "无法获取结果", + "description": "The title for error screen of search modal" + }, + "theme.SearchModal.errorScreen.helpText": { + "message": "你可能需要检查网络连接。", + "description": "The help text for error screen of search modal" + }, + "theme.SearchModal.footer.selectText": { + "message": "选中", + "description": "The explanatory text of the action for the enter key" + }, + "theme.SearchModal.footer.selectKeyAriaLabel": { + "message": "Enter 键", + "description": "The ARIA label for the Enter key button that makes the selection" + }, + "theme.SearchModal.footer.navigateText": { + "message": "导航", + "description": "The explanatory text of the action for the Arrow up and Arrow down key" + }, + "theme.SearchModal.footer.navigateUpKeyAriaLabel": { + "message": "向上键", + "description": "The ARIA label for the Arrow up key button that makes the navigation" + }, + "theme.SearchModal.footer.navigateDownKeyAriaLabel": { + "message": "向下键", + "description": "The ARIA label for the Arrow down key button that makes the navigation" + }, + "theme.SearchModal.footer.closeText": { + "message": "关闭", + "description": "The explanatory text of the action for Escape key" + }, + "theme.SearchModal.footer.closeKeyAriaLabel": { + "message": "Esc 键", + "description": "The ARIA label for the Escape key button that close the modal" + }, + "theme.SearchModal.footer.searchByText": { + "message": "搜索提供", + "description": "The text explain that the search is making by Algolia" + }, + "theme.SearchModal.noResultsScreen.noResultsText": { + "message": "没有结果：", + "description": "The text explains that there are no results for the following search" + }, + "theme.SearchModal.noResultsScreen.suggestedQueryText": { + "message": "试试搜索", + "description": "The text for the suggested query when no results are found for the following search" + }, + "theme.SearchModal.noResultsScreen.reportMissingResultsText": { + "message": "认为这个查询应该有结果？", + "description": "The text for the question where the user thinks there are missing results" + }, + "theme.SearchModal.noResultsScreen.reportMissingResultsLinkText": { + "message": "请告知我们。", + "description": "The text for the link to report missing results" + }, + "theme.SearchModal.placeholder": { + "message": "搜索文档", + "description": "The placeholder of the input of the DocSearch pop-up modal" + }, + "theme.tags.tagsPageTitle": { + "message": "标签", + "description": "The title of the tag list page" } } diff --git a/i18n/zh/docusaurus-plugin-content-docs/current.json b/i18n/zh/docusaurus-plugin-content-docs/current.json index 225ce2bf124..df65e73a961 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current.json +++ b/i18n/zh/docusaurus-plugin-content-docs/current.json @@ -1,379 +1,378 @@ { - "version.label": { - "message": "v2.7", - "description": "The label for version current" - }, - "sidebar.tutorialSidebar.category.Getting Started": { - "message": "开始使用", - "description": "The label for category Getting Started in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Quick Start Guides": { - "message": "快速入门指南", - "description": "The label for category Quick Start Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Deploy Rancher Manager": { - "message": "部署 Rancher Manager", - "description": "The label for category Deploy Rancher Manager in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Deploy Rancher Workloads": { - "message": "部署 Rancher 工作负载", - "description": "The label for category Deploy Rancher Workloads in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Installation and Upgrade": { - "message": "安装和升级", - "description": "The label for category Installation and Upgrade in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Installation Requirements": { - "message": "安装要求", - "description": "The label for category Installation Requirements in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Installation References": { - "message": "安装参考", - "description": "The label for category Installation References in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Install/Upgrade on a Kubernetes Cluster": { - "message": "在 Kubernetes 集群上安装\/升级", - "description": "The label for category Install/Upgrade on a Kubernetes Cluster in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Other Installation Methods": { - "message": "其他安装方式", - "description": "The label for category Other Installation Methods in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Air-Gapped Helm CLI Install": { - "message": "离线 Helm CLI 安装", - "description": "The label for category Air-Gapped Helm CLI Install in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher on a Single Node with Docker": { - "message": "使用 Docker 将 Rancher 安装到单个节点中", - "description": "The label for category Rancher on a Single Node with Docker in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher Behind an HTTP Proxy": { - "message": "HTTP 代理后的 Rancher", - "description": "The label for category Rancher Behind an HTTP Proxy in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Resources": { - "message": "资源", - "description": "The label for category Resources in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.How-to Guides": { - "message": "操作指南", - "description": "The label for category How-to Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.New User Guides": { - "message": "新用户指南", - "description": "The label for category New User Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Authentication, Permissions, and Global Configuration": { - "message": "身份验证、权限和全局配置", - "description": "The label for category Authentication, Permissions, and Global Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Authentication Config": { - "message": "身份验证配置", - "description": "The label for category Authentication Config in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Configure OpenLDAP": { - "message": "配置 OpenLDAP", - "description": "The label for category Configure OpenLDAP in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Configure Microsoft AD Federation Service (SAML)": { - "message": "配置 Microsoft AD FS (SAML)", - "description": "The label for category Configure Microsoft AD Federation Service (SAML) in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Configure Shibboleth (SAML)": { - "message": "配置 Shibboleth (SAML)", - "description": "The label for category Configure Shibboleth (SAML) in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Manage Role-Based Access Control (RBAC)": { - "message": "管理 RBAC", - "description": "The label for category Manage Role-Based Access Control (RBAC) in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.About Provisioning Drivers": { - "message": "关于 Provisioning 驱动", - "description": "The label for category About Provisioning Drivers in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.About RKE1 Templates": { - "message": "关于 RKE1 模板", - "description": "The label for category About RKE1 Templates in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Manage Clusters": { - "message": "管理集群", - "description": "The label for category Manage Clusters in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Access Clusters": { - "message": "访问集群", - "description": "The label for category Access Clusters in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Install Cluster Autoscaler": { - "message": "安装 Cluster Autoscaler", - "description": "The label for category Install Cluster Autoscaler in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Create Kubernetes Persistent Storage": { - "message": "创建 Kubernetes 持久存储", - "description": "The label for category Create Kubernetes Persistent Storage in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Provisioning Storage Examples": { - "message": "配置存储示例", - "description": "The label for category Provisioning Storage Examples in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Kubernetes Cluster Setup": { - "message": "Kubernetes 集群设置", - "description": "The label for category Kubernetes Cluster Setup in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Infrastructure Setup": { - "message": "基础设施设置", - "description": "The label for category Infrastructure Setup in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Kubernetes Clusters in Rancher Setup": { - "message": "Rancher 设置中的 Kubernetes 集群", - "description": "The label for category Kubernetes Clusters in Rancher Setup in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Checklist for Production-Ready Clusters": { - "message": "生产就绪集群检查清单", - "description": "The label for category Checklist for Production-Ready Clusters in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Set Up Clusters from Hosted Kubernetes Providers": { - "message": "通过托管 Kubernetes 提供商设置集群", - "description": "The label for category Set Up Clusters from Hosted Kubernetes Providers in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Use Windows Clusters": { - "message": "使用 Windows 集群", - "description": "The label for category Use Windows Clusters in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Set Up Cloud Providers": { - "message": "设置 Cloud Provider", - "description": "The label for category Set Up Cloud Providers in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Launch Kubernetes with Rancher": { - "message": "使用 Rancher 启动 Kubernetes", - "description": "The label for category Launch Kubernetes with Rancher in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Use New Nodes in an Infra Provider": { - "message": "在基础设施提供商中使用新节点", - "description": "The label for category Use New Nodes in an Infra Provider in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.vSphere": { - "message": "vSphere", - "description": "The label for category vSphere in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Nutanix": { - "message": "Nutanix", - "description": "The label for category Nutanix in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Kubernetes Resources Setup": { - "message": "Kubernetes 资源设置", - "description": "The label for category Kubernetes Resources Setup in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Workloads and Pods": { - "message": "工作负载和 Pod", - "description": "The label for category Workloads and Pods in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Horizontal Pod Autoscaler": { - "message": "Horizontal Pod Autoscaler", - "description": "The label for category Horizontal Pod Autoscaler in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Load Balancer and Ingress Controller": { - "message": "负载均衡和 Ingress Controller", - "description": "The label for category Load Balancer and Ingress Controller in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Helm Charts in Rancher": { - "message": "Rancher 中的 Helm Chart", - "description": "The label for category Helm Charts in Rancher in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Deploy Apps Across Clusters": { - "message": "跨集群部署应用", - "description": "The label for category Deploy Apps Across Clusters in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Backup, Restore, and Disaster Recovery": { - "message": "备份、还原和灾难恢复", - "description": "The label for category Backup, Restore, and Disaster Recovery in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Advanced User Guides": { - "message": "高级用户指南", - "description": "The label for category Advanced User Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Manage Projects": { - "message": "管理项目", - "description": "The label for category Manage Projects in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Manage Project Resource Quotas": { - "message": "管理项目资源配额", - "description": "The label for category Manage Project Resource Quotas in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Monitoring/Alerting Guides": { - "message": "Monitoring\/Alerting 指南", - "description": "The label for category Monitoring/Alerting Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Prometheus Federator Guides": { - "message": "Prometheus Federator 指南", - "description": "The label for category Prometheus Federator Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Monitoring V2 Configuration Guides": { - "message": "Monitoring V2 配置指南", - "description": "The label for category Monitoring V2 Configuration Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Advanced Configuration": { - "message": "高级配置", - "description": "The label for category Advanced Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Istio Setup Guide": { - "message": "Istio 设置指南", - "description": "The label for category Istio Setup Guide in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.CIS Scan Guides": { - "message": "CIS 扫描指南", - "description": "The label for category CIS Scan Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Enable Experimental Features": { - "message": "启用实验功能", - "description": "The label for category Enable Experimental Features in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Reference Guides": { - "message": "参考指南", - "description": "The label for category Reference Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Best Practices": { - "message": "最佳实践", - "description": "The label for category Best Practices in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher Server": { - "message": "Rancher Server", - "description": "The label for category Rancher Server in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher-Managed Clusters": { - "message": "Rancher 管理的集群", - "description": "The label for category Rancher-Managed Clusters in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher Manager Architecture": { - "message": "Rancher Manager 架构", - "description": "The label for category Rancher Manager Architecture in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Cluster Configuration": { - "message": "集群配置", - "description": "The label for category Cluster Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher Server Configuration": { - "message": "Rancher Server 配置", - "description": "The label for category Rancher Server Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.GKE Cluster Configuration": { - "message": "GKE 集群配置", - "description": "The label for category GKE Cluster Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Use Existing Nodes": { - "message": "使用现有节点", - "description": "The label for category Use Existing Nodes in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Downstream Cluster Configuration": { - "message": "下游集群配置", - "description": "The label for category Downstream Cluster Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Node Template Configuration": { - "message": "节点模板配置", - "description": "The label for category Node Template Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Machine Configuration": { - "message": "主机配置", - "description": "The label for category Machine Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Single-Node Rancher in Docker": { - "message": "Docker 中的单节点 Rancher", - "description": "The label for category Single-Node Rancher in Docker in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Amazon EKS Permissions": { - "message": "Amazon EKS 权限", - "description": "The label for category Amazon EKS Permissions in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Backup & Restore Configuration": { - "message": "备份和恢复配置", - "description": "The label for category Backup & Restore Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Monitoring V2 Configuration": { - "message": "Monitoring V2 配置", - "description": "The label for category Monitoring V2 Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Prometheus Federator": { - "message": "Prometheus Federator", - "description": "The label for category Prometheus Federator in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.User Settings": { - "message": "用户设置", - "description": "The label for category User Settings in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.CLI with Rancher": { - "message": "Rancher CLI", - "description": "The label for category CLI with Rancher in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.About the API": { - "message": "关于 API", - "description": "The label for category About the API in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher Security": { - "message": "Rancher 安全", - "description": "The label for category Rancher Security in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher v2.6 Hardening Guides": { - "message": "Rancher 2.6 强化指南", - "description": "The label for category Rancher v2.6 Hardening Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.SELinux RPM": { - "message": "SELinux RPM", - "description": "The label for category SELinux RPM in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Integrations in Rancher": { - "message": "Rancher 中的集成", - "description": "The label for category Integrations in Rancher in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Cloud Marketplace Integration": { - "message": "云市场集成", - "description": "The label for category Cloud Marketplace Integration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.AWS Marketplace Integration": { - "message": "AWS Marketplace 集成", - "description": "The label for category AWS Marketplace Integration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.CIS Scans": { - "message": "CIS 扫描", - "description": "The label for category CIS Scans in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Fleet - GitOps at Scale": { - "message": "Fleet - 大规模的 GitOps", - "description": "The label for category Fleet - GitOps at Scale in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Istio": { - "message": "Istio", - "description": "The label for category Istio in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Configuration Options": { - "message": "配置选项", - "description": "The label for category Configuration Options in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Logging": { - "message": "Logging", - "description": "The label for category Logging in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Custom Resource Configuration": { - "message": "自定义资源配置", - "description": "The label for category Custom Resource Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Monitoring and Alerting": { - "message": "监控和告警", - "description": "The label for category Monitoring and Alerting in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.FAQ": { - "message": "常见问题", - "description": "The label for category FAQ in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Troubleshooting": { - "message": "故障排除", - "description": "The label for category Troubleshooting in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Kubernetes Components": { - "message": "Kubernetes 组件", - "description": "The label for category Kubernetes Components in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Other Troubleshooting Tips": { - "message": "其他故障排除提示", - "description": "The label for category Other Troubleshooting Tips in sidebar tutorialSidebar" - } + "version.label": { + "message": "v2.7", + "description": "The label for version current" + }, + "sidebar.tutorialSidebar.category.Getting Started": { + "message": "开始使用", + "description": "The label for category Getting Started in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Quick Start Guides": { + "message": "快速入门指南", + "description": "The label for category Quick Start Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Deploy Rancher Manager": { + "message": "部署 Rancher Manager", + "description": "The label for category Deploy Rancher Manager in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Deploy Rancher Workloads": { + "message": "部署 Rancher 工作负载", + "description": "The label for category Deploy Rancher Workloads in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Installation and Upgrade": { + "message": "安装和升级", + "description": "The label for category Installation and Upgrade in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Installation Requirements": { + "message": "安装要求", + "description": "The label for category Installation Requirements in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Installation References": { + "message": "安装参考", + "description": "The label for category Installation References in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Install/Upgrade on a Kubernetes Cluster": { + "message": "在 Kubernetes 集群上安装/升级", + "description": "The label for category Install/Upgrade on a Kubernetes Cluster in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Other Installation Methods": { + "message": "其他安装方式", + "description": "The label for category Other Installation Methods in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Air-Gapped Helm CLI Install": { + "message": "离线 Helm CLI 安装", + "description": "The label for category Air-Gapped Helm CLI Install in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher on a Single Node with Docker": { + "message": "使用 Docker 将 Rancher 安装到单个节点中", + "description": "The label for category Rancher on a Single Node with Docker in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher Behind an HTTP Proxy": { + "message": "HTTP 代理后的 Rancher", + "description": "The label for category Rancher Behind an HTTP Proxy in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Resources": { + "message": "资源", + "description": "The label for category Resources in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.How-to Guides": { + "message": "操作指南", + "description": "The label for category How-to Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.New User Guides": { + "message": "新用户指南", + "description": "The label for category New User Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Authentication, Permissions, and Global Configuration": { + "message": "身份验证、权限和全局配置", + "description": "The label for category Authentication, Permissions, and Global Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Authentication Config": { + "message": "身份验证配置", + "description": "The label for category Authentication Config in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Configure OpenLDAP": { + "message": "配置 OpenLDAP", + "description": "The label for category Configure OpenLDAP in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Configure Microsoft AD Federation Service (SAML)": { + "message": "配置 Microsoft AD FS (SAML)", + "description": "The label for category Configure Microsoft AD Federation Service (SAML) in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Configure Shibboleth (SAML)": { + "message": "配置 Shibboleth (SAML)", + "description": "The label for category Configure Shibboleth (SAML) in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Manage Role-Based Access Control (RBAC)": { + "message": "管理 RBAC", + "description": "The label for category Manage Role-Based Access Control (RBAC) in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.About Provisioning Drivers": { + "message": "关于 Provisioning 驱动", + "description": "The label for category About Provisioning Drivers in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.About RKE1 Templates": { + "message": "关于 RKE1 模板", + "description": "The label for category About RKE1 Templates in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Manage Clusters": { + "message": "管理集群", + "description": "The label for category Manage Clusters in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Access Clusters": { + "message": "访问集群", + "description": "The label for category Access Clusters in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Install Cluster Autoscaler": { + "message": "安装 Cluster Autoscaler", + "description": "The label for category Install Cluster Autoscaler in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Create Kubernetes Persistent Storage": { + "message": "创建 Kubernetes 持久存储", + "description": "The label for category Create Kubernetes Persistent Storage in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Provisioning Storage Examples": { + "message": "配置存储示例", + "description": "The label for category Provisioning Storage Examples in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Kubernetes Cluster Setup": { + "message": "Kubernetes 集群设置", + "description": "The label for category Kubernetes Cluster Setup in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Infrastructure Setup": { + "message": "基础设施设置", + "description": "The label for category Infrastructure Setup in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Kubernetes Clusters in Rancher Setup": { + "message": "Rancher 设置中的 Kubernetes 集群", + "description": "The label for category Kubernetes Clusters in Rancher Setup in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Checklist for Production-Ready Clusters": { + "message": "生产就绪集群检查清单", + "description": "The label for category Checklist for Production-Ready Clusters in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Set Up Clusters from Hosted Kubernetes Providers": { + "message": "通过托管 Kubernetes 提供商设置集群", + "description": "The label for category Set Up Clusters from Hosted Kubernetes Providers in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Use Windows Clusters": { + "message": "使用 Windows 集群", + "description": "The label for category Use Windows Clusters in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Set Up Cloud Providers": { + "message": "设置 Cloud Provider", + "description": "The label for category Set Up Cloud Providers in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Launch Kubernetes with Rancher": { + "message": "使用 Rancher 启动 Kubernetes", + "description": "The label for category Launch Kubernetes with Rancher in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Use New Nodes in an Infra Provider": { + "message": "在基础设施提供商中使用新节点", + "description": "The label for category Use New Nodes in an Infra Provider in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.vSphere": { + "message": "vSphere", + "description": "The label for category vSphere in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Nutanix": { + "message": "Nutanix", + "description": "The label for category Nutanix in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Kubernetes Resources Setup": { + "message": "Kubernetes 资源设置", + "description": "The label for category Kubernetes Resources Setup in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Workloads and Pods": { + "message": "工作负载和 Pod", + "description": "The label for category Workloads and Pods in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Horizontal Pod Autoscaler": { + "message": "Horizontal Pod Autoscaler", + "description": "The label for category Horizontal Pod Autoscaler in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Load Balancer and Ingress Controller": { + "message": "负载均衡和 Ingress Controller", + "description": "The label for category Load Balancer and Ingress Controller in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Helm Charts in Rancher": { + "message": "Rancher 中的 Helm Chart", + "description": "The label for category Helm Charts in Rancher in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Deploy Apps Across Clusters": { + "message": "跨集群部署应用", + "description": "The label for category Deploy Apps Across Clusters in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Backup, Restore, and Disaster Recovery": { + "message": "备份、还原和灾难恢复", + "description": "The label for category Backup, Restore, and Disaster Recovery in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Advanced User Guides": { + "message": "高级用户指南", + "description": "The label for category Advanced User Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Manage Projects": { + "message": "管理项目", + "description": "The label for category Manage Projects in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Manage Project Resource Quotas": { + "message": "管理项目资源配额", + "description": "The label for category Manage Project Resource Quotas in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Monitoring/Alerting Guides": { + "message": "Monitoring/Alerting 指南", + "description": "The label for category Monitoring/Alerting Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Prometheus Federator Guides": { + "message": "Prometheus Federator 指南", + "description": "The label for category Prometheus Federator Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Monitoring V2 Configuration Guides": { + "message": "Monitoring V2 配置指南", + "description": "The label for category Monitoring V2 Configuration Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Advanced Configuration": { + "message": "高级配置", + "description": "The label for category Advanced Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Istio Setup Guide": { + "message": "Istio 设置指南", + "description": "The label for category Istio Setup Guide in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.CIS Scan Guides": { + "message": "CIS 扫描指南", + "description": "The label for category CIS Scan Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Enable Experimental Features": { + "message": "启用实验功能", + "description": "The label for category Enable Experimental Features in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Reference Guides": { + "message": "参考指南", + "description": "The label for category Reference Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Best Practices": { + "message": "最佳实践", + "description": "The label for category Best Practices in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher Server": { + "message": "Rancher Server", + "description": "The label for category Rancher Server in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher-Managed Clusters": { + "message": "Rancher 管理的集群", + "description": "The label for category Rancher-Managed Clusters in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher Manager Architecture": { + "message": "Rancher Manager 架构", + "description": "The label for category Rancher Manager Architecture in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Cluster Configuration": { + "message": "集群配置", + "description": "The label for category Cluster Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher Server Configuration": { + "message": "Rancher Server 配置", + "description": "The label for category Rancher Server Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.GKE Cluster Configuration": { + "message": "GKE 集群配置", + "description": "The label for category GKE Cluster Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Use Existing Nodes": { + "message": "使用现有节点", + "description": "The label for category Use Existing Nodes in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Downstream Cluster Configuration": { + "message": "下游集群配置", + "description": "The label for category Downstream Cluster Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Node Template Configuration": { + "message": "节点模板配置", + "description": "The label for category Node Template Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Machine Configuration": { + "message": "主机配置", + "description": "The label for category Machine Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Single-Node Rancher in Docker": { + "message": "Docker 中的单节点 Rancher", + "description": "The label for category Single-Node Rancher in Docker in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Backup & Restore Configuration": { + "message": "备份和恢复配置", + "description": "The label for category Backup & Restore Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Monitoring V2 Configuration": { + "message": "Monitoring V2 配置", + "description": "The label for category Monitoring V2 Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Prometheus Federator": { + "message": "Prometheus Federator", + "description": "The label for category Prometheus Federator in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.User Settings": { + "message": "用户设置", + "description": "The label for category User Settings in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.CLI with Rancher": { + "message": "Rancher CLI", + "description": "The label for category CLI with Rancher in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.About the API": { + "message": "关于 API", + "description": "The label for category About the API in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher Security": { + "message": "Rancher 安全", + "description": "The label for category Rancher Security in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher v2.6 Hardening Guides": { + "message": "Rancher 2.6 强化指南", + "description": "The label for category Rancher v2.6 Hardening Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.SELinux RPM": { + "message": "SELinux RPM", + "description": "The label for category SELinux RPM in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Integrations in Rancher": { + "message": "Rancher 中的集成", + "description": "The label for category Integrations in Rancher in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Cloud Marketplace Integration": { + "message": "云市场集成", + "description": "The label for category Cloud Marketplace Integration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.AWS Marketplace Integration": { + "message": "AWS Marketplace 集成", + "description": "The label for category AWS Marketplace Integration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.CIS Scans": { + "message": "CIS 扫描", + "description": "The label for category CIS Scans in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Fleet - GitOps at Scale": { + "message": "Fleet - 大规模的 GitOps", + "description": "The label for category Fleet - GitOps at Scale in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Istio": { + "message": "Istio", + "description": "The label for category Istio in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Configuration Options": { + "message": "配置选项", + "description": "The label for category Configuration Options in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Logging": { + "message": "Logging", + "description": "The label for category Logging in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Custom Resource Configuration": { + "message": "自定义资源配置", + "description": "The label for category Custom Resource Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Monitoring and Alerting": { + "message": "监控和告警", + "description": "The label for category Monitoring and Alerting in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.FAQ": { + "message": "常见问题", + "description": "The label for category FAQ in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Troubleshooting": { + "message": "故障排除", + "description": "The label for category Troubleshooting in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Kubernetes Components": { + "message": "Kubernetes 组件", + "description": "The label for category Kubernetes Components in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Other Troubleshooting Tips": { + "message": "其他故障排除提示", + "description": "The label for category Other Troubleshooting Tips in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher v2.7 Hardening Guides": { + "message": "Rancher v2.7 强化指南", + "description": "The label for category Rancher v2.7 Hardening Guides in sidebar tutorialSidebar" } - \ No newline at end of file +} diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.5.json b/i18n/zh/docusaurus-plugin-content-docs/version-2.5.json index 9b7a6c4b85b..d983a6cde6a 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.5.json +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.5.json @@ -315,10 +315,6 @@ "message": "About the API", "description": "The label for category About the API in sidebar tutorialSidebar" }, - "sidebar.tutorialSidebar.category.Pipelines": { - "message": "Pipelines", - "description": "The label for category Pipelines in sidebar tutorialSidebar" - }, "sidebar.tutorialSidebar.category.Rancher Security": { "message": "Rancher Security", "description": "The label for category Rancher Security in sidebar tutorialSidebar" diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6.json b/i18n/zh/docusaurus-plugin-content-docs/version-2.6.json index 66be15e1db7..f279a6bb5c0 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6.json +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6.json @@ -1,383 +1,378 @@ { - "version.label": { - "message": "v2.6", - "description": "The label for version 2.6" - }, - "sidebar.tutorialSidebar.category.Getting Started": { - "message": "开始使用", - "description": "The label for category Getting Started in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Quick Start Guides": { - "message": "快速入门指南", - "description": "The label for category Quick Start Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Deploy Rancher Manager": { - "message": "部署 Rancher Manager", - "description": "The label for category Deploy Rancher Manager in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Deploy Rancher Workloads": { - "message": "部署 Rancher 工作负载", - "description": "The label for category Deploy Rancher Workloads in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Installation and Upgrade": { - "message": "安装和升级", - "description": "The label for category Installation and Upgrade in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Installation Requirements": { - "message": "安装要求", - "description": "The label for category Installation Requirements in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Installation References": { - "message": "安装参考", - "description": "The label for category Installation References in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Install/Upgrade on a Kubernetes Cluster": { - "message": "在 Kubernetes 集群上安装\/升级", - "description": "The label for category Install/Upgrade on a Kubernetes Cluster in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Other Installation Methods": { - "message": "其他安装方式", - "description": "The label for category Other Installation Methods in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Air-Gapped Helm CLI Install": { - "message": "离线 Helm CLI 安装", - "description": "The label for category Air-Gapped Helm CLI Install in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher on a Single Node with Docker": { - "message": "使用 Docker 将 Rancher 安装到单个节点中", - "description": "The label for category Rancher on a Single Node with Docker in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher Behind an HTTP Proxy": { - "message": "HTTP 代理后的 Rancher", - "description": "The label for category Rancher Behind an HTTP Proxy in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Resources": { - "message": "资源", - "description": "The label for category Resources in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.How-to Guides": { - "message": "操作指南", - "description": "The label for category How-to Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.New User Guides": { - "message": "新用户指南", - "description": "The label for category New User Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Authentication, Permissions, and Global Configuration": { - "message": "身份验证、权限和全局配置", - "description": "The label for category Authentication, Permissions, and Global Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Authentication Config": { - "message": "身份验证配置", - "description": "The label for category Authentication Config in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Configure OpenLDAP": { - "message": "配置 OpenLDAP", - "description": "The label for category Configure OpenLDAP in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Configure Microsoft AD Federation Service (SAML)": { - "message": "配置 Microsoft AD FS (SAML)", - "description": "The label for category Configure Microsoft AD Federation Service (SAML) in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Configure Shibboleth (SAML)": { - "message": "配置 Shibboleth (SAML)", - "description": "The label for category Configure Shibboleth (SAML) in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Manage Role-Based Access Control (RBAC)": { - "message": "管理 RBAC", - "description": "The label for category Manage Role-Based Access Control (RBAC) in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.About Provisioning Drivers": { - "message": "关于 Provisioning 驱动", - "description": "The label for category About Provisioning Drivers in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.About RKE1 Templates": { - "message": "关于 RKE1 模板", - "description": "The label for category About RKE1 Templates in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Manage Clusters": { - "message": "管理集群", - "description": "The label for category Manage Clusters in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Access Clusters": { - "message": "访问集群", - "description": "The label for category Access Clusters in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Install Cluster Autoscaler": { - "message": "安装 Cluster Autoscaler", - "description": "The label for category Install Cluster Autoscaler in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Create Kubernetes Persistent Storage": { - "message": "创建 Kubernetes 持久存储", - "description": "The label for category Create Kubernetes Persistent Storage in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Provisioning Storage Examples": { - "message": "配置存储示例", - "description": "The label for category Provisioning Storage Examples in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Kubernetes Cluster Setup": { - "message": "Kubernetes 集群设置", - "description": "The label for category Kubernetes Cluster Setup in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Infrastructure Setup": { - "message": "基础设施设置", - "description": "The label for category Infrastructure Setup in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Kubernetes Clusters in Rancher Setup": { - "message": "Rancher 设置中的 Kubernetes 集群", - "description": "The label for category Kubernetes Clusters in Rancher Setup in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Checklist for Production-Ready Clusters": { - "message": "生产就绪集群检查清单", - "description": "The label for category Checklist for Production-Ready Clusters in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Set Up Clusters from Hosted Kubernetes Providers": { - "message": "通过托管 Kubernetes 提供商设置集群", - "description": "The label for category Set Up Clusters from Hosted Kubernetes Providers in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Use Windows Clusters": { - "message": "使用 Windows 集群", - "description": "The label for category Use Windows Clusters in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Set Up Cloud Providers": { - "message": "设置 Cloud Provider", - "description": "The label for category Set Up Cloud Providers in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Launch Kubernetes with Rancher": { - "message": "使用 Rancher 启动 Kubernetes", - "description": "The label for category Launch Kubernetes with Rancher in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Use New Nodes in an Infra Provider": { - "message": "在基础设施提供商中使用新节点", - "description": "The label for category Use New Nodes in an Infra Provider in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.vSphere": { - "message": "vSphere", - "description": "The label for category vSphere in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Nutanix": { - "message": "Nutanix", - "description": "The label for category Nutanix in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Kubernetes Resources Setup": { - "message": "Kubernetes 资源设置", - "description": "The label for category Kubernetes Resources Setup in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Workloads and Pods": { - "message": "工作负载和 Pod", - "description": "The label for category Workloads and Pods in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Horizontal Pod Autoscaler": { - "message": "Horizontal Pod Autoscaler", - "description": "The label for category Horizontal Pod Autoscaler in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Load Balancer and Ingress Controller": { - "message": "负载均衡和 Ingress Controller", - "description": "The label for category Load Balancer and Ingress Controller in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Helm Charts in Rancher": { - "message": "Rancher 中的 Helm Chart", - "description": "The label for category Helm Charts in Rancher in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Deploy Apps Across Clusters": { - "message": "跨集群部署应用", - "description": "The label for category Deploy Apps Across Clusters in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Backup, Restore, and Disaster Recovery": { - "message": "备份、还原和灾难恢复", - "description": "The label for category Backup, Restore, and Disaster Recovery in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Advanced User Guides": { - "message": "高级用户指南", - "description": "The label for category Advanced User Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Manage Projects": { - "message": "管理项目", - "description": "The label for category Manage Projects in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Manage Project Resource Quotas": { - "message": "管理项目资源配额", - "description": "The label for category Manage Project Resource Quotas in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Monitoring/Alerting Guides": { - "message": "Monitoring\/Alerting 指南", - "description": "The label for category Monitoring/Alerting Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Prometheus Federator Guides": { - "message": "Prometheus Federator 指南", - "description": "The label for category Prometheus Federator Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Monitoring V2 Configuration Guides": { - "message": "Monitoring V2 配置指南", - "description": "The label for category Monitoring V2 Configuration Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Advanced Configuration": { - "message": "高级配置", - "description": "The label for category Advanced Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Istio Setup Guide": { - "message": "Istio 设置指南", - "description": "The label for category Istio Setup Guide in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.CIS Scan Guides": { - "message": "CIS 扫描指南", - "description": "The label for category CIS Scan Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Enable Experimental Features": { - "message": "启用实验功能", - "description": "The label for category Enable Experimental Features in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Reference Guides": { - "message": "参考指南", - "description": "The label for category Reference Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Best Practices": { - "message": "最佳实践", - "description": "The label for category Best Practices in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher Server": { - "message": "Rancher Server", - "description": "The label for category Rancher Server in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher-Managed Clusters": { - "message": "Rancher 管理的集群", - "description": "The label for category Rancher-Managed Clusters in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher Manager Architecture": { - "message": "Rancher Manager 架构", - "description": "The label for category Rancher Manager Architecture in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Cluster Configuration": { - "message": "集群配置", - "description": "The label for category Cluster Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher Server Configuration": { - "message": "Rancher Server 配置", - "description": "The label for category Rancher Server Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.GKE Cluster Configuration": { - "message": "GKE 集群配置", - "description": "The label for category GKE Cluster Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Use Existing Nodes": { - "message": "使用现有节点", - "description": "The label for category Use Existing Nodes in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Downstream Cluster Configuration": { - "message": "下游集群配置", - "description": "The label for category Downstream Cluster Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Node Template Configuration": { - "message": "节点模板配置", - "description": "The label for category Node Template Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Machine Configuration": { - "message": "主机配置", - "description": "The label for category Machine Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Single-Node Rancher in Docker": { - "message": "Docker 中的单节点 Rancher", - "description": "The label for category Single-Node Rancher in Docker in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Amazon EKS Permissions": { - "message": "Amazon EKS 权限", - "description": "The label for category Amazon EKS Permissions in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Backup & Restore Configuration": { - "message": "备份和恢复配置", - "description": "The label for category Backup & Restore Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Monitoring V2 Configuration": { - "message": "Monitoring V2 配置", - "description": "The label for category Monitoring V2 Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Prometheus Federator": { - "message": "Prometheus Federator", - "description": "The label for category Prometheus Federator in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.User Settings": { - "message": "用户设置", - "description": "The label for category User Settings in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.CLI with Rancher": { - "message": "Rancher CLI", - "description": "The label for category CLI with Rancher in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.About the API": { - "message": "关于 API", - "description": "The label for category About the API in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Pipelines": { - "message": "流水线", - "description": "The label for category Pipelines in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher Security": { - "message": "Rancher 安全", - "description": "The label for category Rancher Security in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Rancher v2.6 Hardening Guides": { - "message": "Rancher 2.6 强化指南", - "description": "The label for category Rancher v2.6 Hardening Guides in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.SELinux RPM": { - "message": "SELinux RPM", - "description": "The label for category SELinux RPM in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Integrations in Rancher": { - "message": "Rancher 中的集成", - "description": "The label for category Integrations in Rancher in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Cloud Marketplace Integration": { - "message": "云市场集成", - "description": "The label for category Cloud Marketplace Integration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.AWS Marketplace Integration": { - "message": "AWS Marketplace 集成", - "description": "The label for category AWS Marketplace Integration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.CIS Scans": { - "message": "CIS 扫描", - "description": "The label for category CIS Scans in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Fleet - GitOps at Scale": { - "message": "Fleet - 大规模的 GitOps", - "description": "The label for category Fleet - GitOps at Scale in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Istio": { - "message": "Istio", - "description": "The label for category Istio in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Configuration Options": { - "message": "配置选项", - "description": "The label for category Configuration Options in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Logging": { - "message": "Logging", - "description": "The label for category Logging in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Custom Resource Configuration": { - "message": "自定义资源配置", - "description": "The label for category Custom Resource Configuration in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Monitoring and Alerting": { - "message": "监控和告警", - "description": "The label for category Monitoring and Alerting in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.FAQ": { - "message": "常见问题", - "description": "The label for category FAQ in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Troubleshooting": { - "message": "故障排除", - "description": "The label for category Troubleshooting in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Kubernetes Components": { - "message": "Kubernetes 组件", - "description": "The label for category Kubernetes Components in sidebar tutorialSidebar" - }, - "sidebar.tutorialSidebar.category.Other Troubleshooting Tips": { - "message": "其他故障排除提示", - "description": "The label for category Other Troubleshooting Tips in sidebar tutorialSidebar" - } + "version.label": { + "message": "v2.6", + "description": "The label for version 2.6" + }, + "sidebar.tutorialSidebar.category.Getting Started": { + "message": "开始使用", + "description": "The label for category Getting Started in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Quick Start Guides": { + "message": "快速入门指南", + "description": "The label for category Quick Start Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Deploy Rancher Manager": { + "message": "部署 Rancher Manager", + "description": "The label for category Deploy Rancher Manager in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Deploy Rancher Workloads": { + "message": "部署 Rancher 工作负载", + "description": "The label for category Deploy Rancher Workloads in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Installation and Upgrade": { + "message": "安装和升级", + "description": "The label for category Installation and Upgrade in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Installation Requirements": { + "message": "安装要求", + "description": "The label for category Installation Requirements in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Installation References": { + "message": "安装参考", + "description": "The label for category Installation References in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Install/Upgrade on a Kubernetes Cluster": { + "message": "在 Kubernetes 集群上安装/升级", + "description": "The label for category Install/Upgrade on a Kubernetes Cluster in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Other Installation Methods": { + "message": "其他安装方式", + "description": "The label for category Other Installation Methods in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Air-Gapped Helm CLI Install": { + "message": "离线 Helm CLI 安装", + "description": "The label for category Air-Gapped Helm CLI Install in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher on a Single Node with Docker": { + "message": "使用 Docker 将 Rancher 安装到单个节点中", + "description": "The label for category Rancher on a Single Node with Docker in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher Behind an HTTP Proxy": { + "message": "HTTP 代理后的 Rancher", + "description": "The label for category Rancher Behind an HTTP Proxy in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Resources": { + "message": "资源", + "description": "The label for category Resources in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.How-to Guides": { + "message": "操作指南", + "description": "The label for category How-to Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.New User Guides": { + "message": "新用户指南", + "description": "The label for category New User Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Authentication, Permissions, and Global Configuration": { + "message": "身份验证、权限和全局配置", + "description": "The label for category Authentication, Permissions, and Global Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Authentication Config": { + "message": "身份验证配置", + "description": "The label for category Authentication Config in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Configure OpenLDAP": { + "message": "配置 OpenLDAP", + "description": "The label for category Configure OpenLDAP in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Configure Microsoft AD Federation Service (SAML)": { + "message": "配置 Microsoft AD FS (SAML)", + "description": "The label for category Configure Microsoft AD Federation Service (SAML) in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Configure Shibboleth (SAML)": { + "message": "配置 Shibboleth (SAML)", + "description": "The label for category Configure Shibboleth (SAML) in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Manage Role-Based Access Control (RBAC)": { + "message": "管理 RBAC", + "description": "The label for category Manage Role-Based Access Control (RBAC) in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.About Provisioning Drivers": { + "message": "关于 Provisioning 驱动", + "description": "The label for category About Provisioning Drivers in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.About RKE1 Templates": { + "message": "关于 RKE1 模板", + "description": "The label for category About RKE1 Templates in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Manage Clusters": { + "message": "管理集群", + "description": "The label for category Manage Clusters in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Access Clusters": { + "message": "访问集群", + "description": "The label for category Access Clusters in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Install Cluster Autoscaler": { + "message": "安装 Cluster Autoscaler", + "description": "The label for category Install Cluster Autoscaler in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Create Kubernetes Persistent Storage": { + "message": "创建 Kubernetes 持久存储", + "description": "The label for category Create Kubernetes Persistent Storage in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Provisioning Storage Examples": { + "message": "配置存储示例", + "description": "The label for category Provisioning Storage Examples in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Kubernetes Cluster Setup": { + "message": "Kubernetes 集群设置", + "description": "The label for category Kubernetes Cluster Setup in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Infrastructure Setup": { + "message": "基础设施设置", + "description": "The label for category Infrastructure Setup in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Kubernetes Clusters in Rancher Setup": { + "message": "Rancher 设置中的 Kubernetes 集群", + "description": "The label for category Kubernetes Clusters in Rancher Setup in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Checklist for Production-Ready Clusters": { + "message": "生产就绪集群检查清单", + "description": "The label for category Checklist for Production-Ready Clusters in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Set Up Clusters from Hosted Kubernetes Providers": { + "message": "通过托管 Kubernetes 提供商设置集群", + "description": "The label for category Set Up Clusters from Hosted Kubernetes Providers in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Use Windows Clusters": { + "message": "使用 Windows 集群", + "description": "The label for category Use Windows Clusters in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Set Up Cloud Providers": { + "message": "设置 Cloud Provider", + "description": "The label for category Set Up Cloud Providers in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Launch Kubernetes with Rancher": { + "message": "使用 Rancher 启动 Kubernetes", + "description": "The label for category Launch Kubernetes with Rancher in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Use New Nodes in an Infra Provider": { + "message": "在基础设施提供商中使用新节点", + "description": "The label for category Use New Nodes in an Infra Provider in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.vSphere": { + "message": "vSphere", + "description": "The label for category vSphere in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Nutanix": { + "message": "Nutanix", + "description": "The label for category Nutanix in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Kubernetes Resources Setup": { + "message": "Kubernetes 资源设置", + "description": "The label for category Kubernetes Resources Setup in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Workloads and Pods": { + "message": "工作负载和 Pod", + "description": "The label for category Workloads and Pods in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Horizontal Pod Autoscaler": { + "message": "Horizontal Pod Autoscaler", + "description": "The label for category Horizontal Pod Autoscaler in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Load Balancer and Ingress Controller": { + "message": "负载均衡和 Ingress Controller", + "description": "The label for category Load Balancer and Ingress Controller in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Helm Charts in Rancher": { + "message": "Rancher 中的 Helm Chart", + "description": "The label for category Helm Charts in Rancher in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Deploy Apps Across Clusters": { + "message": "跨集群部署应用", + "description": "The label for category Deploy Apps Across Clusters in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Backup, Restore, and Disaster Recovery": { + "message": "备份、还原和灾难恢复", + "description": "The label for category Backup, Restore, and Disaster Recovery in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Advanced User Guides": { + "message": "高级用户指南", + "description": "The label for category Advanced User Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Manage Projects": { + "message": "管理项目", + "description": "The label for category Manage Projects in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Manage Project Resource Quotas": { + "message": "管理项目资源配额", + "description": "The label for category Manage Project Resource Quotas in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Monitoring/Alerting Guides": { + "message": "Monitoring/Alerting 指南", + "description": "The label for category Monitoring/Alerting Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Prometheus Federator Guides": { + "message": "Prometheus Federator 指南", + "description": "The label for category Prometheus Federator Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Monitoring V2 Configuration Guides": { + "message": "Monitoring V2 配置指南", + "description": "The label for category Monitoring V2 Configuration Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Advanced Configuration": { + "message": "高级配置", + "description": "The label for category Advanced Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Istio Setup Guide": { + "message": "Istio 设置指南", + "description": "The label for category Istio Setup Guide in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.CIS Scan Guides": { + "message": "CIS 扫描指南", + "description": "The label for category CIS Scan Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Enable Experimental Features": { + "message": "启用实验功能", + "description": "The label for category Enable Experimental Features in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Reference Guides": { + "message": "参考指南", + "description": "The label for category Reference Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Best Practices": { + "message": "最佳实践", + "description": "The label for category Best Practices in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher Server": { + "message": "Rancher Server", + "description": "The label for category Rancher Server in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher-Managed Clusters": { + "message": "Rancher 管理的集群", + "description": "The label for category Rancher-Managed Clusters in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher Manager Architecture": { + "message": "Rancher Manager 架构", + "description": "The label for category Rancher Manager Architecture in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Cluster Configuration": { + "message": "集群配置", + "description": "The label for category Cluster Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher Server Configuration": { + "message": "Rancher Server 配置", + "description": "The label for category Rancher Server Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.GKE Cluster Configuration": { + "message": "GKE 集群配置", + "description": "The label for category GKE Cluster Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Use Existing Nodes": { + "message": "使用现有节点", + "description": "The label for category Use Existing Nodes in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Downstream Cluster Configuration": { + "message": "下游集群配置", + "description": "The label for category Downstream Cluster Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Node Template Configuration": { + "message": "节点模板配置", + "description": "The label for category Node Template Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Machine Configuration": { + "message": "主机配置", + "description": "The label for category Machine Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Single-Node Rancher in Docker": { + "message": "Docker 中的单节点 Rancher", + "description": "The label for category Single-Node Rancher in Docker in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Backup & Restore Configuration": { + "message": "备份和恢复配置", + "description": "The label for category Backup & Restore Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Monitoring V2 Configuration": { + "message": "Monitoring V2 配置", + "description": "The label for category Monitoring V2 Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Prometheus Federator": { + "message": "Prometheus Federator", + "description": "The label for category Prometheus Federator in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.User Settings": { + "message": "用户设置", + "description": "The label for category User Settings in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.CLI with Rancher": { + "message": "Rancher CLI", + "description": "The label for category CLI with Rancher in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.About the API": { + "message": "关于 API", + "description": "The label for category About the API in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Pipelines": { + "message": "流水线", + "description": "The label for category Pipelines in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher Security": { + "message": "Rancher 安全", + "description": "The label for category Rancher Security in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Rancher v2.6 Hardening Guides": { + "message": "Rancher 2.6 强化指南", + "description": "The label for category Rancher v2.6 Hardening Guides in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.SELinux RPM": { + "message": "SELinux RPM", + "description": "The label for category SELinux RPM in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Integrations in Rancher": { + "message": "Rancher 中的集成", + "description": "The label for category Integrations in Rancher in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Cloud Marketplace Integration": { + "message": "云市场集成", + "description": "The label for category Cloud Marketplace Integration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.AWS Marketplace Integration": { + "message": "AWS Marketplace 集成", + "description": "The label for category AWS Marketplace Integration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.CIS Scans": { + "message": "CIS 扫描", + "description": "The label for category CIS Scans in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Fleet - GitOps at Scale": { + "message": "Fleet - 大规模的 GitOps", + "description": "The label for category Fleet - GitOps at Scale in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Istio": { + "message": "Istio", + "description": "The label for category Istio in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Configuration Options": { + "message": "配置选项", + "description": "The label for category Configuration Options in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Logging": { + "message": "Logging", + "description": "The label for category Logging in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Custom Resource Configuration": { + "message": "自定义资源配置", + "description": "The label for category Custom Resource Configuration in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Monitoring and Alerting": { + "message": "监控和告警", + "description": "The label for category Monitoring and Alerting in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.FAQ": { + "message": "常见问题", + "description": "The label for category FAQ in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Troubleshooting": { + "message": "故障排除", + "description": "The label for category Troubleshooting in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Kubernetes Components": { + "message": "Kubernetes 组件", + "description": "The label for category Kubernetes Components in sidebar tutorialSidebar" + }, + "sidebar.tutorialSidebar.category.Other Troubleshooting Tips": { + "message": "其他故障排除提示", + "description": "The label for category Other Troubleshooting Tips in sidebar tutorialSidebar" } - \ No newline at end of file +} diff --git a/i18n/zh/docusaurus-theme-classic/navbar.json b/i18n/zh/docusaurus-theme-classic/navbar.json index fdfb4530e71..d45c3087a77 100644 --- a/i18n/zh/docusaurus-theme-classic/navbar.json +++ b/i18n/zh/docusaurus-theme-classic/navbar.json @@ -1,10 +1,10 @@ { - "item.label.Docs": { - "message": "文档", - "description": "Navbar item with label Docs" - }, "item.label.GitHub": { "message": "GitHub", "description": "Navbar item with label GitHub" + }, + "item.label.Rancher Home": { + "message": "Rancher 主页", + "description": "Navbar item with label Rancher Home" } } From 7491be0bf5afff84da456c9b86244f2792238f8f Mon Sep 17 00:00:00 2001 From: vickyhella Date: Fri, 24 Feb 2023 17:45:26 +0800 Subject: [PATCH 29/36] Fix typo --- .../authentication-config/configure-azure-ad.md | 2 +- .../authentication-config/configure-azure-ad.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md index 2ed85b6f1cd..b8899f6c7fa 100644 --- a/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md +++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md @@ -175,7 +175,7 @@ From the Rancher UI, enter information about your AD instance hosted in Azure to ::: - **For Standard or China Enpoints:** + **For Standard or China Endpoints:** The following table maps the values you copied in the Azure portal to the fields in Rancher: diff --git a/versioned_docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md b/versioned_docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md index 7291c840ca9..f3fe37dd815 100644 --- a/versioned_docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md +++ b/versioned_docs/version-2.6/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md @@ -190,7 +190,7 @@ From the Rancher UI, enter information about your AD instance hosted in Azure to ::: - **For Standard or China Enpoints:** + **For Standard or China Endpoints:** The following table maps the values you copied in the Azure portal to the fields in Rancher: From 9445b32406fc7bac3788dd8150240af09d08fac4 Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Mon, 27 Feb 2023 15:17:23 -0800 Subject: [PATCH 30/36] Remove AWS Marketplace references from 2.7. Docs[1] indicate 2.6.10 is currently deployed Apply 7a0c5090 and 918fcc9d changes to 2.6 version of document instead. [1] https://documentation.suse.com/trd/kubernetes/single-html/gs_rancher_aws-marketplace/ --- .../deploy-rancher-manager/aws-marketplace.md | 6 ------ docs/pages-for-subheaders/deploy-rancher-manager.md | 1 - sidebars.js | 1 - .../deploy-rancher-manager/aws-marketplace.md | 2 +- 4 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 docs/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md 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 deleted file mode 100644 index dad10f65d1d..00000000000 --- a/docs/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Rancher AWS Marketplace Quick Start -description: Use Amazon EKS to deploy Rancher server. ---- - -Amazon Elastic Kubernetes Service (EKS) can quickly [deploy Rancher to Amazon Web Services (AWS)](https://documentation.suse.com/trd/kubernetes/single-html/gs_rancher_aws-marketplace/). To learn more, see our [Amazon Marketplace listing](https://aws.amazon.com/marketplace/pp/prodview-go7ent7goo5ae). Watch the [demo] (https://youtu.be/9dznJ7Ons0M) for a walkthrough of AWS Marketplace SUSE Rancher setup. diff --git a/docs/pages-for-subheaders/deploy-rancher-manager.md b/docs/pages-for-subheaders/deploy-rancher-manager.md index e5ad6602e64..e95ef0e0b88 100644 --- a/docs/pages-for-subheaders/deploy-rancher-manager.md +++ b/docs/pages-for-subheaders/deploy-rancher-manager.md @@ -5,7 +5,6 @@ title: Deploying Rancher Server Use one of the following guides to deploy and provision Rancher and a Kubernetes cluster in the provider of your choice. - [AWS](../getting-started/quick-start-guides/deploy-rancher-manager/aws.md) (uses Terraform) -- [AWS Marketplace](../getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md) (uses Amazon EKS) - [Azure](../getting-started/quick-start-guides/deploy-rancher-manager/azure.md) (uses Terraform) - [DigitalOcean](../getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md) (uses Terraform) - [GCP](../getting-started/quick-start-guides/deploy-rancher-manager/gcp.md) (uses Terraform) diff --git a/sidebars.js b/sidebars.js index 2449189c69e..cfec4b666b1 100644 --- a/sidebars.js +++ b/sidebars.js @@ -42,7 +42,6 @@ const sidebars = { }, items: [ "getting-started/quick-start-guides/deploy-rancher-manager/aws", - "getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace", "getting-started/quick-start-guides/deploy-rancher-manager/azure", "getting-started/quick-start-guides/deploy-rancher-manager/digitalocean", "getting-started/quick-start-guides/deploy-rancher-manager/gcp", diff --git a/versioned_docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md b/versioned_docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md index 495ce94086a..781d41ad624 100644 --- a/versioned_docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md +++ b/versioned_docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md @@ -3,4 +3,4 @@ title: Rancher AWS Marketplace Quick Start description: Use Amazon EKS to deploy Rancher server. --- -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-go7ent7goo5ae). +Amazon Elastic Kubernetes Service (EKS) can quickly [deploy Rancher to Amazon Web Services (AWS)](https://documentation.suse.com/trd/kubernetes/single-html/gs_rancher_aws-marketplace/). To learn more, see our [Amazon Marketplace listing](https://aws.amazon.com/marketplace/pp/prodview-go7ent7goo5ae). Watch the [demo] (https://youtu.be/9dznJ7Ons0M) for a walkthrough of AWS Marketplace SUSE Rancher setup. From 64f9e1b7906b2b1f9a60a4006299a8256fcffebe Mon Sep 17 00:00:00 2001 From: Caleb Bron Date: Mon, 27 Feb 2023 16:44:04 -0700 Subject: [PATCH 31/36] Clarify that project-scoped secrets can't be set at the namespace level --- .../new-user-guides/kubernetes-resources-setup/secrets.md | 2 ++ .../new-user-guides/kubernetes-resources-setup/secrets.md | 2 ++ 2 files changed, 4 insertions(+) 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 5422eef7807..0d8a4d6bddc 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 @@ -63,6 +63,8 @@ Before v2.6, secrets were required to be in a project scope. Projects are no lon **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**. +Since project-scoped secrets are set at the project level, any changes made at the namespace level will be overwritten. + :::note Project-scoped secrets on the local cluster are only visible when a single project is selected. diff --git a/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md b/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md index 5422eef7807..0d8a4d6bddc 100644 --- a/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md +++ b/versioned_docs/version-2.6/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md @@ -63,6 +63,8 @@ Before v2.6, secrets were required to be in a project scope. Projects are no lon **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**. +Since project-scoped secrets are set at the project level, any changes made at the namespace level will be overwritten. + :::note Project-scoped secrets on the local cluster are only visible when a single project is selected. From 92df620622da8818209f2a0948a5795cdcb74585 Mon Sep 17 00:00:00 2001 From: Robert Fekete Date: Tue, 28 Feb 2023 19:48:10 +0100 Subject: [PATCH 32/36] Update Logging operator links (#443) * Update Logging operator doc links * Update links to Logging operator project page * Update name of the Banzai Cloud Logging operator to Logging operator * Fix broken link * Update docs/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md Co-authored-by: Marty Hernandez Avedon * Update versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md Co-authored-by: Marty Hernandez Avedon * Update versioned_docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md Co-authored-by: Marty Hernandez Avedon * Update versioned_docs/version-2.5/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md Co-authored-by: Marty Hernandez Avedon * Update docs/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md Co-authored-by: Marty Hernandez Avedon * Update versioned_docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md Co-authored-by: Marty Hernandez Avedon * Update versioned_docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md Co-authored-by: Marty Hernandez Avedon * Update versioned_docs/version-2.6/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md Co-authored-by: Marty Hernandez Avedon * Adds a linebreak between an id tag and a title * inconsistent casing fixed --------- Co-authored-by: Marty Hernandez Avedon --- .../flows-and-clusterflows.md | 8 ++++---- .../outputs-and-clusteroutputs.md | 8 ++++---- .../logging/logging-architecture.md | 10 +++++----- docs/pages-for-subheaders/logging.md | 4 ++-- .../logging-best-practices.md | 4 ++-- .../flows-and-clusterflows.md | 8 ++++---- .../outputs-and-clusteroutputs.md | 8 ++++---- .../logging/logging-architecture.md | 10 +++++----- .../current/pages-for-subheaders/logging.md | 4 ++-- .../logging-best-practices.md | 2 +- .../flows-and-clusterflows.md | 8 ++++---- .../outputs-and-clusteroutputs.md | 8 ++++---- .../logging/logging-architecture.md | 10 +++++----- .../migrate-to-rancher-v2.5+-logging.md | 2 +- .../pages-for-subheaders/logging.md | 4 ++-- .../logging-best-practices.md | 2 +- .../flows-and-clusterflows.md | 14 +++++++------- .../outputs-and-clusteroutputs.md | 18 ++++++++++-------- .../logging/logging-architecture.md | 12 ++++++------ .../migrate-to-rancher-v2.5+-logging.md | 2 +- .../pages-for-subheaders/logging.md | 4 ++-- .../logging-best-practices.md | 4 ++-- .../flows-and-clusterflows.md | 8 ++++---- .../outputs-and-clusteroutputs.md | 8 ++++---- .../logging/logging-architecture.md | 10 +++++----- .../migrate-to-rancher-v2.5+-logging.md | 2 +- .../pages-for-subheaders/logging.md | 4 ++-- .../logging-best-practices.md | 4 ++-- 28 files changed, 96 insertions(+), 94 deletions(-) diff --git a/docs/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md b/docs/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md index ef31d3d12a2..e4020351ab1 100644 --- a/docs/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md +++ b/docs/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md @@ -2,7 +2,7 @@ title: Flows and ClusterFlows --- -See the [Banzai Cloud Logging operator documentation](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. +See the [Logging operator documentation](https://kube-logging.github.io/docs/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. See [Rancher Integration with Logging Services: Troubleshooting](../../../pages-for-subheaders/logging.md#The-Logging-Buffer-Overloads-Pods) for how to resolve memory problems with the logging buffer. @@ -14,7 +14,7 @@ The `Flow` is a namespaced resource, which means logs will only be collected fro `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/) +For more details about the `Flow` custom resource, see [FlowSpec.](https://kube-logging.github.io/docs/configuration/crds/v1beta1/flow_types/) ### Matches @@ -24,13 +24,13 @@ You can specify match statements to select or exclude logs according to Kubernet Matches can be configured by filling out the `Flow` or `ClusterFlow` forms in the Rancher UI. -For detailed examples on using the match statement, see the [official documentation on log routing.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/log-routing/) +For detailed examples on using the match statement, see the [official documentation on log routing.](https://kube-logging.github.io/docs/configuration/log-routing/) ### Filters You can define one or more filters within a `Flow`. Filters can perform various actions on the logs, for example, add additional data, transform the logs, or parse values from the records. The filters in the `Flow` are applied in the order in the definition. -For a list of filters supported by the Banzai Cloud Logging operator, see [this page.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/filters/) +For a list of filters supported by the Logging operator, see [the official documentation on Fluentd filters](https://kube-logging.github.io/docs/configuration/plugins/filters/). Filters need to be configured in YAML. diff --git a/docs/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md b/docs/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md index 10396ecc000..aa558385bf0 100644 --- a/docs/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md +++ b/docs/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md @@ -2,7 +2,7 @@ title: Outputs and ClusterOutputs --- -See the [Banzai Cloud Logging operator documentation](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. +See the [Logging operator documentation](https://kube-logging.github.io/docs/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. See [Rancher Integration with Logging Services: Troubleshooting](../../../pages-for-subheaders/logging.md#The-Logging-Buffer-Overloads-Pods) for how to resolve memory problems with the logging buffer. @@ -16,7 +16,7 @@ You can use secrets in these definitions, but they must also be in the same name `Outputs` can be configured by filling out forms in the Rancher UI. -For the details of `Output` custom resource, see [OutputSpec.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/output_types/). +For the details of `Output` custom resource, see [OutputSpec.](https://kube-logging.github.io/docs/configuration/crds/v1beta1/output_types/). The Rancher UI provides forms for configuring the following `Output` types: @@ -40,7 +40,7 @@ The Rancher UI provides forms for configuring the following `Output` types: The Rancher UI provides forms for configuring the `Output` type, target, and access credentials if applicable. -For example configuration for each logging plugin supported by the logging operator, see the [logging operator documentation.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/outputs/). +For example configuration for each logging plugin supported by the logging operator, see the [Logging operator documentation](https://kube-logging.github.io/docs/configuration/plugins/outputs/). ## ClusterOutputs @@ -48,7 +48,7 @@ For example configuration for each logging plugin supported by the logging opera `ClusterOutputs` can be configured by filling out forms in the Rancher UI. -For the details of the `ClusterOutput` custom resource, see [ClusterOutput.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/clusteroutput_types/) +For the details of the `ClusterOutput` custom resource, see [ClusterOutput.](https://kube-logging.github.io/docs/configuration/crds/v1beta1/clusteroutput_types/) ## YAML Examples diff --git a/docs/integrations-in-rancher/logging/logging-architecture.md b/docs/integrations-in-rancher/logging/logging-architecture.md index 1613d9f0311..560235f4f7c 100644 --- a/docs/integrations-in-rancher/logging/logging-architecture.md +++ b/docs/integrations-in-rancher/logging/logging-architecture.md @@ -4,9 +4,9 @@ title: Architecture This section summarizes the architecture of the Rancher logging application. -For more details about how the Banzai Cloud Logging operator works, see the [official documentation.](https://banzaicloud.com/docs/one-eye/logging-operator/#architecture) +For more details about how the Logging operator works, see the [official documentation.](https://kube-logging.github.io/docs/#architecture) -### How the Banzai Cloud Logging Operator Works +### How the 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. @@ -21,8 +21,8 @@ The following custom resources are used to define how logs are filtered and sent Each `Flow` must reference an `Output`, and each `ClusterFlow` must reference a `ClusterOutput`. -The following figure from the [Banzai documentation](https://banzaicloud.com/docs/one-eye/logging-operator/#architecture) shows the new logging architecture: +The following figure from the [Logging Operator documentation](https://kube-logging.github.io/docs/#architecture) shows the new logging architecture: -
How the Banzai Cloud Logging Operator Works with Fluentd and Fluent Bit
+
How the Logging Operator Works with Fluentd and Fluent Bit
-![How the Banzai Cloud Logging Operator Works with Fluentd](/img/banzai-cloud-logging-operator.png) +![How the Logging Operator Works with Fluentd](/img/banzai-cloud-logging-operator.png) diff --git a/docs/pages-for-subheaders/logging.md b/docs/pages-for-subheaders/logging.md index 04804715e64..44eea287c6d 100644 --- a/docs/pages-for-subheaders/logging.md +++ b/docs/pages-for-subheaders/logging.md @@ -3,7 +3,7 @@ title: Rancher Integration with Logging Services description: Rancher integrates with popular logging services. Learn the requirements and benefits of integrating with logging services, and enable logging on your cluster. --- -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. +The [Logging operator](https://kube-logging.github.io/docs/) now powers Rancher's logging solution in place of the former, in-house solution. For an overview of the changes in v2.5, see [this section.](../integrations-in-rancher/logging/logging-architecture.md#changes-in-rancher-v2-5) @@ -88,7 +88,7 @@ By default, Rancher collects logs for control plane components and node componen Depending on your configuration, the default buffer size may be too large and cause pod failures. One way to reduce the load is to lower the logger's flush interval. This prevents logs from overfilling the buffer. You can also add more flush threads to handle moments when many logs are attempting to fill the buffer at once. -For a more complete description of how to configure the logging buffer to suit your organization's needs, see the official BanzaiCloud documentation on [buffers](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/outputs/buffer/) and on [Fluentd configuration](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/fluentd/). +For a more complete description of how to configure the logging buffer to suit your organization's needs, see the official Logging operator documentation on [buffers](https://kube-logging.github.io/docs/configuration/plugins/outputs/buffer/) and on [Fluentd configuration](https://kube-logging.github.io/docs/logging-infrastructure/fluentd/). ### The `cattle-logging` Namespace Being Recreated 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 d2d8f20e82d..8a34c280a77 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 @@ -12,7 +12,7 @@ Before Rancher v2.5, logging in Rancher has historically been a pretty static in 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 [Logging operator](https://github.com/kube-logging/logging-operator). We provide manageability of this operator (and its resources), and tie that experience in with managing your Rancher clusters. ## Cluster-level Logging @@ -44,7 +44,7 @@ Rancher logging will read all log entries in `/var/log/containers`, ensuring tha 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 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: diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md index a2f3e3797e1..afb2a4883f2 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md @@ -2,7 +2,7 @@ title: Flows 和 ClusterFlows --- -有关如何配置 `Flow` 和 `ClusterFlow` 的完整详细信息，请参阅 [Banzai Cloud Logging Operator 文档](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/)。 +有关如何配置 `Flow` 和 `ClusterFlow` 的完整详细信息，请参阅 [Logging Operator 文档](https://kube-logging.github.io/docs/configuration/flow/)。 有关如何解决 Logging 缓冲区的内存问题，请参阅 [Rancher 与 Logging 服务的集成：故障排除](../../../pages-for-subheaders/logging.md#日志缓冲区导致-pod-过载)。 @@ -14,7 +14,7 @@ title: Flows 和 ClusterFlows 你可以通过在 Rancher UI 中填写表单来配置 `Flow`。 -有关 `Flow` 自定义资源的更多详细信息，请参阅 [FlowSpec](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/flow_types/)。 +有关 `Flow` 自定义资源的更多详细信息，请参阅 [FlowSpec](https://kube-logging.github.io/docs/configuration/crds/v1beta1/flow_types/)。 ### Matches @@ -24,13 +24,13 @@ title: Flows 和 ClusterFlows 你可以通过填写 Rancher UI 中的 `Flow` 或 `ClusterFlow` 表单来配置匹配。 -使用 match 语句的详细示例，请参阅[日志路由的官方文档](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/log-routing/)。 +使用 match 语句的详细示例，请参阅[日志路由的官方文档](https://kube-logging.github.io/docs/configuration/log-routing/)。 ### Filters 你可以在 `Flow` 中定义一个或多个过滤器。过滤器可以对日志执行各种操作，例如，添加其他数据、转换日志或解析记录中的值。`Flow` 中的过滤器会按定义的顺序应用。 -有关 Banzai Cloud Logging Operator 支持的过滤器列表，请参阅[此页面](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/filters/)。 +有关 Logging Operator 支持的过滤器列表，请参阅[此页面](https://kube-logging.github.io/docs/configuration/plugins/filters/)。 过滤器需要在 YAML 中配置。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md index e31e9ad8fd5..1ad5b65f48b 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md @@ -2,7 +2,7 @@ title: Outputs 和 ClusterOutputs --- -有关如何配置 `Flow` 和 `ClusterFlow` 的完整详细信息，请参阅 [Banzai Cloud Logging Operator 文档](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/)。 +有关如何配置 `Flow` 和 `ClusterFlow` 的完整详细信息，请参阅 [Logging Operator 文档](https://kube-logging.github.io/docs/configuration/flow/)。 有关如何解决 Logging 缓冲区的内存问题，请参阅 [Rancher 与 Logging 服务的集成：故障排除](../../../pages-for-subheaders/logging.md#日志缓冲区导致-pod-过载)。 @@ -16,7 +16,7 @@ title: Outputs 和 ClusterOutputs 你可以通过在 Rancher UI 中填写表单来配置 `Output`。 -有关 `Output` 自定义资源的更多详细信息，请参阅 [OutputSpec](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/output_types/)。 +有关 `Output` 自定义资源的更多详细信息，请参阅 [OutputSpec](https://kube-logging.github.io/docs/configuration/crds/v1beta1/output_types/)。 Rancher UI 提供了用于配置以下类型 `Output` 的表单： @@ -40,7 +40,7 @@ Rancher UI 提供了用于配置以下类型 `Output` 的表单： Rancher UI 提供了用于配置 `Output` 类型、目标和访问凭证（如果适用）的表单。 -有关 Logging Operator 支持的日志插件配置示例，请参阅 [Logging Operator 文档](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/outputs/)。 +有关 Logging Operator 支持的日志插件配置示例，请参阅 [Logging Operator 文档](https://kube-logging.github.io/docs/configuration/plugins/outputs/)。 ## ClusterOutputs @@ -48,7 +48,7 @@ Rancher UI 提供了用于配置 `Output` 类型、目标和访问凭证（如 你可以通过在 Rancher UI 中填写表单来配置 `ClusterOutput`。 -有关 `ClusterOutput` 自定义资源的更多详细信息，请参阅 [ClusterOutput](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/clusteroutput_types/)。 +有关 `ClusterOutput` 自定义资源的更多详细信息，请参阅 [ClusterOutput](https://kube-logging.github.io/docs/configuration/crds/v1beta1/clusteroutput_types/)。 ## YAML 示例 diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/logging-architecture.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/logging-architecture.md index 47baa1f1f0d..6cbed01e32c 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/logging-architecture.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/logging-architecture.md @@ -4,9 +4,9 @@ title: 架构 本节介绍了 Rancher Logging 应用程序的架构。 -有关 Banzai Cloud Logging Operator 工作原理的更多详细信息，请参阅[官方文档](https://banzaicloud.com/docs/one-eye/logging-operator/#architecture)。 +有关 Logging Operator 工作原理的更多详细信息，请参阅[官方文档](https://kube-logging.github.io/docs/#architecture)。 -### Banzai Cloud Logging Operator 工作原理 +### Logging Operator 工作原理 Logging Operator 自动部署和配置 Kubernetes 日志流水线。它会在每个节点上部署和配置一个 Fluent Bit DaemonSet，从而收集节点文件系统中的容器和应用程序日志。 @@ -21,8 +21,8 @@ Fluent Bit 查询 Kubernetes API 并使用 pod 的元数据来丰富日志，然 每个 `Flow` 都必须引用一个 `Output`，而每个 `ClusterFlow` 都必须引用一个 `ClusterOutput`。 -[Banzai 文档](https://banzaicloud.com/docs/one-eye/logging-operator/#architecture)中的下图显示了新的 Logging 架构： +[文档](https://kube-logging.github.io/docs/#architecture)中的下图显示了新的 Logging 架构： -
Banzai Cloud Logging Operator 如何与 Fluentd 和 Fluent Bit 一起使用
+
Logging Operator 如何与 Fluentd 和 Fluent Bit 一起使用
-![Banzai Cloud Logging Operator 如何与 Fluentd 一起使用](/img/banzai-cloud-logging-operator.png) +![Logging Operator 如何与 Fluentd 一起使用](/img/banzai-cloud-logging-operator.png) 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 88e0f4757d7..8c85527285f 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 @@ -3,7 +3,7 @@ title: Rancher Logging 集成 description: Rancher 集成了主流的日志服务。了解集成日志服务的要求和优势，并在你的集群上启用 Logging。 --- -现在，Rancher 的日志管理由 [Banzai Cloud Logging operator](https://banzaicloud.com/docs/one-eye/logging-operator/) 提供支持，它取代了以前的内部解决方案。 +现在，Rancher 的日志管理由 [Logging operator](https://kube-logging.github.io/docs/) 提供支持，它取代了以前的内部解决方案。 有关 Rancher 2.5 更改的概述，请参阅[本节](../integrations-in-rancher/logging/logging-architecture.md#rancher-2-5-变更)。 @@ -88,7 +88,7 @@ Windows 集群支持 Logging，你可以收集 Windows 节点的日志。 根据你的配置，默认缓冲区大小可能太大并导致 Pod 故障。减少负载的一种方法是降低记录器的刷新间隔。这可以防止日志溢出缓冲区。你还可以添加更多刷新线程来处理大量日志试图同时填充缓冲区的情况。 -有关如何配置日志缓冲区来满足企业需求的更完整说明，请参阅 [缓冲区](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/outputs/buffer/)和 [Fluentd 配置](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/fluentd/)的官方 BanzaiCloud 文档。 +有关如何配置日志缓冲区来满足企业需求的更完整说明，请参阅 [缓冲区](https://kube-logging.github.io/docs/configuration/plugins/outputs/buffer/)和 [Fluentd 配置](https://kube-logging.github.io/docs/logging-infrastructure/fluentd/)的官方 文档。 ### `cattle-logging` 命名空间正在重新创建 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 2ebbef30cb9..3e5c05ca109 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 @@ -12,7 +12,7 @@ title: Logging 最佳实践 现在，Rancher 的日志聚合更加灵活。通过新的 Logging 的功能，管理员和用户都可以部署符合细粒度收集标准的日志记录，同时提供更多的目标和配置选项。 -Rancher 的 Logging 使用的是 Banzai Cloud logging operator。我们让你可以管理这个 operator 及其资源，并将它的管理功能和 Rancher 集群管理联系起来。 +Rancher 的 Logging 使用的是 logging operator。我们让你可以管理这个 operator 及其资源，并将它的管理功能和 Rancher 集群管理联系起来。 ## 集群级别日志 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md index a2f3e3797e1..bcf26855f81 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md @@ -2,7 +2,7 @@ title: Flows 和 ClusterFlows --- -有关如何配置 `Flow` 和 `ClusterFlow` 的完整详细信息，请参阅 [Banzai Cloud Logging Operator 文档](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/)。 +有关如何配置 `Flow` 和 `ClusterFlow` 的完整详细信息，请参阅 [Banzai Cloud Logging Operator 文档](https://kube-logging.github.io/docs/configuration/flow/)。 有关如何解决 Logging 缓冲区的内存问题，请参阅 [Rancher 与 Logging 服务的集成：故障排除](../../../pages-for-subheaders/logging.md#日志缓冲区导致-pod-过载)。 @@ -14,7 +14,7 @@ title: Flows 和 ClusterFlows 你可以通过在 Rancher UI 中填写表单来配置 `Flow`。 -有关 `Flow` 自定义资源的更多详细信息，请参阅 [FlowSpec](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/flow_types/)。 +有关 `Flow` 自定义资源的更多详细信息，请参阅 [FlowSpec](https://kube-logging.github.io/docs/configuration/crds/v1beta1/flow_types/)。 ### Matches @@ -24,13 +24,13 @@ title: Flows 和 ClusterFlows 你可以通过填写 Rancher UI 中的 `Flow` 或 `ClusterFlow` 表单来配置匹配。 -使用 match 语句的详细示例，请参阅[日志路由的官方文档](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/log-routing/)。 +使用 match 语句的详细示例，请参阅[日志路由的官方文档](https://kube-logging.github.io/docs/configuration/log-routing/)。 ### Filters 你可以在 `Flow` 中定义一个或多个过滤器。过滤器可以对日志执行各种操作，例如，添加其他数据、转换日志或解析记录中的值。`Flow` 中的过滤器会按定义的顺序应用。 -有关 Banzai Cloud Logging Operator 支持的过滤器列表，请参阅[此页面](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/filters/)。 +有关 Logging Operator 支持的过滤器列表，请参阅[此页面](https://kube-logging.github.io/docs/configuration/plugins/filters/)。 过滤器需要在 YAML 中配置。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md index e31e9ad8fd5..1ad5b65f48b 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md @@ -2,7 +2,7 @@ title: Outputs 和 ClusterOutputs --- -有关如何配置 `Flow` 和 `ClusterFlow` 的完整详细信息，请参阅 [Banzai Cloud Logging Operator 文档](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/)。 +有关如何配置 `Flow` 和 `ClusterFlow` 的完整详细信息，请参阅 [Logging Operator 文档](https://kube-logging.github.io/docs/configuration/flow/)。 有关如何解决 Logging 缓冲区的内存问题，请参阅 [Rancher 与 Logging 服务的集成：故障排除](../../../pages-for-subheaders/logging.md#日志缓冲区导致-pod-过载)。 @@ -16,7 +16,7 @@ title: Outputs 和 ClusterOutputs 你可以通过在 Rancher UI 中填写表单来配置 `Output`。 -有关 `Output` 自定义资源的更多详细信息，请参阅 [OutputSpec](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/output_types/)。 +有关 `Output` 自定义资源的更多详细信息，请参阅 [OutputSpec](https://kube-logging.github.io/docs/configuration/crds/v1beta1/output_types/)。 Rancher UI 提供了用于配置以下类型 `Output` 的表单： @@ -40,7 +40,7 @@ Rancher UI 提供了用于配置以下类型 `Output` 的表单： Rancher UI 提供了用于配置 `Output` 类型、目标和访问凭证（如果适用）的表单。 -有关 Logging Operator 支持的日志插件配置示例，请参阅 [Logging Operator 文档](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/outputs/)。 +有关 Logging Operator 支持的日志插件配置示例，请参阅 [Logging Operator 文档](https://kube-logging.github.io/docs/configuration/plugins/outputs/)。 ## ClusterOutputs @@ -48,7 +48,7 @@ Rancher UI 提供了用于配置 `Output` 类型、目标和访问凭证（如 你可以通过在 Rancher UI 中填写表单来配置 `ClusterOutput`。 -有关 `ClusterOutput` 自定义资源的更多详细信息，请参阅 [ClusterOutput](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/clusteroutput_types/)。 +有关 `ClusterOutput` 自定义资源的更多详细信息，请参阅 [ClusterOutput](https://kube-logging.github.io/docs/configuration/crds/v1beta1/clusteroutput_types/)。 ## YAML 示例 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/logging-architecture.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/logging-architecture.md index 47baa1f1f0d..6a9d6a1ccbc 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/logging-architecture.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/logging-architecture.md @@ -4,9 +4,9 @@ title: 架构 本节介绍了 Rancher Logging 应用程序的架构。 -有关 Banzai Cloud Logging Operator 工作原理的更多详细信息，请参阅[官方文档](https://banzaicloud.com/docs/one-eye/logging-operator/#architecture)。 +有关 Logging Operator 工作原理的更多详细信息，请参阅[官方文档](https://kube-logging.github.io/docs/#architecture)。 -### Banzai Cloud Logging Operator 工作原理 +### Logging Operator 工作原理 Logging Operator 自动部署和配置 Kubernetes 日志流水线。它会在每个节点上部署和配置一个 Fluent Bit DaemonSet，从而收集节点文件系统中的容器和应用程序日志。 @@ -21,8 +21,8 @@ Fluent Bit 查询 Kubernetes API 并使用 pod 的元数据来丰富日志，然 每个 `Flow` 都必须引用一个 `Output`，而每个 `ClusterFlow` 都必须引用一个 `ClusterOutput`。 -[Banzai 文档](https://banzaicloud.com/docs/one-eye/logging-operator/#architecture)中的下图显示了新的 Logging 架构： +[Banzai 文档](https://kube-logging.github.io/docs/#architecture)中的下图显示了新的 Logging 架构： -
Banzai Cloud Logging Operator 如何与 Fluentd 和 Fluent Bit 一起使用
+
Logging Operator 如何与 Fluentd 和 Fluent Bit 一起使用
-![Banzai Cloud Logging Operator 如何与 Fluentd 一起使用](/img/banzai-cloud-logging-operator.png) +![Logging Operator 如何与 Fluentd 一起使用](/img/banzai-cloud-logging-operator.png) diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md index 2fcd5e6cdd0..75f2ca88f05 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md @@ -1,7 +1,7 @@ --- title: 迁移到 Rancher 2.5 Logging --- -Rancher 2.5 彻底修改了 Logging 功能。我们现在使用了 Banzai Cloud 的 [logging operator](https://github.com/banzaicloud/logging-operator)，Rancher 配置了此工具以供部署 Logging 使用。 +Rancher 2.5 彻底修改了 Logging 功能。我们现在使用了 的 [logging operator](https://github.com/kube-logging/logging-operator)，Rancher 配置了此工具以供部署 Logging 使用。 在新的 Logging 功能的众多特性和变化中，其中一项是取消了项目级别的 Logging 配置。取而代之的是在命名空间级别配置 Logging。集群级日志仍然可用，但配置选项不同。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/logging.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/logging.md index ebbdb3b70c9..9af1625ca2a 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/logging.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/logging.md @@ -3,7 +3,7 @@ title: Rancher Logging 集成 description: Rancher 集成了主流的日志服务。了解集成日志服务的要求和优势，并在你的集群上启用 Logging。 --- -现在，Rancher 的日志管理由 [Banzai Cloud Logging operator](https://banzaicloud.com/docs/one-eye/logging-operator/) 提供支持，它取代了以前的内部解决方案。 +现在，Rancher 的日志管理由 [Logging operator](https://kube-logging.github.io/docs/) 提供支持，它取代了以前的内部解决方案。 有关 Rancher 2.5 更改的概述，请参阅[本节](../integrations-in-rancher/logging/logging-architecture.md#rancher-2-5-变更)。有关迁移 Logging V1 的更多信息，请参阅[本页](../integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md)。 @@ -117,7 +117,7 @@ Windows 集群支持 Logging，你可以收集 Windows 节点的日志。 根据你的配置，默认缓冲区大小可能太大并导致 Pod 故障。减少负载的一种方法是降低记录器的刷新间隔。这可以防止日志溢出缓冲区。你还可以添加更多刷新线程来处理大量日志试图同时填充缓冲区的情况。 -有关如何配置日志缓冲区来满足企业需求的更完整说明，请参阅 [缓冲区](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/outputs/buffer/)和 [Fluentd 配置](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/fluentd/)的官方 BanzaiCloud 文档。 +有关如何配置日志缓冲区来满足企业需求的更完整说明，请参阅 [缓冲区](https://kube-logging.github.io/docs/configuration/plugins/outputs/buffer/)和 [Fluentd 配置](https://kube-logging.github.io/docs/logging-infrastructure/fluentd/)的官方 文档。 ### `cattle-logging` 命名空间正在重新创建 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md index 2ebbef30cb9..c4968dd61bc 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md @@ -12,7 +12,7 @@ title: Logging 最佳实践 现在，Rancher 的日志聚合更加灵活。通过新的 Logging 的功能，管理员和用户都可以部署符合细粒度收集标准的日志记录，同时提供更多的目标和配置选项。 -Rancher 的 Logging 使用的是 Banzai Cloud logging operator。我们让你可以管理这个 operator 及其资源，并将它的管理功能和 Rancher 集群管理联系起来。 +Rancher 的 Logging 使用的是 Logging operator。我们让你可以管理这个 operator 及其资源，并将它的管理功能和 Rancher 集群管理联系起来。 ## 集群级别日志 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 343b4188a42..e6a5cc8d175 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 @@ -2,7 +2,7 @@ title: Flows and ClusterFlows --- -See the [Banzai Cloud Logging operator documentation](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. +See the [Logging operator documentation](https://kube-logging.github.io/docs/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. See [Rancher Integration with Logging Services: Troubleshooting](../../../../pages-for-subheaders/logging.md#The-Logging-Buffer-Overloads-Pods) for how to resolve memory problems with the logging buffer. @@ -33,7 +33,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. -For more details about the `Flow` custom resource, see [FlowSpec.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/flow_types/) +For more details about the `Flow` custom resource, see [FlowSpec.](https://kube-logging.github.io/docs/configuration/crds/v1beta1/flow_types/) @@ -46,7 +46,7 @@ You can specify match statements to select or exclude logs according to Kubernet Matches can be configured by filling out the `Flow` or `ClusterFlow` forms in the Rancher UI. -For detailed examples on using the match statement, see the [official documentation on log routing.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/log-routing/) +For detailed examples on using the match statement, see the [official documentation on log routing.](https://kube-logging.github.io/docs/configuration/log-routing/) @@ -54,7 +54,7 @@ For detailed examples on using the match statement, see the [official documentat You can define one or more filters within a `Flow`. Filters can perform various actions on the logs, for example, add additional data, transform the logs, or parse values from the records. The filters in the `Flow` are applied in the order in the definition. -For a list of filters supported by the Banzai Cloud Logging operator, see [this page.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/filters/) +For a list of filters supported by the Logging operator, see [the official documentation on Fluentd filters](https://kube-logging.github.io/docs/configuration/plugins/filters/). Filters need to be configured in YAML. @@ -93,7 +93,7 @@ A `Flow` defines which logs to collect and filter and which `Output` to send the `Flows` need to be defined in YAML. -For more details about the `Flow` custom resource, see [FlowSpec.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/flow_types/) +For more details about the `Flow` custom resource, see [FlowSpec.](https://kube-logging.github.io/docs/configuration/crds/v1beta1/flow_types/) @@ -104,7 +104,7 @@ Match statements are used to select which containers to pull logs from. You can specify match statements to select or exclude logs according to Kubernetes labels, container and host names. Match statements are evaluated in the order they are defined and processed only until the first matching select or exclude rule applies. -For detailed examples on using the match statement, see the [official documentation on log routing.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/log-routing/) +For detailed examples on using the match statement, see the [official documentation on log routing.](https://kube-logging.github.io/docs/configuration/log-routing/) @@ -112,7 +112,7 @@ For detailed examples on using the match statement, see the [official documentat You can define one or more filters within a `Flow`. Filters can perform various actions on the logs, for example, add additional data, transform the logs, or parse values from the records. The filters in the `Flow` are applied in the order in the definition. -For a list of filters supported by the Banzai Cloud Logging operator, see [this page.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/filters/) +For a list of filters supported by the Logging operator, see [this page.](https://kube-logging.github.io/docs/configuration/plugins/filters/) 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 4caba1247b2..ebb71d5a533 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 @@ -2,7 +2,7 @@ title: Outputs and ClusterOutputs --- -See the [Banzai Cloud Logging operator documentation](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. +See the [Logging operator documentation](https://kube-logging.github.io/docs/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. See [Rancher Integration with Logging Services: Troubleshooting](../../../../pages-for-subheaders/logging.md#The-Logging-Buffer-Overloads-Pods) for how to resolve memory problems with the logging buffer. @@ -20,6 +20,7 @@ The `Outputs` and `ClusterOutputs` can now be configured by filling out forms in + ## Outputs The `Output` resource defines where your `Flows` can send the log messages. `Outputs` are the final stage for a logging `Flow`. @@ -28,7 +29,7 @@ The `Output` is a namespaced resource, which means only a `Flow` within the same You can use secrets in these definitions, but they must also be in the same namespace. -For the details of `Output` custom resource, see [OutputSpec.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/output_types/). +For the details of `Output` custom resource, see [OutputSpec.](https://kube-logging.github.io/docs/configuration/crds/v1beta1/output_types/). The Rancher UI provides forms for configuring the following `Output` types: @@ -52,7 +53,7 @@ The Rancher UI provides forms for configuring the following `Output` types: The Rancher UI provides forms for configuring the `Output` type, target, and access credentials if applicable. -For example configuration for each logging plugin supported by the logging operator, see the [logging operator documentation.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/outputs/). +For example configuration for each logging plugin supported by the logging operator, see the [Logging operator documentation](https://kube-logging.github.io/docs/configuration/plugins/outputs/). @@ -60,7 +61,7 @@ For example configuration for each logging plugin supported by the logging opera `ClusterOutput` defines an `Output` without namespace restrictions. It is only effective when deployed in the same namespace as the logging operator. -For the details of the `ClusterOutput` custom resource, see [ClusterOutput.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/clusteroutput_types/) +For the details of the `ClusterOutput` custom resource, see [ClusterOutput.](https://kube-logging.github.io/docs/configuration/crds/v1beta1/clusteroutput_types/) @@ -70,6 +71,7 @@ For the details of the `ClusterOutput` custom resource, see [ClusterOutput.](htt + ## Outputs The `Output` resource defines where your `Flows` can send the log messages. `Outputs` are the final stage for a logging `Flow`. @@ -78,9 +80,9 @@ The `Output` is a namespaced resource, which means only a `Flow` within the same You can use secrets in these definitions, but they must also be in the same namespace. -`Outputs` are configured in YAML. For the details of `Output` custom resource, see [OutputSpec.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/output_types/) +`Outputs` are configured in YAML. For the details of `Output` custom resource, see [OutputSpec.](https://kube-logging.github.io/docs/configuration/crds/v1beta1/output_types/) -For examples of configuration for each logging plugin supported by the logging operator, see the [logging operator documentation.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/outputs/) +For examples of configuration for each logging plugin supported by the logging operator, see the [logging operator documentation.](https://kube-logging.github.io/docs/configuration/plugins/outputs/) @@ -90,9 +92,9 @@ For examples of configuration for each logging plugin supported by the logging o The Rancher UI provides forms for configuring the `ClusterOutput` type, target, and access credentials if applicable. -`ClusterOutputs` are configured in YAML. For the details of `ClusterOutput` custom resource, see [ClusterOutput.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/clusteroutput_types/) +`ClusterOutputs` are configured in YAML. For the details of `ClusterOutput` custom resource, see [ClusterOutput.](https://kube-logging.github.io/docs/configuration/crds/v1beta1/clusteroutput_types/) -For example configuration for each logging plugin supported by the logging operator, see the [logging operator documentation.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/outputs/) +For example configuration for each logging plugin supported by the logging operator, see the [logging operator documentation.](https://kube-logging.github.io/docs/configuration/plugins/outputs/) 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 9bacb0dad6e..e8cd6aef789 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 @@ -4,20 +4,20 @@ title: Architecture This section summarizes the architecture of the Rancher logging application. -For more details about how the Banzai Cloud Logging operator works, see the [official documentation.](https://banzaicloud.com/docs/one-eye/logging-operator/#architecture) +For more details about how the Logging operator works, see the [official documentation.](https://kube-logging.github.io/docs/#architecture) ### Changes in Rancher v2.5 The following changes were introduced to logging in Rancher v2.5: -- 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. +- The [Logging operator](https://kube-logging.github.io/docs/) now powers Rancher's logging solution in place of the former, in-house solution. - [Fluent Bit](https://fluentbit.io/) is now used to aggregate the logs, and [Fluentd](https://www.fluentd.org/) is used for filtering the messages and routing them to the `Outputs`. Previously, only Fluentd was used. - Logging can be configured with a Kubernetes manifest, because logging now uses a Kubernetes operator with Custom Resource Definitions. - We now support filtering logs. - We now support writing logs to multiple `Outputs`. - We now always collect Control Plane and etcd logs. -### How the Banzai Cloud Logging Operator Works +### How the 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. @@ -32,8 +32,8 @@ The following custom resources are used to define how logs are filtered and sent Each `Flow` must reference an `Output`, and each `ClusterFlow` must reference a `ClusterOutput`. -The following figure from the [Banzai documentation](https://banzaicloud.com/docs/one-eye/logging-operator/#architecture) shows the new logging architecture: +The following figure from the [Logging operator documentation](https://kube-logging.github.io/docs/#architecture) shows the new logging architecture: -
How the Banzai Cloud Logging Operator Works with Fluentd and Fluent Bit
+
How the Logging Operator Works with Fluentd and Fluent Bit
-![How the Banzai Cloud Logging Operator Works with Fluentd](/img/banzai-cloud-logging-operator.png) \ No newline at end of file +![How the Logging Operator Works with Fluentd](/img/banzai-cloud-logging-operator.png) \ No newline at end of file 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 b0552cbf350..46c40d61095 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 @@ -2,7 +2,7 @@ title: Migrating to Rancher v2.5 Logging --- -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. +Starting in v2.5, the logging feature available within Rancher has been completely overhauled. The [Logging operator](https://github.com/kube-logging/logging-operator) 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. 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 7bfa4aa83eb..a3ceca24d44 100644 --- a/versioned_docs/version-2.5/pages-for-subheaders/logging.md +++ b/versioned_docs/version-2.5/pages-for-subheaders/logging.md @@ -3,7 +3,7 @@ title: Rancher Integration with Logging Services description: Rancher integrates with popular logging services. Learn the requirements and benefits of integrating with logging services, and enable logging on your cluster. --- -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. +The [Logging operator](https://kube-logging.github.io/docs/) now powers Rancher's logging solution in place of the former, in-house solution. For an overview of the changes in v2.5, see [this section.](../explanations/integrations-in-rancher/logging/logging-architecture.md#changes-in-rancher-v25) For information about migrating from Logging V1, see [this page.](../explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md) @@ -104,7 +104,7 @@ By default, Rancher collects logs for control plane components and node componen Depending on your configuration, the default buffer size may be too large and cause pod failures. One way to reduce the load is to lower the logger's flush interval. This prevents logs from overfilling the buffer. You can also add more flush threads to handle moments when many logs are attempting to fill the buffer at once. -For a more complete description of how to configure the logging buffer to suit your organization's needs, see the official BanzaiCloud documentation on [buffers](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/outputs/buffer/) and on [Fluentd configuration](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/fluentd/). +For a more complete description of how to configure the logging buffer to suit your organization's needs, see the official Logging operator documentation on [buffers](https://kube-logging.github.io/docs/configuration/plugins/outputs/buffer/) and on [Fluentd configuration](https://kube-logging.github.io/docs/logging-infrastructure/fluentd/). ### The `cattle-logging` Namespace Being Recreated diff --git a/versioned_docs/version-2.5/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md b/versioned_docs/version-2.5/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md index cea2ae1c83c..9456f97c123 100644 --- a/versioned_docs/version-2.5/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md +++ b/versioned_docs/version-2.5/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md @@ -15,7 +15,7 @@ Before Rancher v2.5, logging in Rancher has historically been a pretty static in Logging in 2.5 has been completely overhauled to provide a more flexible experience for log aggregation. With the new 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 [Logging operator](https://github.com/kube-logging/logging-operator). We provide manageability of this operator (and its resources), and tie that experience in with managing your Rancher clusters. ## Cluster-level Logging @@ -47,7 +47,7 @@ Rancher logging will read all log entries in `/var/log/containers`, ensuring tha 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 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: diff --git a/versioned_docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md b/versioned_docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md index ef31d3d12a2..e4020351ab1 100644 --- a/versioned_docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md +++ b/versioned_docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md @@ -2,7 +2,7 @@ title: Flows and ClusterFlows --- -See the [Banzai Cloud Logging operator documentation](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. +See the [Logging operator documentation](https://kube-logging.github.io/docs/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. See [Rancher Integration with Logging Services: Troubleshooting](../../../pages-for-subheaders/logging.md#The-Logging-Buffer-Overloads-Pods) for how to resolve memory problems with the logging buffer. @@ -14,7 +14,7 @@ The `Flow` is a namespaced resource, which means logs will only be collected fro `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/) +For more details about the `Flow` custom resource, see [FlowSpec.](https://kube-logging.github.io/docs/configuration/crds/v1beta1/flow_types/) ### Matches @@ -24,13 +24,13 @@ You can specify match statements to select or exclude logs according to Kubernet Matches can be configured by filling out the `Flow` or `ClusterFlow` forms in the Rancher UI. -For detailed examples on using the match statement, see the [official documentation on log routing.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/log-routing/) +For detailed examples on using the match statement, see the [official documentation on log routing.](https://kube-logging.github.io/docs/configuration/log-routing/) ### Filters You can define one or more filters within a `Flow`. Filters can perform various actions on the logs, for example, add additional data, transform the logs, or parse values from the records. The filters in the `Flow` are applied in the order in the definition. -For a list of filters supported by the Banzai Cloud Logging operator, see [this page.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/filters/) +For a list of filters supported by the Logging operator, see [the official documentation on Fluentd filters](https://kube-logging.github.io/docs/configuration/plugins/filters/). Filters need to be configured in YAML. diff --git a/versioned_docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md b/versioned_docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md index 10396ecc000..da6ed1cef3d 100644 --- a/versioned_docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md +++ b/versioned_docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md @@ -2,7 +2,7 @@ title: Outputs and ClusterOutputs --- -See the [Banzai Cloud Logging operator documentation](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. +See the [Logging operator documentation](https://kube-logging.github.io/docs/configuration/flow/) for the full details on how to configure `Flows` and `ClusterFlows`. See [Rancher Integration with Logging Services: Troubleshooting](../../../pages-for-subheaders/logging.md#The-Logging-Buffer-Overloads-Pods) for how to resolve memory problems with the logging buffer. @@ -16,7 +16,7 @@ You can use secrets in these definitions, but they must also be in the same name `Outputs` can be configured by filling out forms in the Rancher UI. -For the details of `Output` custom resource, see [OutputSpec.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/output_types/). +For the details of `Output` custom resource, see [OutputSpec](https://kube-logging.github.io/docs/configuration/crds/v1beta1/output_types/). The Rancher UI provides forms for configuring the following `Output` types: @@ -40,7 +40,7 @@ The Rancher UI provides forms for configuring the following `Output` types: The Rancher UI provides forms for configuring the `Output` type, target, and access credentials if applicable. -For example configuration for each logging plugin supported by the logging operator, see the [logging operator documentation.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/outputs/). +For example configuration for each logging plugin supported by the logging operator, see the [Logging operator documentation](https://kube-logging.github.io/docs/configuration/plugins/outputs/). ## ClusterOutputs @@ -48,7 +48,7 @@ For example configuration for each logging plugin supported by the logging opera `ClusterOutputs` can be configured by filling out forms in the Rancher UI. -For the details of the `ClusterOutput` custom resource, see [ClusterOutput.](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/clusteroutput_types/) +For the details of the `ClusterOutput` custom resource, see [ClusterOutput.](https://kube-logging.github.io/docs/configuration/crds/v1beta1/clusteroutput_types/) ## YAML Examples diff --git a/versioned_docs/version-2.6/integrations-in-rancher/logging/logging-architecture.md b/versioned_docs/version-2.6/integrations-in-rancher/logging/logging-architecture.md index 1613d9f0311..9a5d52eb0f8 100644 --- a/versioned_docs/version-2.6/integrations-in-rancher/logging/logging-architecture.md +++ b/versioned_docs/version-2.6/integrations-in-rancher/logging/logging-architecture.md @@ -4,9 +4,9 @@ title: Architecture This section summarizes the architecture of the Rancher logging application. -For more details about how the Banzai Cloud Logging operator works, see the [official documentation.](https://banzaicloud.com/docs/one-eye/logging-operator/#architecture) +For more details about how the Logging operator works, see the [official documentation.](https://kube-logging.github.io/docs/#architecture) -### How the Banzai Cloud Logging Operator Works +### How the 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. @@ -21,8 +21,8 @@ The following custom resources are used to define how logs are filtered and sent Each `Flow` must reference an `Output`, and each `ClusterFlow` must reference a `ClusterOutput`. -The following figure from the [Banzai documentation](https://banzaicloud.com/docs/one-eye/logging-operator/#architecture) shows the new logging architecture: +The following figure from the [Logging operator documentation](https://kube-logging.github.io/docs/#architecture) shows the new logging architecture: -
How the Banzai Cloud Logging Operator Works with Fluentd and Fluent Bit
+
How the Logging Operator Works with Fluentd and Fluent Bit
-![How the Banzai Cloud Logging Operator Works with Fluentd](/img/banzai-cloud-logging-operator.png) +![How the Logging Operator Works with Fluentd](/img/banzai-cloud-logging-operator.png) diff --git a/versioned_docs/version-2.6/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md b/versioned_docs/version-2.6/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md index 416065c7bb3..7bcf55b7f6e 100644 --- a/versioned_docs/version-2.6/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md +++ b/versioned_docs/version-2.6/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md @@ -1,7 +1,7 @@ --- title: Migrating to Rancher v2.5 Logging --- -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. +Starting in v2.5, the logging feature available within Rancher has been completely overhauled. The [Logging operator](https://github.com/kube-logging/logging-operator) 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. diff --git a/versioned_docs/version-2.6/pages-for-subheaders/logging.md b/versioned_docs/version-2.6/pages-for-subheaders/logging.md index d938b6ea891..822d6b3b92e 100644 --- a/versioned_docs/version-2.6/pages-for-subheaders/logging.md +++ b/versioned_docs/version-2.6/pages-for-subheaders/logging.md @@ -3,7 +3,7 @@ title: Rancher Integration with Logging Services description: Rancher integrates with popular logging services. Learn the requirements and benefits of integrating with logging services, and enable logging on your cluster. --- -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. +The [Logging operator](https://kube-logging.github.io/docs/) now powers Rancher's logging solution in place of the former, in-house solution. For an overview of the changes in v2.5, see [this section.](../integrations-in-rancher/logging/logging-architecture.md#changes-in-rancher-v2-5) For information about migrating from Logging V1, see [this page.](../integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md) @@ -117,7 +117,7 @@ By default, Rancher collects logs for control plane components and node componen Depending on your configuration, the default buffer size may be too large and cause pod failures. One way to reduce the load is to lower the logger's flush interval. This prevents logs from overfilling the buffer. You can also add more flush threads to handle moments when many logs are attempting to fill the buffer at once. -For a more complete description of how to configure the logging buffer to suit your organization's needs, see the official BanzaiCloud documentation on [buffers](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/plugins/outputs/buffer/) and on [Fluentd configuration](https://banzaicloud.com/docs/one-eye/logging-operator/configuration/fluentd/). +For a more complete description of how to configure the logging buffer to suit your organization's needs, see the official Logging operator documentation on [buffers](https://kube-logging.github.io/docs/configuration/plugins/outputs/buffer/) and on [Fluentd configuration](https://kube-logging.github.io/docs/logging-infrastructure/fluentd/). ### The `cattle-logging` Namespace Being Recreated diff --git a/versioned_docs/version-2.6/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md b/versioned_docs/version-2.6/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md index d2d8f20e82d..8a34c280a77 100644 --- a/versioned_docs/version-2.6/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md +++ b/versioned_docs/version-2.6/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md @@ -12,7 +12,7 @@ Before Rancher v2.5, logging in Rancher has historically been a pretty static in 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 [Logging operator](https://github.com/kube-logging/logging-operator). We provide manageability of this operator (and its resources), and tie that experience in with managing your Rancher clusters. ## Cluster-level Logging @@ -44,7 +44,7 @@ Rancher logging will read all log entries in `/var/log/containers`, ensuring tha 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 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: From 0919b117d46e011112ecea8babe540999072a0d8 Mon Sep 17 00:00:00 2001 From: vickyhella Date: Wed, 1 Mar 2023 11:29:17 +0800 Subject: [PATCH 33/36] Update v2.7 Chinese translation --- .../kubernetes-resources-setup/secrets.md | 2 + .../flows-and-clusterflows.md | 2 +- .../logging/logging-architecture.md | 2 +- .../deploy-rancher-manager.md | 1 - .../installation-requirements.md | 38 +++++-------------- .../current/pages-for-subheaders/logging.md | 2 +- .../logging-best-practices.md | 4 +- 7 files changed, 16 insertions(+), 35 deletions(-) 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 de23af260b9..d4618d910e1 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 @@ -63,6 +63,8 @@ title: 密文 **结果**：密文已添加到你选择的项目中。你可以在 Rancher UI 中单击**存储 > 密文**或**更多资源 > 核心 > 密文**来查看密文。 +由于项目范围的 Secret 是在项目级别设置的，因此在命名空间级别所做的任何更改都将被覆盖。 + :::note local 集群上的项目级别密文仅在选择单个项目时可见。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md index afb2a4883f2..ab7f461150a 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md @@ -30,7 +30,7 @@ title: Flows 和 ClusterFlows 你可以在 `Flow` 中定义一个或多个过滤器。过滤器可以对日志执行各种操作，例如，添加其他数据、转换日志或解析记录中的值。`Flow` 中的过滤器会按定义的顺序应用。 -有关 Logging Operator 支持的过滤器列表，请参阅[此页面](https://kube-logging.github.io/docs/configuration/plugins/filters/)。 +有关 Logging Operator 支持的过滤器列表，请参阅 [Fluentd 过滤器的官方文档](https://kube-logging.github.io/docs/configuration/plugins/filters/)。 过滤器需要在 YAML 中配置。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/logging-architecture.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/logging-architecture.md index 6cbed01e32c..c7e0510ebe9 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/logging-architecture.md +++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/logging-architecture.md @@ -21,7 +21,7 @@ Fluent Bit 查询 Kubernetes API 并使用 pod 的元数据来丰富日志，然 每个 `Flow` 都必须引用一个 `Output`，而每个 `ClusterFlow` 都必须引用一个 `ClusterOutput`。 -[文档](https://kube-logging.github.io/docs/#architecture)中的下图显示了新的 Logging 架构： +[Logging Operator 文档](https://kube-logging.github.io/docs/#architecture)中的下图显示了新的 Logging 架构：
Logging Operator 如何与 Fluentd 和 Fluent Bit 一起使用
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 67e7c60b70c..82c0924e5dc 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 @@ -5,7 +5,6 @@ title: 部署 Rancher Server 你可使用以下指南之一，在你选择的提供商中部署和配置 Rancher 和 Kubernetes 集群。 - [AWS](../getting-started/quick-start-guides/deploy-rancher-manager/aws.md)（使用 Terraform） -- [AWS Marketplace](../getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md)（使用 Amazon EKS） - [Azure](../getting-started/quick-start-guides/deploy-rancher-manager/azure.md)（使用 Terraform） - [DigitalOcean](../getting-started/quick-start-guides/deploy-rancher-manager/digitalocean.md)（使用 Terraform） - [GCP](../getting-started/quick-start-guides/deploy-rancher-manager/gcp.md)（使用 Terraform） 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 2a6ae93021d..236ba86e164 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 @@ -11,41 +11,21 @@ description: 如果 Rancher 配置在 Docker 或 Kubernetes 中运行时，了 ::: -请确保安装 Rancher Server 的节点满足以下要求： +Rancher UI 在基于 Firefox 或 Chromium 的浏览器（Chrome、Edge、Opera、Brave）中效果最佳。 -- [操作系统和容器运行时要求](#操作系统和容器运行时要求) - - [RKE 要求](#rke-要求) - - [K3s 要求](#k3s-要求) - - [RKE2 要求](#rke2-要求) - - [安装 Docker](#安装-docker) -- [硬件要求](#硬件要求) -- [CPU 和内存](#cpu-和内存) - - [RKE 和托管 Kubernetes](#rke-和托管-kubernetes) - - [K3s Kubernetes](#k3s-kubernetes) - - [RKE2 Kubernetes](#rke2-kubernetes) - - [Docker](#docker) -- [Ingress](#ingress) -- [磁盘](#磁盘) -- [网络要求](#网络要求) - - [节点 IP 地址](#节点-ip-地址) - - [端口要求](#端口要求) -- [Dockershim 支持](#dockershim-支持) +查看我们的[最佳实践](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md)页面，获取在生产环境中运行 Rancher Server 的建议。 -如需获取在生产环境中运行 Rancher Server 的最佳实践列表，请参见[最佳实践](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md)。 +## Kubernetes 与 Rancher 的兼容性 -Rancher UI 在基于 Firefox 或 Chromium 的浏览器（Chrome、Edge、Opera、Brave 等）中效果最佳。 +Rancher 需要安装在支持的 Kubernetes 版本上。请查阅 [Rancher 支持矩阵](https://www.suse.com/suse-rancher/support-matrix)，确保你的 Kubernetes 版本受支持。 ## 操作系统和容器运行时要求 -Rancher 兼容当前所有的主流 Linux 发行版。 +所有支持的操作系统都使用 64-bit x86 架构。Rancher 兼容当前所有的主流 Linux 发行版。 -运行 RKE Kubernetes 集群的节点需要安装 Docker。RKE2 或 K3s 集群不需要它。 +[Rancher 支持矩阵](https://www.suse.com/suse-rancher/support-matrix)列出了每个 Rancher 版本测试过的操作系统和 Docker 版本。 -Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的 Rancher 版本支持哪些 Kubernetes 版本，请参见[支持维护条款](https://rancher.com/support-maintenance-terms/)。 - -如需了解各个 Rancher 版本通过了哪些操作系统和 Docker 版本测试，请参见[支持和维护条款](https://rancher.com/support-maintenance-terms/)。 - -所有支持的操作系统都使用 64-bit x86 架构。 +运行 RKE 集群的节点需要安装 Docker。RKE2 或 K3s 集群不需要它。 请安装 `ntp`（Network Time Protocol），以防止在客户端和服务器之间由于时间不同步造成的证书验证错误。 @@ -65,7 +45,7 @@ Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的 对于容器运行时，K3s 默认附带了自己的 containerd。你也可以将 K3s 配置为使用已安装的 Docker 运行时。有关在 Docker 中使用 K3s 的更多信息，请参阅 [K3s 文档](https://docs.k3s.io/advanced#using-docker-as-the-container-runtime)。 -Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的 Rancher 版本支持哪些 Kubernetes 版本，请参见[支持维护条款](https://rancher.com/support-maintenance-terms/)。如需指定 K3s 版本，请在运行 K3s 安装脚本时，使用 `INSTALL_K3S_VERSION` 环境变量。 +Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的 Rancher 版本支持哪些 Kubernetes 版本，请参见 [Rancher 支持矩阵](https://www.suse.com/suse-rancher/support-matrix)。如需指定 K3s 版本，在运行 K3s 安装脚本时，使用 `INSTALL_K3S_VERSION` 环境变量。 如果你使用 **Raspbian Buster** 在 K3s 集群上安装 Rancher，请按照[这些步骤](https://rancher.com/docs/k3s/latest/en/advanced/#enabling-legacy-iptables-on-raspbian-buster)切换到旧版 iptables。 @@ -75,7 +55,7 @@ Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的 对于容器运行时，RKE2 附带了自己的 containerd。RKE2 安装不需要 Docker。 -如需了解 RKE2 通过了哪些操作系统版本的测试，请参见[支持和维护条款](https://rancher.com/support-maintenance-terms/)。 +如需了解 RKE2 通过了哪些操作系统版本的测试，请参见 [Rancher 支持矩阵](https://www.suse.com/suse-rancher/support-matrix)。 ## 硬件要求 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 8c85527285f..ef23e6f7154 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 @@ -88,7 +88,7 @@ Windows 集群支持 Logging，你可以收集 Windows 节点的日志。 根据你的配置，默认缓冲区大小可能太大并导致 Pod 故障。减少负载的一种方法是降低记录器的刷新间隔。这可以防止日志溢出缓冲区。你还可以添加更多刷新线程来处理大量日志试图同时填充缓冲区的情况。 -有关如何配置日志缓冲区来满足企业需求的更完整说明，请参阅 [缓冲区](https://kube-logging.github.io/docs/configuration/plugins/outputs/buffer/)和 [Fluentd 配置](https://kube-logging.github.io/docs/logging-infrastructure/fluentd/)的官方 文档。 +有关如何配置日志缓冲区来满足企业需求的更完整说明，请参阅[缓冲区](https://kube-logging.github.io/docs/configuration/plugins/outputs/buffer/)和 [Fluentd 配置](https://kube-logging.github.io/docs/logging-infrastructure/fluentd/)的官方 Logging Operator 文档。 ### `cattle-logging` 命名空间正在重新创建 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 3e5c05ca109..afc1247854f 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 @@ -12,7 +12,7 @@ title: Logging 最佳实践 现在，Rancher 的日志聚合更加灵活。通过新的 Logging 的功能，管理员和用户都可以部署符合细粒度收集标准的日志记录，同时提供更多的目标和配置选项。 -Rancher 的 Logging 使用的是 logging operator。我们让你可以管理这个 operator 及其资源，并将它的管理功能和 Rancher 集群管理联系起来。 +Rancher Logging 使用的是 [Logging Operator](https://github.com/kube-logging/logging-operator)。我们让你可以管理这个 operator 及其资源，并将它的管理功能和 Rancher 集群管理联系起来。 ## 集群级别日志 @@ -44,7 +44,7 @@ Rancher 的 Logging 将读取 `/var/log/containers` 中的所有日志条目， 日志收集仅从 Kubernetes 中的 Pod 中检索 `stdout`/`stderr` 日志。但是，我们也可能想从应用生成的其他文件中收集日志。在这种情况下，你可以使用一个（或两个）日志流 Sidecar。 -设置日志流 Sidecar 的目的是获取写入磁盘的日志文件，并将其内容传输到 `stdout`。这样一来，Banzai Logging Operator 就可以接收这些日志，并把日志发送到目标输出位置。 +设置日志流 Sidecar 的目的是获取写入磁盘的日志文件，并将其内容传输到 `stdout`。这样一来，Logging Operator 就可以接收这些日志，并把日志发送到目标输出位置。 要进行设置，编辑你的工作负载资源（例如 Deployment）并添加以下 Sidecar 定义： From ec4ed7f2d8d4a3a5d340b04665b2cc83cddb6e95 Mon Sep 17 00:00:00 2001 From: vickyhella Date: Wed, 1 Mar 2023 11:48:17 +0800 Subject: [PATCH 34/36] Update v2.6 Chinese translation --- .../deploy-rancher-manager/aws-marketplace.md | 2 +- .../kubernetes-resources-setup/secrets.md | 2 + .../flows-and-clusterflows.md | 4 +- .../logging/logging-architecture.md | 2 +- .../migrate-to-rancher-v2.5+-logging.md | 2 +- .../installation-requirements.md | 38 +++++-------------- .../pages-for-subheaders/logging.md | 2 +- .../logging-best-practices.md | 4 +- .../deploy-rancher-manager/aws-marketplace.md | 2 +- 9 files changed, 20 insertions(+), 38 deletions(-) diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md index 6b2acce89b1..2fc1ce0bd33 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md @@ -3,4 +3,4 @@ title: Rancher AWS Marketplace 快速入门 description: 使用 Amazon EKS 部署 Rancher Server。 --- -你可以在 AWS 中使用 Amazon EKS 部署 Rancher Server。详情请参见我们的 [Amazon Marketplace 列表](https://aws.amazon.com/marketplace/pp/prodview-go7ent7goo5ae)。 +Amazon Elastic Kubernetes Service (EKS) 可以快速[将 Rancher 部署到 Amazon Web Services (AWS)](https://documentation.suse.com/trd/kubernetes/single-html/gs_rancher_aws-marketplace/)。详情请参见我们的 [Amazon Marketplace 列表](https://aws.amazon.com/marketplace/pp/prodview-go7ent7goo5ae)。观看 [demo](https://youtu.be/9dznJ7Ons0M)，了解 AWS Marketplace SUSE Rancher 设置的演练。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md index de23af260b9..d4618d910e1 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/how-to-guides/new-user-guides/kubernetes-resources-setup/secrets.md @@ -63,6 +63,8 @@ title: 密文 **结果**：密文已添加到你选择的项目中。你可以在 Rancher UI 中单击**存储 > 密文**或**更多资源 > 核心 > 密文**来查看密文。 +由于项目范围的 Secret 是在项目级别设置的，因此在命名空间级别所做的任何更改都将被覆盖。 + :::note local 集群上的项目级别密文仅在选择单个项目时可见。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md index bcf26855f81..ab7f461150a 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md @@ -2,7 +2,7 @@ title: Flows 和 ClusterFlows --- -有关如何配置 `Flow` 和 `ClusterFlow` 的完整详细信息，请参阅 [Banzai Cloud Logging Operator 文档](https://kube-logging.github.io/docs/configuration/flow/)。 +有关如何配置 `Flow` 和 `ClusterFlow` 的完整详细信息，请参阅 [Logging Operator 文档](https://kube-logging.github.io/docs/configuration/flow/)。 有关如何解决 Logging 缓冲区的内存问题，请参阅 [Rancher 与 Logging 服务的集成：故障排除](../../../pages-for-subheaders/logging.md#日志缓冲区导致-pod-过载)。 @@ -30,7 +30,7 @@ title: Flows 和 ClusterFlows 你可以在 `Flow` 中定义一个或多个过滤器。过滤器可以对日志执行各种操作，例如，添加其他数据、转换日志或解析记录中的值。`Flow` 中的过滤器会按定义的顺序应用。 -有关 Logging Operator 支持的过滤器列表，请参阅[此页面](https://kube-logging.github.io/docs/configuration/plugins/filters/)。 +有关 Logging Operator 支持的过滤器列表，请参阅 [Fluentd 过滤器的官方文档](https://kube-logging.github.io/docs/configuration/plugins/filters/)。 过滤器需要在 YAML 中配置。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/logging-architecture.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/logging-architecture.md index 6a9d6a1ccbc..c7e0510ebe9 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/logging-architecture.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/logging-architecture.md @@ -21,7 +21,7 @@ Fluent Bit 查询 Kubernetes API 并使用 pod 的元数据来丰富日志，然 每个 `Flow` 都必须引用一个 `Output`，而每个 `ClusterFlow` 都必须引用一个 `ClusterOutput`。 -[Banzai 文档](https://kube-logging.github.io/docs/#architecture)中的下图显示了新的 Logging 架构： +[Logging Operator 文档](https://kube-logging.github.io/docs/#architecture)中的下图显示了新的 Logging 架构：
Logging Operator 如何与 Fluentd 和 Fluent Bit 一起使用
diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md index 75f2ca88f05..6ca4d64ff9e 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md @@ -1,7 +1,7 @@ --- title: 迁移到 Rancher 2.5 Logging --- -Rancher 2.5 彻底修改了 Logging 功能。我们现在使用了 的 [logging operator](https://github.com/kube-logging/logging-operator)，Rancher 配置了此工具以供部署 Logging 使用。 +Rancher 2.5 彻底修改了 Logging 功能。我们现在使用了 [Logging Operator](https://github.com/kube-logging/logging-operator)，Rancher 配置了此工具以供部署 Logging 使用。 在新的 Logging 功能的众多特性和变化中，其中一项是取消了项目级别的 Logging 配置。取而代之的是在命名空间级别配置 Logging。集群级日志仍然可用，但配置选项不同。 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/installation-requirements.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/installation-requirements.md index 2a6ae93021d..cf7ba7aa54e 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/installation-requirements.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/installation-requirements.md @@ -11,41 +11,21 @@ description: 如果 Rancher 配置在 Docker 或 Kubernetes 中运行时，了 ::: -请确保安装 Rancher Server 的节点满足以下要求： +Rancher UI 在基于 Firefox 或 Chromium 的浏览器（Chrome、Edge、Opera、Brave）中效果最佳。 -- [操作系统和容器运行时要求](#操作系统和容器运行时要求) - - [RKE 要求](#rke-要求) - - [K3s 要求](#k3s-要求) - - [RKE2 要求](#rke2-要求) - - [安装 Docker](#安装-docker) -- [硬件要求](#硬件要求) -- [CPU 和内存](#cpu-和内存) - - [RKE 和托管 Kubernetes](#rke-和托管-kubernetes) - - [K3s Kubernetes](#k3s-kubernetes) - - [RKE2 Kubernetes](#rke2-kubernetes) - - [Docker](#docker) -- [Ingress](#ingress) -- [磁盘](#磁盘) -- [网络要求](#网络要求) - - [节点 IP 地址](#节点-ip-地址) - - [端口要求](#端口要求) -- [Dockershim 支持](#dockershim-支持) +查看我们的[最佳实践](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md)页面，获取在生产环境中运行 Rancher Server 的建议。 -如需获取在生产环境中运行 Rancher Server 的最佳实践列表，请参见[最佳实践](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md)。 +## Kubernetes 与 Rancher 的兼容性 -Rancher UI 在基于 Firefox 或 Chromium 的浏览器（Chrome、Edge、Opera、Brave 等）中效果最佳。 +Rancher 需要安装在支持的 Kubernetes 版本上。请查阅 [Rancher 支持矩阵](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-6-10/)，确保你的 Kubernetes 版本受支持。 ## 操作系统和容器运行时要求 -Rancher 兼容当前所有的主流 Linux 发行版。 +所有支持的操作系统都使用 64-bit x86 架构。Rancher 兼容当前所有的主流 Linux 发行版。 -运行 RKE Kubernetes 集群的节点需要安装 Docker。RKE2 或 K3s 集群不需要它。 +[Rancher 支持矩阵](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-6-10/)列出了每个 Rancher 版本测试过的操作系统和 Docker 版本。 -Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的 Rancher 版本支持哪些 Kubernetes 版本，请参见[支持维护条款](https://rancher.com/support-maintenance-terms/)。 - -如需了解各个 Rancher 版本通过了哪些操作系统和 Docker 版本测试，请参见[支持和维护条款](https://rancher.com/support-maintenance-terms/)。 - -所有支持的操作系统都使用 64-bit x86 架构。 +运行 RKE 集群的节点需要安装 Docker。RKE2 或 K3s 集群不需要它。 请安装 `ntp`（Network Time Protocol），以防止在客户端和服务器之间由于时间不同步造成的证书验证错误。 @@ -65,7 +45,7 @@ Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的 对于容器运行时，K3s 默认附带了自己的 containerd。你也可以将 K3s 配置为使用已安装的 Docker 运行时。有关在 Docker 中使用 K3s 的更多信息，请参阅 [K3s 文档](https://docs.k3s.io/advanced#using-docker-as-the-container-runtime)。 -Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的 Rancher 版本支持哪些 Kubernetes 版本，请参见[支持维护条款](https://rancher.com/support-maintenance-terms/)。如需指定 K3s 版本，请在运行 K3s 安装脚本时，使用 `INSTALL_K3S_VERSION` 环境变量。 +Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的 Rancher 版本支持哪些 Kubernetes 版本，请参见 [Rancher 支持矩阵](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-6-10/)。如需指定 K3s 版本，在运行 K3s 安装脚本时，使用 `INSTALL_K3S_VERSION` 环境变量。 如果你使用 **Raspbian Buster** 在 K3s 集群上安装 Rancher，请按照[这些步骤](https://rancher.com/docs/k3s/latest/en/advanced/#enabling-legacy-iptables-on-raspbian-buster)切换到旧版 iptables。 @@ -75,7 +55,7 @@ Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的 对于容器运行时，RKE2 附带了自己的 containerd。RKE2 安装不需要 Docker。 -如需了解 RKE2 通过了哪些操作系统版本的测试，请参见[支持和维护条款](https://rancher.com/support-maintenance-terms/)。 +如需了解 RKE2 通过了哪些操作系统版本的测试，请参见 [Rancher 支持矩阵](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/rancher-v2-6-10/)。 ## 硬件要求 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/logging.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/logging.md index 9af1625ca2a..89b3b789e2f 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/logging.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/pages-for-subheaders/logging.md @@ -117,7 +117,7 @@ Windows 集群支持 Logging，你可以收集 Windows 节点的日志。 根据你的配置，默认缓冲区大小可能太大并导致 Pod 故障。减少负载的一种方法是降低记录器的刷新间隔。这可以防止日志溢出缓冲区。你还可以添加更多刷新线程来处理大量日志试图同时填充缓冲区的情况。 -有关如何配置日志缓冲区来满足企业需求的更完整说明，请参阅 [缓冲区](https://kube-logging.github.io/docs/configuration/plugins/outputs/buffer/)和 [Fluentd 配置](https://kube-logging.github.io/docs/logging-infrastructure/fluentd/)的官方 文档。 +有关如何配置日志缓冲区来满足企业需求的更完整说明，请参阅[缓冲区](https://kube-logging.github.io/docs/configuration/plugins/outputs/buffer/)和 [Fluentd 配置](https://kube-logging.github.io/docs/logging-infrastructure/fluentd/)的官方 Logging Operator 文档。 ### `cattle-logging` 命名空间正在重新创建 diff --git a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md index c4968dd61bc..afc1247854f 100644 --- a/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md +++ b/i18n/zh/docusaurus-plugin-content-docs/version-2.6/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md @@ -12,7 +12,7 @@ title: Logging 最佳实践 现在，Rancher 的日志聚合更加灵活。通过新的 Logging 的功能，管理员和用户都可以部署符合细粒度收集标准的日志记录，同时提供更多的目标和配置选项。 -Rancher 的 Logging 使用的是 Logging operator。我们让你可以管理这个 operator 及其资源，并将它的管理功能和 Rancher 集群管理联系起来。 +Rancher Logging 使用的是 [Logging Operator](https://github.com/kube-logging/logging-operator)。我们让你可以管理这个 operator 及其资源，并将它的管理功能和 Rancher 集群管理联系起来。 ## 集群级别日志 @@ -44,7 +44,7 @@ Rancher 的 Logging 将读取 `/var/log/containers` 中的所有日志条目， 日志收集仅从 Kubernetes 中的 Pod 中检索 `stdout`/`stderr` 日志。但是，我们也可能想从应用生成的其他文件中收集日志。在这种情况下，你可以使用一个（或两个）日志流 Sidecar。 -设置日志流 Sidecar 的目的是获取写入磁盘的日志文件，并将其内容传输到 `stdout`。这样一来，Banzai Logging Operator 就可以接收这些日志，并把日志发送到目标输出位置。 +设置日志流 Sidecar 的目的是获取写入磁盘的日志文件，并将其内容传输到 `stdout`。这样一来，Logging Operator 就可以接收这些日志，并把日志发送到目标输出位置。 要进行设置，编辑你的工作负载资源（例如 Deployment）并添加以下 Sidecar 定义： diff --git a/versioned_docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md b/versioned_docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md index 781d41ad624..8a3d904ed31 100644 --- a/versioned_docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md +++ b/versioned_docs/version-2.6/getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace.md @@ -3,4 +3,4 @@ title: Rancher AWS Marketplace Quick Start description: Use Amazon EKS to deploy Rancher server. --- -Amazon Elastic Kubernetes Service (EKS) can quickly [deploy Rancher to Amazon Web Services (AWS)](https://documentation.suse.com/trd/kubernetes/single-html/gs_rancher_aws-marketplace/). To learn more, see our [Amazon Marketplace listing](https://aws.amazon.com/marketplace/pp/prodview-go7ent7goo5ae). Watch the [demo] (https://youtu.be/9dznJ7Ons0M) for a walkthrough of AWS Marketplace SUSE Rancher setup. +Amazon Elastic Kubernetes Service (EKS) can quickly [deploy Rancher to Amazon Web Services (AWS)](https://documentation.suse.com/trd/kubernetes/single-html/gs_rancher_aws-marketplace/). To learn more, see our [Amazon Marketplace listing](https://aws.amazon.com/marketplace/pp/prodview-go7ent7goo5ae). Watch the [demo](https://youtu.be/9dznJ7Ons0M) for a walkthrough of AWS Marketplace SUSE Rancher setup. From 5fbd0dc26c5fa5ddb86cbf2831ecd9e5230ee24a Mon Sep 17 00:00:00 2001 From: Guilherme Macedo Date: Fri, 3 Mar 2023 14:29:53 -0300 Subject: [PATCH 35/36] Update instructions about how to run with Docker Signed-off-by: Guilherme Macedo --- README.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d0780d95d13..065555cb1af 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ First, install Docusaurus 2: yarn start ``` -This command starts a local development server for Docusuarus 2, and opens up a browser window. Most changes are reflected live without having to restart the server. +This command starts a local development server for Docusaurus 2, and opens up a browser window. Most changes are reflected live without having to restart the server. **Note:** The `yarn start` command won't include some important static site features. For example, switching between languages from the site's dropdown menu is not available. If you need these features, use `yarn build`. @@ -52,17 +52,13 @@ This command generates static content into the `build` directory and can be serv You can also use [Docker](https://www.docker.com/) to launch the website. -The first time you launch the site this way, use this command to install Yarn and start the server: +The below command can be use to install the dependencies and run the site inside a container: ``` -docker run --rm -it -v $PWD:$PWD -w $PWD -p 3000:3000 node yarn install && yarn start -h 0.0.0.0 +docker run --rm -it -v $PWD:$PWD -w $PWD -p 3000:3000 node /bin/sh -c "yarn install && yarn start -h 0.0.0.0" ``` -On subsequent launches, use this command: - -``` -docker run --rm -it -v $PWD:$PWD -w $PWD -p 3000:3000 node yarn start -h 0.0.0.0 -``` +Subsequent executions will check for updated dependencies, if there are none, it will skip the updates and quickly start the server. License ======= From 450a93b0298cec85cf6d603049cc73b1319c76a7 Mon Sep 17 00:00:00 2001 From: Billy Tat Date: Fri, 3 Mar 2023 09:41:29 -0800 Subject: [PATCH 36/36] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 065555cb1af..9676327d93e 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ This command generates static content into the `build` directory and can be serv You can also use [Docker](https://www.docker.com/) to launch the website. -The below command can be use to install the dependencies and run the site inside a container: +The below command can be used to install the dependencies and run the site inside a container: ``` docker run --rm -it -v $PWD:$PWD -w $PWD -p 3000:3000 node /bin/sh -c "yarn install && yarn start -h 0.0.0.0"